From fa0855d63178570a55ba39399d9360e1690d0109 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 10 Nov 2022 12:57:15 -0300 Subject: [PATCH 1/2] FIX: new modules permissions --- docsfera.json | 4 ++-- package-lock.json | 14 ++++++------- package.json | 2 +- src/authentication/permissions.enum.ts | 28 +++++++++++++++++--------- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/docsfera.json b/docsfera.json index 80c74d6..66eb9df 100644 --- a/docsfera.json +++ b/docsfera.json @@ -3298,9 +3298,9 @@ } }, "info": { - "title": "Maestro - fix/pipeline-details-bug", + "title": "Maestro - fix/modules-permissions", "description": "Documentation for Maestro gateway", - "version": "10.11.2022 - 10:7", + "version": "10.11.2022 - 12:57", "contact": {} }, "tags": [], diff --git a/package-lock.json b/package-lock.json index df0b276..9f360f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", - "@dadosfera/protospack-v2": "3.19.3", + "@dadosfera/protospack-v2": "3.19.4-beta.1", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", @@ -1727,9 +1727,9 @@ } }, "node_modules/@dadosfera/protospack-v2": { - "version": "3.19.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.3.tgz", - "integrity": "sha512-27mewnpCr7gYqwumVgKeqvaRZTbSrpjVHtevemavLUxkZvacfvCQUy+uIv5BZYZpST3lMEPKyvA5wA5XtMAB6A==", + "version": "3.19.4-beta.1", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4-beta.1.tgz", + "integrity": "sha512-yeu2gVPkN5Gz24vECF4kcFVdIU7qKMndTrBUoJRrsKGOr+bI+H73bADxMyBYUN+mXVuHMgv4S23+46iWblnuXg==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -12330,9 +12330,9 @@ } }, "@dadosfera/protospack-v2": { - "version": "3.19.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.3.tgz", - "integrity": "sha512-27mewnpCr7gYqwumVgKeqvaRZTbSrpjVHtevemavLUxkZvacfvCQUy+uIv5BZYZpST3lMEPKyvA5wA5XtMAB6A==", + "version": "3.19.4-beta.1", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4-beta.1.tgz", + "integrity": "sha512-yeu2gVPkN5Gz24vECF4kcFVdIU7qKMndTrBUoJRrsKGOr+bI+H73bADxMyBYUN+mXVuHMgv4S23+46iWblnuXg==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 313f84a..9aa1dd9 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", - "@dadosfera/protospack-v2": "3.19.3", + "@dadosfera/protospack-v2": "3.19.4-beta.1", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 5e5da45..a4a95c8 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -449,11 +449,11 @@ export const PERMISSIONS_GROUPS = { }, }, - ORCHEST: { + MODULES: { title: { - 'pt-br': 'Analisar | Inteligência', - 'en-us': 'Analyze | Intelligence', - 'es-es': 'Analizar | Inteligencia', + 'pt-br': 'Módulos da Dadosfera', + 'en-us': 'Dadosfera Modules', + 'es-es': 'Módulos de la Dadosfera', }, permissions: { INTELLIGENCE: { @@ -461,9 +461,9 @@ export const PERMISSIONS_GROUPS = { claim: 'intelligence:open', usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Acessar Orchest', - 'en-us': 'Access Orchest', - 'es-s': 'Acceso Orchest', + 'pt-br': 'Acessar Módulo de Inteligência', + 'en-us': 'Access Intelligence Module', + 'es-s': 'Acceder Módulo de Inteligencia', }, }, APP_BUILDER: { @@ -473,7 +473,7 @@ export const PERMISSIONS_GROUPS = { name: { 'pt-br': 'Acessar App Builder', 'en-us': 'Access App Builder', - 'es-es': 'Acceso App Builder', + 'es-es': 'Acceder App Builder', }, }, MACHINE_LEARNING: { @@ -483,7 +483,17 @@ export const PERMISSIONS_GROUPS = { name: { 'pt-br': 'Acessar Machine Learning', 'en-us': 'Access Machine Learning', - 'es-es': 'Acceso Machine Learning', + 'es-es': 'Acceder Machine Learning', + }, + }, + PROCESS: { + seqid: 43, + claim: 'process:open', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Acessar Módulo de Processamento', + 'en-us': 'Access Processing Module', + 'es-es': 'Acceder Módulo de Tramitación', }, }, }, From 0503732c1e9debdb53c898d3351c2ed266ee567d Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 10 Nov 2022 14:43:46 -0300 Subject: [PATCH 2/2] new protospack version --- docsfera.json | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- src/modules/permissions/permissions.controller.ts | 10 ++-------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/docsfera.json b/docsfera.json index 66eb9df..e08286e 100644 --- a/docsfera.json +++ b/docsfera.json @@ -3300,7 +3300,7 @@ "info": { "title": "Maestro - fix/modules-permissions", "description": "Documentation for Maestro gateway", - "version": "10.11.2022 - 12:57", + "version": "10.11.2022 - 14:43", "contact": {} }, "tags": [], diff --git a/package-lock.json b/package-lock.json index 9f360f8..f8c9084 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", - "@dadosfera/protospack-v2": "3.19.4-beta.1", + "@dadosfera/protospack-v2": "3.19.4", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", @@ -1727,9 +1727,9 @@ } }, "node_modules/@dadosfera/protospack-v2": { - "version": "3.19.4-beta.1", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4-beta.1.tgz", - "integrity": "sha512-yeu2gVPkN5Gz24vECF4kcFVdIU7qKMndTrBUoJRrsKGOr+bI+H73bADxMyBYUN+mXVuHMgv4S23+46iWblnuXg==", + "version": "3.19.4", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4.tgz", + "integrity": "sha512-Vb6bdFgQKYHf0kDK9kuMtN+nt3nkaMhJZ3wNVaUmQNxsnpGyARWBL29R2n+YnxS8g23tRwuj331sjg+DY0Fnhg==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -12330,9 +12330,9 @@ } }, "@dadosfera/protospack-v2": { - "version": "3.19.4-beta.1", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4-beta.1.tgz", - "integrity": "sha512-yeu2gVPkN5Gz24vECF4kcFVdIU7qKMndTrBUoJRrsKGOr+bI+H73bADxMyBYUN+mXVuHMgv4S23+46iWblnuXg==", + "version": "3.19.4", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4.tgz", + "integrity": "sha512-Vb6bdFgQKYHf0kDK9kuMtN+nt3nkaMhJZ3wNVaUmQNxsnpGyARWBL29R2n+YnxS8g23tRwuj331sjg+DY0Fnhg==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 9aa1dd9..03bfb2a 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", - "@dadosfera/protospack-v2": "3.19.4-beta.1", + "@dadosfera/protospack-v2": "3.19.4", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index e73b17f..0383d9f 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -1,14 +1,8 @@ import { Controller, Get, Headers, Inject } from '@nestjs/common'; import { ApiHeader, ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; -import { - Authenticated, - RequireAllPermissions, -} from 'src/authentication/authentication.decorator'; -import { - PERMISSIONS_GROUPS, - PermissionUsages, -} from 'src/authentication/permissions.enum'; +import { Authenticated } from 'src/authentication/authentication.decorator'; +import { PermissionUsages } from 'src/authentication/permissions.enum'; import { RequestUser, User } from 'src/authentication/user.decorator'; import { LanguageEnum } from 'src/utils/languages.enum'; import { GetPublicPermissionsRes } from './dto/entities';