From 1de4eedd3842b30d63667051507897ccd9923b9a Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 15 Jul 2022 12:27:49 -0300 Subject: [PATCH] FEAT: new permission for user management --- package-lock.json | 14 +++++++------- package.json | 2 +- src/authentication/permissions.enum.ts | 17 +++++++++++++++++ .../permissions/permissions.controller.ts | 15 ++++++++++++++- src/modules/roles/roles.controller.ts | 16 ++++++++++++++-- src/modules/roles/roles.service.ts | 4 ++-- 6 files changed, 55 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index adaeabe..5586048 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": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "protospack-v2": "3.5.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,10 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "0.0.0", - "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-ABgU0d8MFh0VhWkGFa3nnSLzmm8Her2rof9Ajoi46FMjwp3N0895F6e7IecM13CUJgcOtkFqbmQF7JU33hB+BA==", - "license": "ISC", + "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==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17246,8 +17245,9 @@ } }, "protospack-v2": { - "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-ABgU0d8MFh0VhWkGFa3nnSLzmm8Her2rof9Ajoi46FMjwp3N0895F6e7IecM13CUJgcOtkFqbmQF7JU33hB+BA==", + "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==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index ed44165..d1870b5 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": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "protospack-v2": "3.5.0", "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 bf5da2f..2f7c375 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -428,6 +428,23 @@ export const PERMISSIONS = { }, }, }, + USERS: { + title: { + 'pt-br': 'Usuários', + 'en-us': 'Users', + }, + permissions: { + ADMIN: { + seqid: 34, + claim: 'users:admin', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Administrar usuários e grupos', + 'en-us': 'Manage user and roles', + }, + }, + }, + }, }; export type PermissionsObject = typeof PERMISSIONS; diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index aa2e6e6..77615d1 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -1,8 +1,13 @@ import { Controller, Get, Headers, Inject } from '@nestjs/common'; -import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { ApiHeader, ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; +import { + Authenticated, + RequireAllPermissions, +} from 'src/authentication/authentication.decorator'; import { LanguageEnum, + PERMISSIONS, PermissionUsages, } from 'src/authentication/permissions.enum'; import { RequestUser, User } from 'src/authentication/user.decorator'; @@ -11,6 +16,13 @@ import { PermissionsService } from './permissions.service'; @ApiTags('Permissions') @Controller('permissions') +@ApiHeader({ + name: 'dadosfera-lang', + enum: LanguageEnum, + required: false, + description: 'Defaults to pt-br', +}) +@Authenticated() export class PermissionsController { logger: any; @@ -24,6 +36,7 @@ export class PermissionsController { @Get() @ApiOkResponse({ type: GetPublicPermissionsRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) getPublicPermissions( @User() user: RequestUser, @Headers('dadosfera-lang') language: LanguageEnum, diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 0260665..b913e94 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -39,8 +39,11 @@ import { SetRoleUsersReq, } from './dto/entities'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; -import { LanguageEnum } from 'src/authentication/permissions.enum'; -import { Authenticated } from 'src/authentication/authentication.decorator'; +import { LanguageEnum, PERMISSIONS } from 'src/authentication/permissions.enum'; +import { + Authenticated, + RequireAllPermissions, +} from 'src/authentication/authentication.decorator'; @ApiTags('Roles') @ApiHeader({ @@ -65,6 +68,7 @@ export class RolesController { @Get() @ApiOkResponse({ type: GetRolesByCustomerRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async getRolesByCustomer( @User() user: RequestUser, @Query() filters: GetRolesByCustomerReq, @@ -80,6 +84,7 @@ export class RolesController { @Post() @ApiCreatedResponse({ type: CreateRoleRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async createRole( @User() user: RequestUser, @Body() body: CreateRoleReq, @@ -92,6 +97,7 @@ export class RolesController { @Put('permissions') @ApiOkResponse({ type: GrantPermissionsToRoleRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async grantPermissionsToRole( @User() user: RequestUser, @Body() body: GrantPermissionsToRoleReq, @@ -104,6 +110,7 @@ export class RolesController { @Delete('permissions') @ApiOkResponse({ type: RevokePermissionsFromRoleRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async revokePermissionsFromRole( @User() user: RequestUser, @Body() body: RevokePermissionsFromRoleReq, @@ -116,6 +123,7 @@ export class RolesController { @Patch('permissions') @ApiOkResponse({ type: SetRolePermissionsRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async setRolePermissions( @User() user: RequestUser, @Body() body: SetRolePermissionsReq, @@ -127,6 +135,7 @@ export class RolesController { } @Patch('users') @ApiOkResponse({ type: SetRoleUsersRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async setRoleUsers( @User() user: RequestUser, @Body() body: SetRoleUsersReq, @@ -139,6 +148,7 @@ export class RolesController { @Get(':id') @ApiOkResponse({ type: Role }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async getRoleById( @User() user: RequestUser, @Param('id') id: string, @@ -150,6 +160,7 @@ export class RolesController { } @Delete(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async deleteRole( @User() user: RequestUser, @Param('id') id: string, @@ -162,6 +173,7 @@ export class RolesController { @Patch(':id') @ApiOkResponse({ type: UpdateRoleRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async updateRole( @User() user: RequestUser, @Param('id') id: string, diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 58857f1..838dfc2 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -100,7 +100,7 @@ export class RolesService { this.rolesClientService.GrantPermissionsToRole({ permissionIds: [], roleId, - permissionReqIds: permissionIds, + permissionSeqIds: permissionIds, }), ); @@ -116,7 +116,7 @@ export class RolesService { this.rolesClientService.RevokePermissionsFromRole({ permissionIds: [], roleId, - permissionReqIds: permissionIds, + permissionSeqIds: permissionIds, }), ); const [roleTreated] = this.getRolesPermissionsName([role.role]);