From 071c524a2e59ff751bff0e54d3e3d60686dfb97b Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 15 Jul 2022 14:39:30 -0300 Subject: [PATCH] FIX: changed get roles to search roles --- package-lock.json | 14 +++++++------- package.json | 2 +- src/authentication/permissions.enum.ts | 2 +- src/modules/permissions/permissions.service.ts | 10 +++++----- src/modules/roles/dto/entities.ts | 2 +- src/modules/roles/roles.controller.ts | 9 +++------ src/modules/roles/roles.service.ts | 6 +++--- 7 files changed, 21 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5586048..59f61ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.1", - "protospack-v2": "3.5.0", + "protospack-v2": "3.5.1", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.5.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.0.tgz", - "integrity": "sha512-fmTPfg9IdlCLYu+zoosyQBRMN/L6ov6LDIsbdE6L6xtpBuIIHEzg/ALyKwsaFi9nZIhPAKFbd28EI6xb66xrzA==", + "version": "3.5.1", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.1.tgz", + "integrity": "sha512-qSD5D9p1f/FtPMovfwHG3nbnvpD8c2V01ifK2QB2V2SMPc/Qxe+IYiv3zhXu/KUQZGI82nYznXyMnmiJ9Jo9aw==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.5.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.0.tgz", - "integrity": "sha512-fmTPfg9IdlCLYu+zoosyQBRMN/L6ov6LDIsbdE6L6xtpBuIIHEzg/ALyKwsaFi9nZIhPAKFbd28EI6xb66xrzA==", + "version": "3.5.1", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.1.tgz", + "integrity": "sha512-qSD5D9p1f/FtPMovfwHG3nbnvpD8c2V01ifK2QB2V2SMPc/Qxe+IYiv3zhXu/KUQZGI82nYznXyMnmiJ9Jo9aw==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index d1870b5..c02610b 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.1", - "protospack-v2": "3.5.0", + "protospack-v2": "3.5.1", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 2f7c375..3af7776 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -51,7 +51,7 @@ export const PERMISSIONS = { CREATE: { seqid: 18, claim: 'POST /auth', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': '', 'en-us': '', diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 55d774f..58b75e2 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -89,11 +89,11 @@ export class PermissionsService permissionUsage ? usage === permissionUsage : true, ) .map(({ seqid, name }) => ({ id: seqid, name: name[language] })); - - groups.push({ - title, - permissions, - }); + if (permissions?.length) + groups.push({ + title, + permissions, + }); } return groups; } diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index 50ab808..a5cbaa2 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -31,7 +31,7 @@ export enum TrueOrFalseEnum { } export class GetRolesByCustomerReq { @ApiPropertyOptional() - permissionIds: string[]; + permissionId: string[]; @ApiPropertyOptional({ enum: TrueOrFalseEnum }) getUsers: TrueOrFalseEnum; } diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index b913e94..d2c2289 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -69,17 +69,14 @@ export class RolesController { @Get() @ApiOkResponse({ type: GetRolesByCustomerRes }) @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) - async getRolesByCustomer( + async searchRoles( @User() user: RequestUser, @Query() filters: GetRolesByCustomerReq, @Headers('dadosfera-lang') language, ) { - this.logger.info('getRolesByCustomer', { user }); + this.logger.info('searchRoles', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.getRolesByCustomer( - filters, - user.customer_id, - ); + return await this.rolesService.roleSearch(filters, user.customer_id); } @Post() diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 838dfc2..1aebc5c 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -48,8 +48,8 @@ export class RolesService { const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async getRolesByCustomer(filters: GetRolesByCustomerReq, customerId: string) { - let { permissionIds } = filters; + async roleSearch(filters: GetRolesByCustomerReq, customerId: string) { + let { permissionId: permissionIds } = filters; if (permissionIds && !Array.isArray(permissionIds)) permissionIds = [permissionIds]; const { getUsers } = filters; @@ -62,7 +62,7 @@ export class RolesService { return seqId; }) || []; const roles = await lastValueFrom( - this.rolesClientService.RoleFindAllByCustomerId({ + this.rolesClientService.RoleSearch({ customerId, getUsers: isGetUsers, permissionIds: [],