From 635c4da48c78117229d4d221c5b1ce5d921f0490 Mon Sep 17 00:00:00 2001 From: Beatriz Antunes <79672194+beatrizaantunes@users.noreply.github.com> Date: Mon, 8 May 2023 15:44:05 -0300 Subject: [PATCH 1/3] Update permissions.enum.ts --- src/authentication/permissions.enum.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 5280795..f9b6553 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -449,7 +449,7 @@ export const PERMISSIONS_GROUPS = { }, }, - ANALYZE: { + DATAVIZ: { title: { 'pt-br': 'Analisar | Visualização', 'en-us': 'Analyze | Visualization', @@ -466,6 +466,16 @@ export const PERMISSIONS_GROUPS = { 'es-es': 'Acceso Metabase', }, }, + }, + }, + + INTELLIGENCE: { + title: { + 'pt-br': 'Analisar | Inteligência', + 'en-us': 'Analyze | Intelligence', + 'es-es': 'Analizar | Inteligencia', + }, + permissions: { INTELLIGENCE: { seqid: 31, claim: 'intelligence:open', From 9caf3dc67fad7ad3fec0a2666352eb97df1613a8 Mon Sep 17 00:00:00 2001 From: Gabriel Amorim Date: Mon, 8 May 2023 15:48:46 -0300 Subject: [PATCH 2/3] FIX: renamed reference to intelligence permission --- src/authentication/permissions.enum.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index f9b6553..7266fd1 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -468,8 +468,7 @@ export const PERMISSIONS_GROUPS = { }, }, }, - - INTELLIGENCE: { + INTELLIGENCE: { title: { 'pt-br': 'Analisar | Inteligência', 'en-us': 'Analyze | Intelligence', @@ -597,7 +596,8 @@ export const DADOSFERA_MODULES: Array = [ name: 'Intelligence Module', description: 'Orchest Module', key: 'intelligence', - permissionSeqId: PERMISSIONS_GROUPS.ANALYZE.permissions.INTELLIGENCE.seqid, + permissionSeqId: + PERMISSIONS_GROUPS.INTELLIGENCE.permissions.INTELLIGENCE.seqid, }, { name: 'Proccessing Module', From 4c6f4bfd84f195ba2267c01ab882ebb33c476a63 Mon Sep 17 00:00:00 2001 From: Gabriel Amorim Date: Mon, 8 May 2023 15:56:52 -0300 Subject: [PATCH 3/3] FIX: renamed reference to intelligence permission --- src/authentication/authentication.guard.spec.ts | 10 +++++----- src/decorators/user.decorator.spec.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/authentication/authentication.guard.spec.ts b/src/authentication/authentication.guard.spec.ts index 0aa983e..6ee4f36 100644 --- a/src/authentication/authentication.guard.spec.ts +++ b/src/authentication/authentication.guard.spec.ts @@ -44,7 +44,7 @@ class NoClassAuthController { @Get('has-all-permissions') @RequireAllPermissions( PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN, - PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE, + PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE, ) async hasAllPermissions(@Body() body) { return { body }; @@ -53,7 +53,7 @@ class NoClassAuthController { @Get('has-some-permission') @RequireSomePermission( PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN, - PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE, + PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE, ) async hasSomePermission(@Body() body) { return { body }; @@ -62,7 +62,7 @@ class NoClassAuthController { @Controller('class-auth-condition') @AuthenticateCondition((req) => req.get('x-on-class') === 'ok') -@RequireSomePermission(PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE) +@RequireSomePermission(PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE) class ClassAuthConditionController { @Get('body') async getBody(@Body() body) { @@ -444,13 +444,13 @@ describe('authentication.guard', () => { NoClassAuthTest(tokenZ, ['zendesk']); ClassAuthConditionTest(tokenZ, ['zendesk']); - const tokenM = CreateToken([PERMISSIONS_GROUPS.ANALYZE.permissions.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.ANALYZE.permissions.METABASE, + PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE, ]); NoClassAuthTest(tokenZM, ['zendesk', 'metabase']); ClassAuthConditionTest(tokenZM, ['zendesk', 'metabase']); diff --git a/src/decorators/user.decorator.spec.ts b/src/decorators/user.decorator.spec.ts index 90488f3..2f9b0eb 100644 --- a/src/decorators/user.decorator.spec.ts +++ b/src/decorators/user.decorator.spec.ts @@ -46,7 +46,7 @@ describe('user.decorator', () => { const fakeUserPayload = { user_id: 'd50d33c7-6c2b-463c-861f-e21667e7c125', username: 'super.admin', - permissions: [PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE].map( + permissions: [PERMISSIONS_GROUPS.DATAVIZ.permissions.METABASE].map( ({ seqid }) => seqid, ), customer_id: '9d18e8ae-24b9-41a3-9e8f-a25ce57555b11',