Merge pull request #345 from dadosfera/release/07-29

Release/07 29

src/authentication/authentication.guard.spec.ts

@@ -17,7 +17,6 @@ import { PERMISSIONS_GROUPS } from './permissions.enum';
 import { AuthClientService } from '../modules/auth/auth.service';
 
 import ErrorCodes from '../utils/errorCodes';
-import { ApiKeyService } from 'src/modules/api-key/api-key.service';
 
 const logger = {
   info: (...args) => args,
@@ -122,12 +121,6 @@ describe('authentication.guard', () => {
           provide: APP_GUARD,
           useClass: AuthenticationGuard,
         },
-        {
-          provide: ApiKeyService,
-          useValue: {
-            get: () => Promise.resolve(null)
-          }
-        }
       ],
       controllers: [NoClassAuthController, ClassAuthConditionController],
     }).compile();
@@ -448,18 +441,18 @@ describe('authentication.guard', () => {
   NoClassAuthTest(null, null);
   ClassAuthConditionTest(null, null);
 
-  // const tokenZ = CreateToken([PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN]);
-  // NoClassAuthTest(tokenZ, ['zendesk']);
-  // ClassAuthConditionTest(tokenZ, ['zendesk']);
+  const tokenZ = CreateToken([PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN]);
+  NoClassAuthTest(tokenZ, ['zendesk']);
+  ClassAuthConditionTest(tokenZ, ['zendesk']);
 
-  // const tokenM = CreateToken([PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE]);
-  // NoClassAuthTest(tokenM, ['metabase']);
-  // ClassAuthConditionTest(tokenM, ['metabase']);
+  const tokenM = CreateToken([PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE]);
+  NoClassAuthTest(tokenM, ['metabase']);
+  ClassAuthConditionTest(tokenM, ['metabase']);
 
-  // const tokenZM = CreateToken([
-  //   PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN,
-  //   PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE,
-  // ]);
-  // NoClassAuthTest(tokenZM, ['zendesk', 'metabase']);
-  // ClassAuthConditionTest(tokenZM, ['zendesk', 'metabase']);
+  const tokenZM = CreateToken([
+    PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN,
+    PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE,
+  ]);
+  NoClassAuthTest(tokenZM, ['zendesk', 'metabase']);
+  ClassAuthConditionTest(tokenZM, ['zendesk', 'metabase']);
 });

src/authentication/permissions.enum.ts

@@ -340,6 +340,16 @@ export const PERMISSIONS_GROUPS = {
           'es-es': 'Gestor de catálogos. Puede ver y editar todos los activos.',
         },
       },
+      EMBED_ANALYTICS: {
+        seqid: 44,
+        claim: 'catalog:embed',
+        usage: PermissionUsages.INTERNAL,
+        name: {
+          'pt-br': 'Acessar Módulo de Incorporação de Ativos',
+          'en-us': 'Access Embedding analytics Module',
+          'es-es': 'Acceder al Módulo de Incorporación de Activos',
+        },
+      },
       TRIGGER_CATALOG_TASK: {
         seqid: 45,
         claim: 'catalog:trigger-task',
@@ -352,25 +362,6 @@ export const PERMISSIONS_GROUPS = {
       },
     },
   },
-  EMBED: {
-    title: {
-      'pt-br': 'Analisar | Incorporação',
-      'en-us': 'Analyze | Embedding',
-      'es-es': 'Analizar | Incorporación',
-    },
-    permissions: {
-      EMBED_ANALYTICS: {
-        seqid: 44,
-        claim: 'catalog:embed',
-        usage: PermissionUsages.PUBLIC,
-        name: {
-          'pt-br': 'Acessar Módulo de Incorporação de Ativos',
-          'en-us': 'Access Embedding analytics Module',
-          'es-es': 'Acceder al Módulo de Incorporación de Activos',
-        },
-      },
-    }
-  },
   CONNECTORS: {
     title: {
       'pt-br': 'Conectores',

src/decorators/user.decorator.spec.ts

@@ -9,7 +9,6 @@ import { PERMISSIONS_GROUPS } from '../authentication/permissions.enum';
 import { AuthClientService } from '../modules/auth/auth.service';
 import ErrorCodes from '../utils/errorCodes';
 import { User } from './user.decorator';
-import { ApiKeyService } from 'src/modules/api-key/api-key.service';
 
 const logger = {
   info: (...args) => args,
@@ -76,12 +75,6 @@ describe('user.decorator', () => {
           provide: APP_GUARD,
           useClass: AuthenticationGuard,
         },
-        {
-          provide: ApiKeyService,
-          useValue: {
-            get: () => Promise.resolve(null)
-          }
-        }
       ],
       controllers: [UserController],
     }).compile();
@@ -183,5 +176,5 @@ describe('user.decorator', () => {
 
   const token = CreateToken();
   fakeUserPayload.access_token = token;
-  // UserTest(token);
+  UserTest(token);
 });