Merge pull request #2079 from aziontech/dev

DEPLOY 2025-01-21

src/helpers/account-handler.js

@@ -83,15 +83,15 @@ export class AccountHandler {
    * @param {function} refreshService - The function that refreshes the service.
    * @return {string | object} The URL string or object to redirect to.
    */
-  async switchAccountFromSocialIdp(verifyService, refreshService) {
+  async switchAccountFromSocialIdp(verifyService, refreshService, EnableSocialLogin) {
     try {
       const { twoFactor, trustedDevice, user_tracking_info: userInfo } = await verifyService()
 
       if (!userInfo) {
         return '/login'
       }
 
-      if (twoFactor) {
+      if (twoFactor && !EnableSocialLogin) {
         const mfaRoute = trustedDevice ? 'authentication' : 'setup'
         return `/mfa/${mfaRoute}`
       }

src/router/routes/switch-account-routes/index.js

@@ -18,7 +18,12 @@ export const switchAccountRoutes = {
     const refresh = AuthServices.refreshAuthenticationService
 
     try {
-      const redirect = await accountHandler.switchAccountFromSocialIdp(verify, refresh)
+      const EnableSocialLogin = true
+      const redirect = await accountHandler.switchAccountFromSocialIdp(
+        verify,
+        refresh,
+        EnableSocialLogin
+      )
       next(redirect)
     } catch {
       next({ name: 'login' })

src/services/users-services/list-teams-service.js

@@ -1,10 +1,19 @@
 import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter'
 import { makeTeamsBaseUrl } from './make-teams-base-url'
 import { InvalidDataStructureError } from '../axios/errors'
+import { makeListServiceQueryParams } from '@/helpers/make-list-service-query-params'
+
+export const listTeamsService = async ({
+  fields = '',
+  ordering = 'name',
+  page = 1,
+  pageSize = 100,
+  search = ''
+} = {}) => {
+  const searchParams = makeListServiceQueryParams({ fields, ordering, page, pageSize, search })
 
-export const listTeamsService = async () => {
   let httpResponse = await AxiosHttpClientAdapter.request({
-    url: `${makeTeamsBaseUrl()}`,
+    url: `${makeTeamsBaseUrl()}?${searchParams.toString()}`,
     method: 'GET'
   })
 

src/stores/account.js

@@ -32,9 +32,10 @@ export const useAccountStore = defineStore({
     },
     hasPermissionToEditDataStream(state) {
       const permissionToEditDataStream = 'Edit Data Stream'
-      return !!state.account.permissions?.some(
+      const hasPermissionToEdit = !!state.account.permissions?.some(
         (permission) => permission.name === permissionToEditDataStream
       )
+      return hasPermissionToEdit || state.account.is_account_owner
     },
     hasPermissionToViewDataStream(state) {
       return !!state.account.permissions.find(

src/tests/services/users-services/list-teams-service.test.js

@@ -58,7 +58,7 @@ describe('UsersServices', () => {
     await sut()
 
     expect(requestSpy).toHaveBeenCalledWith({
-      url: `${version}/iam/teams`,
+      url: `${version}/iam/teams?ordering=name&page=1&page_size=100&fields=&search=`,
       method: 'GET'
     })
   })

src/views/DataStream/EditView.vue

@@ -33,6 +33,10 @@
     }
   })
 
+  const store = useAccountStore()
+  const hasNoPermissionToEditDataStream = computed(() => store.hasPermissionToEditDataStream)
+  const hasAccessToSampling = computed(() => store.hasSamplingFlag)
+
   // Schema de Validação
   const validationSchema = yup.object({
     name: yup.string().required(),
@@ -44,7 +48,7 @@
     status: yup.boolean(),
     hasSampling: yup.boolean(),
     samplingPercentage: yup.number().when('hasSampling', {
-      is: true,
+      is: true && hasAccessToSampling.value,
       then: (schema) =>
         schema
           .test('minmax', 'Sampling Percentage must be between 0 and 100', (value) => {
@@ -217,9 +221,6 @@
     })
   })
 
-  const store = useAccountStore()
-  const hasNoPermissionToEditDataStream = computed(() => store.hasPermissionToEditDataStream)
-
   const displaySamplingDialog = ref(false)
   const formSubmit = (onSubmit, values) => {
     if (!values.hasSampling) {

src/views/DataStream/FormFields/FormFieldsDataStream.vue

@@ -179,6 +179,7 @@
     <template #inputs>
       <div class="flex flex-col w-full gap-8">
         <FieldSwitchBlock
+          :disabled="hasNoPermissionToEditDataStream"
           nameField="hasSampling"
           name="hasSampling"
           auto
@@ -193,6 +194,7 @@
           v-if="hasSampling"
         >
           <FieldNumber
+            :disabled="hasNoPermissionToEditDataStream"
             label="Sampling Percentage (%)"
             name="samplingPercentage"
             :value="samplingPercentage"

src/views/DataStream/ListView.vue

@@ -5,6 +5,16 @@
     </template>
     <template #content>
       <div class="flex flex-col gap-3 items-start">
+        <InlineMessage
+          v-if="hasNoPermissionToCreateDataStream"
+          class="w-fit"
+          severity="info"
+          data-testid="permission-rule-message-data-stream"
+        >
+          This account has <strong>View Data Stream</strong> permission only. It allows viewing the
+          account’s streams but doesn't permit creating, editing, or deleting streams.
+        </InlineMessage>
+
         <InlineMessage
           v-if="isMaxDomainsReached"
           severity="info"

src/views/Users/FormsFields/FormFieldsUsers.vue

@@ -62,6 +62,8 @@
   const { value: isAccountOwner } = useField('isAccountOwner')
   const { value: teamsIds, errorMessage: errorTeamsIds } = useField('teamsIds')
 
+  const disabledUserTeams = computed(() => isAccountOwner.value || !optionsTeams.value.length)
+
   const setCountriesOptions = (countries) => {
     optionsCountriesMobile.value = countries
     filteredCountriesMobile.value = [...countries]
@@ -145,12 +147,12 @@
 
   const switchOptions = computed(() => [
     {
-      title: 'Social login',
+      title: 'Account owner',
       nameField: 'isAccountOwner',
       readonly: accountIsOwner.value,
       disabled: accountIsOwner.value,
       subtitle:
-        'The Account Owner can enable or disable the Social Login functionality. When enabled, users linked to the account can authenticate on Azion using their social networks. When disabled, users must authenticate on Azion with their email and password.'
+        'Account owner: Full access to all features, including account and solution management. Non-owner: Restricted access to solution management, based on Teams permissions.'
     },
     {
       title: 'Enforce Multi-Factor Authentication',
@@ -359,7 +361,7 @@
           filter
           autoFilterFocus
           id="teams"
-          :disabled="isAccountOwner"
+          :disabled="disabledUserTeams"
           :loading="!optionsTeams.length"
           :options="optionsTeams"
           optionLabel="label"