From 4356adea65572953d1d260d47808ffff698129c9 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 7 Jul 2022 15:57:40 -0300 Subject: [PATCH 01/47] FEAT: User module init --- src/app.module.ts | 3 + src/modules/users/dtos/entities.ts | 105 +++++++++++++++++++++ src/modules/users/users.controller.spec.ts | 18 ++++ src/modules/users/users.controller.ts | 68 +++++++++++++ src/modules/users/users.module.ts | 21 +++++ src/modules/users/users.service.spec.ts | 18 ++++ src/modules/users/users.service.ts | 53 +++++++++++ 7 files changed, 286 insertions(+) create mode 100644 src/modules/users/dtos/entities.ts create mode 100644 src/modules/users/users.controller.spec.ts create mode 100644 src/modules/users/users.controller.ts create mode 100644 src/modules/users/users.module.ts create mode 100644 src/modules/users/users.service.spec.ts create mode 100644 src/modules/users/users.service.ts diff --git a/src/app.module.ts b/src/app.module.ts index 5653cf5..d643c3e 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -40,6 +40,7 @@ import { SalesforceStrategy } from './modules/oauth/passport-strategies/salesfor import { ConnectorClientConfiguration } from './clients/connector/client.config'; import { ConnectorController } from './modules/connector/connector.controller'; import { ConnectorClientService } from './clients/connector/client.service'; +import { UsersModule } from './modules/users/users.module'; const inputClient = new InputsClientConfiguration(); const outputClient = new OutputsClientConfiguration(); @@ -111,6 +112,8 @@ const connectorClient = new ConnectorClientConfiguration(); ...connectorClient.config(), }, ]), + + UsersModule, ], }) export class AppModule {} diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts new file mode 100644 index 0000000..ef8fd41 --- /dev/null +++ b/src/modules/users/dtos/entities.ts @@ -0,0 +1,105 @@ +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +export class Customer { + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + domain: string; + @ApiProperty() + tier: string; + @ApiProperty() + info: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} +export class Permission { + @ApiProperty() + id: string; + @ApiProperty() + seqid: number; + @ApiProperty() + name: string; + @ApiProperty() + claim: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} +export class Role { + @ApiProperty({ type: [Permission] }) + permissions: Permission[]; + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} +export class UserByCustomer { + @ApiProperty({ type: [Role] }) + roles: Role[]; + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + username: string; + @ApiProperty() + mfaStatus: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} +export class User { + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + username: string; + @ApiProperty() + UserRole: string[]; + @ApiProperty() + customer: Customer; + @ApiProperty() + mfaStatus: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} + +export class GetAllUsersByCustomerIdReq { + @ApiPropertyOptional() + s: string; +} +export class GetAllUsersByCustomerIdRes { + @ApiProperty({ type: [UserByCustomer] }) + users: UserByCustomer[]; +} + +export class AssignRoleToUserReq { + @ApiProperty() + userId: string; + @ApiProperty() + roleId: string; +} +export class UnassignRoleToUserReq { + @ApiProperty() + userId: string; + @ApiProperty() + roleId: string; +} + +export class SearchUserReq { + @ApiProperty() + s: string; +} +export class SearchUserRes extends GetAllUsersByCustomerIdRes {} diff --git a/src/modules/users/users.controller.spec.ts b/src/modules/users/users.controller.spec.ts new file mode 100644 index 0000000..3e27c39 --- /dev/null +++ b/src/modules/users/users.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { UsersController } from './users.controller'; + +describe('UsersController', () => { + let controller: UsersController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [UsersController], + }).compile(); + + controller = module.get(UsersController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts new file mode 100644 index 0000000..c6e2e98 --- /dev/null +++ b/src/modules/users/users.controller.ts @@ -0,0 +1,68 @@ +import { + Body, + Controller, + Delete, + Get, + Inject, + Put, + Query, +} from '@nestjs/common'; +import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { RequestUser, User } from 'src/authentication/user.decorator'; +import { + AssignRoleToUserReq, + GetAllUsersByCustomerIdReq, + GetAllUsersByCustomerIdRes, + UnassignRoleToUserReq, +} from './dtos/entities'; +import { UsersService } from './users.service'; + +@ApiTags('Users') +@Controller('users') +export class UsersController { + logger: any; + + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + private userService: UsersService, + ) { + this.logger = dadosferaLogger.logger; + } + + @Get() + @ApiOkResponse({ + type: GetAllUsersByCustomerIdRes, + description: 'List of users of a customer', + }) + async getAllUsersByCustomerId( + @User() user: RequestUser, + @Query('s') s: GetAllUsersByCustomerIdReq, + ) { + this.logger.info('getAllUsersByCustomerId', { user }); + return await this.userService.findAllUsersByCustomerId(user.customer_id, s); + } + + @Put('role') + async assignRoleToUser(@User() user, @Body() body: AssignRoleToUserReq) { + this.logger.info('assignRoleToUser', { user }); + return await this.userService.assignRoleToUser(body); + } + + @Delete('role') + async unassignRoleToUser(@User() user, @Body() body: UnassignRoleToUserReq) { + this.logger.info('unassignRoleToUser', { user }); + return await this.userService.unassignRoleToUser(body); + } + + // @Get('search') + // @ApiOkResponse({ type: SearchUserRes }) + // async searchUser( + // @User() user: RequestUser, + // @Query('s') searchQuery: SearchUserReq, + // ) { + // this.logger.info('searchUser', { user }); + // console.log(searchQuery); + // } +} diff --git a/src/modules/users/users.module.ts b/src/modules/users/users.module.ts new file mode 100644 index 0000000..8ee1859 --- /dev/null +++ b/src/modules/users/users.module.ts @@ -0,0 +1,21 @@ +import { Module } from '@nestjs/common'; +import { UsersController } from './users.controller'; +import { UsersService } from './users.service'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { ClientsModule } from '@nestjs/microservices'; +import { DucClient } from 'src/clients/duc/client.config'; +const ducClient = new DucClient(); + +@Module({ + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], + controllers: [UsersController], + providers: [UsersService, DadosferaLogger], +}) +export class UsersModule {} diff --git a/src/modules/users/users.service.spec.ts b/src/modules/users/users.service.spec.ts new file mode 100644 index 0000000..62815ba --- /dev/null +++ b/src/modules/users/users.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { UsersService } from './users.service'; + +describe('UsersService', () => { + let service: UsersService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [UsersService], + }).compile(); + + service = module.get(UsersService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts new file mode 100644 index 0000000..63a4a8c --- /dev/null +++ b/src/modules/users/users.service.ts @@ -0,0 +1,53 @@ +import { OnModuleInit, Inject, Injectable } from '@nestjs/common'; +import { ClientGrpc } from '@nestjs/microservices'; +import { DadosferaLogger } from 'dadosfera-logs'; + +import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; +import { UsersProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { + AssignRoleToUserRequest, + AssignRoleToUserResponse, + UnassignRoleFromUserRequest, + UnassignRoleFromUserResponse, + UserFindAllByCustomerIdResponse, +} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; + +import grpcHandler from '../../utils/grpcHandler'; + +@Injectable() +export class UsersService implements OnModuleInit { + logger: any; + + private usersService: UsersProtoService; + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc, + ) { + this.logger = dadosferaLogger.logger; + } + + onModuleInit() { + this.usersService = this.grpcClient.getService( + ProtoServices.UsersProtoService, + ); + } + + async findAllUsersByCustomerId(customerId, searchQuery) { + return grpcHandler( + this.usersService.UserFindAllByCustomerId({ customerId }), + ); + } + + async assignRoleToUser(body: AssignRoleToUserRequest) { + return grpcHandler( + this.usersService.AssignRoleToUser(body), + ); + } + + async unassignRoleToUser(body: UnassignRoleFromUserRequest) { + return grpcHandler( + this.usersService.UnassignRoleFromUser(body), + ); + } +} From f5665557c9d428d0e53a338529aea5259c55c304 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 7 Jul 2022 16:17:45 -0300 Subject: [PATCH 02/47] FIX: better parameter naming --- src/modules/users/users.controller.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index c6e2e98..8d20675 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -38,10 +38,13 @@ export class UsersController { }) async getAllUsersByCustomerId( @User() user: RequestUser, - @Query('s') s: GetAllUsersByCustomerIdReq, + @Query('s') searchQuery: GetAllUsersByCustomerIdReq, ) { this.logger.info('getAllUsersByCustomerId', { user }); - return await this.userService.findAllUsersByCustomerId(user.customer_id, s); + return await this.userService.findAllUsersByCustomerId( + user.customer_id, + searchQuery, + ); } @Put('role') From d1961a9710cabf03af655acbf59f6a4a4695b2dc Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 8 Jul 2022 12:04:56 -0300 Subject: [PATCH 03/47] FEAT: User Management WIP --- src/authentication/authentication.guard.ts | 1 - src/clients/duc/client.config.ts | 5 +-- src/clients/outputs/client.service.ts | 5 +-- src/clients/pipelines/client.config.ts | 5 +-- src/modules/inputs/inputs.service.ts | 5 ++- src/modules/users/dtos/entities.ts | 44 ++++++++++++++++++++++ src/modules/users/users.controller.ts | 18 +++++++++ src/modules/users/users.service.ts | 21 +++++------ 8 files changed, 77 insertions(+), 27 deletions(-) diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index b663a3b..6e04694 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -3,7 +3,6 @@ import { CanActivate, OnApplicationBootstrap, ExecutionContext, - Logger, Inject, } from '@nestjs/common'; import { Reflector } from '@nestjs/core'; diff --git a/src/clients/duc/client.config.ts b/src/clients/duc/client.config.ts index 180cfa6..59ff8a8 100644 --- a/src/clients/duc/client.config.ts +++ b/src/clients/duc/client.config.ts @@ -1,9 +1,6 @@ import { credentials } from '@grpc/grpc-js'; import { ClientOptions, Transport } from '@nestjs/microservices'; -import { - ProtoPackages, - ProtoPaths, -} from 'protospack-v2/dist/lib/Duc'; +import { ProtoPackages, ProtoPaths } from 'protospack-v2/dist/lib/Duc'; export class DucClient { config(): ClientOptions { diff --git a/src/clients/outputs/client.service.ts b/src/clients/outputs/client.service.ts index 7f0b959..abfa662 100644 --- a/src/clients/outputs/client.service.ts +++ b/src/clients/outputs/client.service.ts @@ -1,10 +1,7 @@ import { Controller, Inject, OnModuleInit } from '@nestjs/common'; import { ClientGrpc, Payload } from '@nestjs/microservices'; import { DadosferaLogger } from 'dadosfera-logs'; -import { - OutputServicesNames, - OutputsServiceInterface, -} from 'protospack'; +import { OutputServicesNames, OutputsServiceInterface } from 'protospack'; import { objectCamelToSnake, objectSnakeToCamel, diff --git a/src/clients/pipelines/client.config.ts b/src/clients/pipelines/client.config.ts index 01083eb..3f5b72d 100644 --- a/src/clients/pipelines/client.config.ts +++ b/src/clients/pipelines/client.config.ts @@ -1,8 +1,5 @@ import { ClientOptions, Transport } from '@nestjs/microservices'; -import { - PipelinePackages, - PipelineProtoFilePath, -} from 'protospack'; +import { PipelinePackages, PipelineProtoFilePath } from 'protospack'; import { credentials } from '@grpc/grpc-js'; export class PipelinesClientConfiguration { diff --git a/src/modules/inputs/inputs.service.ts b/src/modules/inputs/inputs.service.ts index 29d9750..812e189 100644 --- a/src/modules/inputs/inputs.service.ts +++ b/src/modules/inputs/inputs.service.ts @@ -7,7 +7,7 @@ import { IIdRequest, Info } from 'src/clients/inputs/interfaces'; @Injectable() export class InputsService { - constructor(private inputClient: InputsClientService) { } + constructor(private inputClient: InputsClientService) {} secondsInADay = 60 * 60 * 24; secondsInAnHour = 60 * 60; @@ -54,7 +54,7 @@ export class InputsService { switch (data.plugin.toLowerCase()) { case 'csv': case 'json': - case 'parquet': + case 'parquet': { const { info, ...input } = data; const inputPayload = this.generateInputS3Payload(input); response = await this.inputClient.createS3Inputs({ @@ -62,6 +62,7 @@ export class InputsService { info, }); break; + } case 'oracle': case 'mysql': case 'postgresql': diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index ef8fd41..fb94328 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -75,6 +75,46 @@ export class User { @ApiProperty() updatedAt: string; } +export class CreateUserReq { + @ApiProperty() + name: string; + @ApiProperty() + username: string; + @ApiProperty() + email: string; + @ApiProperty() + roles: string[]; + @ApiProperty() + jobTitle: string; + @ApiProperty() + department: string; + @ApiProperty() + hierarchy: number; + @ApiProperty() + customer: Customer; + @ApiProperty() + mfaStatus: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} +export class CreateUserRes { + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + email: string; + @ApiProperty() + roles: string[]; + @ApiProperty() + jobTitle: string; + @ApiProperty() + department: string; + @ApiProperty() + hierarchy: number; +} export class GetAllUsersByCustomerIdReq { @ApiPropertyOptional() @@ -97,6 +137,10 @@ export class UnassignRoleToUserReq { @ApiProperty() roleId: string; } +export class DeleteUserRes { + @ApiProperty() + id: string; +} export class SearchUserReq { @ApiProperty() diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 8d20675..0871659 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -4,6 +4,8 @@ import { Delete, Get, Inject, + Param, + Post, Put, Query, } from '@nestjs/common'; @@ -12,6 +14,9 @@ import { DadosferaLogger } from 'dadosfera-logs'; import { RequestUser, User } from 'src/authentication/user.decorator'; import { AssignRoleToUserReq, + CreateUserReq, + CreateUserRes, + DeleteUserRes, GetAllUsersByCustomerIdReq, GetAllUsersByCustomerIdRes, UnassignRoleToUserReq, @@ -31,6 +36,19 @@ export class UsersController { this.logger = dadosferaLogger.logger; } + @Post() + @ApiOkResponse({ type: CreateUserRes }) + async createUser(@User() user, @Body() body: CreateUserReq) { + console.log(body); + } + + @Delete(':id') + @ApiOkResponse({ type: DeleteUserRes }) + async deleteUser(@User() user, @Param('id') id: string) { + this.logger.info('deleteUser', { user }); + return await this.userService.deleteUser({ id }); + } + @Get() @ApiOkResponse({ type: GetAllUsersByCustomerIdRes, diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 63a4a8c..86263ac 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -6,13 +6,10 @@ import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; import { UsersProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; import { AssignRoleToUserRequest, - AssignRoleToUserResponse, + IdRequest, UnassignRoleFromUserRequest, - UnassignRoleFromUserResponse, - UserFindAllByCustomerIdResponse, } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; - -import grpcHandler from '../../utils/grpcHandler'; +import { lastValueFrom } from 'rxjs'; @Injectable() export class UsersService implements OnModuleInit { @@ -34,20 +31,20 @@ export class UsersService implements OnModuleInit { } async findAllUsersByCustomerId(customerId, searchQuery) { - return grpcHandler( + return lastValueFrom( this.usersService.UserFindAllByCustomerId({ customerId }), ); } async assignRoleToUser(body: AssignRoleToUserRequest) { - return grpcHandler( - this.usersService.AssignRoleToUser(body), - ); + return lastValueFrom(this.usersService.AssignRoleToUser(body)); } async unassignRoleToUser(body: UnassignRoleFromUserRequest) { - return grpcHandler( - this.usersService.UnassignRoleFromUser(body), - ); + return lastValueFrom(this.usersService.UnassignRoleFromUser(body)); + } + + async deleteUser(id: IdRequest) { + return lastValueFrom(this.usersService.UserRemove(id)); } } From ea04f59e041c1cfc5ecdc84fdf23d2c4a9ada6f0 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 8 Jul 2022 12:28:40 -0300 Subject: [PATCH 04/47] FIX: Fixed create user req --- src/modules/users/dtos/entities.ts | 32 ++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index fb94328..b6d4420 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -79,7 +79,21 @@ export class CreateUserReq { @ApiProperty() name: string; @ApiProperty() - username: string; + email: string; + @ApiProperty() + roles: string[]; + @ApiProperty() + jobTitle: string; + @ApiProperty() + department: string; + @ApiProperty() + hierarchy: number; +} +export class CreateUserRes { + @ApiProperty() + id: string; + @ApiProperty() + name: string; @ApiProperty() email: string; @ApiProperty() @@ -99,22 +113,6 @@ export class CreateUserReq { @ApiProperty() updatedAt: string; } -export class CreateUserRes { - @ApiProperty() - id: string; - @ApiProperty() - name: string; - @ApiProperty() - email: string; - @ApiProperty() - roles: string[]; - @ApiProperty() - jobTitle: string; - @ApiProperty() - department: string; - @ApiProperty() - hierarchy: number; -} export class GetAllUsersByCustomerIdReq { @ApiPropertyOptional() From 4cff59369589486fba700363f9f4900d65523587 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 8 Jul 2022 17:28:23 -0300 Subject: [PATCH 05/47] FEAT: Roles and permissions modules --- nest-cli.json | 6 +- package-lock.json | 159 +++++++++++++----- package.json | 1 + src/app.module.ts | 3 + src/authentication/permissions.enum.ts | 19 ++- src/i18n/pt/messages.json | 11 ++ .../permissions.controller.spec.ts | 18 ++ .../permissions/permissions.controller.ts | 23 +++ src/modules/permissions/permissions.module.ts | 2 + src/modules/roles/dto/entities.ts | 58 +++++++ src/modules/roles/roles.controller.spec.ts | 18 ++ src/modules/roles/roles.controller.ts | 53 ++++++ src/modules/roles/roles.module.ts | 22 +++ src/modules/roles/roles.service.spec.ts | 18 ++ src/modules/roles/roles.service.ts | 36 ++++ src/modules/users/dtos/entities.ts | 91 ++++------ src/modules/users/users.controller.ts | 7 +- src/modules/users/users.module.ts | 1 + 18 files changed, 440 insertions(+), 106 deletions(-) create mode 100644 src/i18n/pt/messages.json create mode 100644 src/modules/permissions/permissions.controller.spec.ts create mode 100644 src/modules/permissions/permissions.controller.ts create mode 100644 src/modules/roles/dto/entities.ts create mode 100644 src/modules/roles/roles.controller.spec.ts create mode 100644 src/modules/roles/roles.controller.ts create mode 100644 src/modules/roles/roles.module.ts create mode 100644 src/modules/roles/roles.service.spec.ts create mode 100644 src/modules/roles/roles.service.ts diff --git a/nest-cli.json b/nest-cli.json index 2edc9db..69ccf04 100644 --- a/nest-cli.json +++ b/nest-cli.json @@ -3,7 +3,11 @@ "sourceRoot": "src", "compilerOptions": { "assets": [ - "**/*.proto" + "**/*.proto", + { + "include": "i18n/**/*", + "watchAssets": true + } ], "plugins": [ "@nestjs/swagger" diff --git a/package-lock.json b/package-lock.json index 6126ab4..8e2c785 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "helmet": "^5.1.0", "jsonwebtoken": "^8.5.1", "jwk-to-pem": "^2.0.5", + "nestjs-i18n": "^9.1.3", "passport": "^0.6.0", "passport-facebook": "^3.0.0", "passport-forcedotcom": "^0.1.5", @@ -3467,6 +3468,11 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/accept-language-parser": { + "version": "1.5.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/accept-language-parser/-/accept-language-parser-1.5.0.tgz", + "integrity": "sha512-QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==" + }, "node_modules/accepts": { "version": "1.3.8", "license": "MIT", @@ -3657,7 +3663,6 @@ }, "node_modules/anymatch": { "version": "3.1.2", - "dev": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -3678,7 +3683,6 @@ }, "node_modules/argparse": { "version": "2.0.1", - "dev": true, "license": "Python-2.0" }, "node_modules/array-flatten": { @@ -3920,7 +3924,6 @@ }, "node_modules/binary-extensions": { "version": "2.2.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4006,7 +4009,6 @@ }, "node_modules/braces": { "version": "3.0.2", - "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.0.1" @@ -4195,7 +4197,6 @@ }, "node_modules/chokidar": { "version": "3.5.3", - "dev": true, "funding": [ { "type": "individual", @@ -4237,6 +4238,16 @@ "dev": true, "license": "MIT" }, + "node_modules/class-validator": { + "version": "0.13.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/class-validator/-/class-validator-0.13.2.tgz", + "integrity": "sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==", + "peer": true, + "dependencies": { + "libphonenumber-js": "^1.9.43", + "validator": "^13.7.0" + } + }, "node_modules/cli-cursor": { "version": "3.1.0", "dev": true, @@ -5707,7 +5718,6 @@ }, "node_modules/fill-range": { "version": "7.0.1", - "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -6041,7 +6051,6 @@ }, "node_modules/glob-parent": { "version": "5.1.2", - "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -6455,7 +6464,6 @@ }, "node_modules/is-binary-path": { "version": "2.1.0", - "dev": true, "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -6516,7 +6524,6 @@ }, "node_modules/is-extglob": { "version": "2.1.1", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -6550,7 +6557,6 @@ }, "node_modules/is-glob": { "version": "4.0.3", - "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -6602,7 +6608,6 @@ }, "node_modules/is-number": { "version": "7.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -7625,7 +7630,6 @@ }, "node_modules/js-yaml": { "version": "4.1.0", - "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -7823,6 +7827,12 @@ "node": ">= 0.8.0" } }, + "node_modules/libphonenumber-js": { + "version": "1.10.7", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/libphonenumber-js/-/libphonenumber-js-1.10.7.tgz", + "integrity": "sha512-jZXLCCWMe1b/HXkjiLeYt2JsytZMcqH26jLFIdzFDFF0xvSUWrYKyvPlyPG+XJzEyKUFbcZxLdWGMwQsWaHDxQ==", + "peer": true + }, "node_modules/lines-and-columns": { "version": "1.2.4", "dev": true, @@ -8239,6 +8249,33 @@ "dev": true, "license": "MIT" }, + "node_modules/nestjs-i18n": { + "version": "9.1.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/nestjs-i18n/-/nestjs-i18n-9.1.3.tgz", + "integrity": "sha512-55hLPenqoHq7sNybxjHoe6Q+RjeZelmaCnCx/niT28GvCLPUteNO4jOe/4AWvLvLrnW0cj7l0sHHzgXlPTilfg==", + "dependencies": { + "accept-language-parser": "^1.5.0", + "chokidar": "^3.5.3", + "cookie": "^0.4.1", + "iterare": "^1.2.1", + "js-yaml": "^4.1.0", + "string-format": "^2.0.0" + }, + "peerDependencies": { + "@nestjs/common": "*", + "@nestjs/core": "*", + "class-validator": "~0.13", + "rxjs": "*" + } + }, + "node_modules/nestjs-i18n/node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/next-line": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", @@ -8313,7 +8350,6 @@ }, "node_modules/normalize-path": { "version": "3.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -8812,7 +8848,6 @@ }, "node_modules/picomatch": { "version": "2.3.1", - "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -9132,7 +9167,6 @@ }, "node_modules/readdirp": { "version": "3.6.0", - "dev": true, "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -9716,6 +9750,11 @@ "version": "5.1.2", "license": "MIT" }, + "node_modules/string-format": { + "version": "2.0.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/string-format/-/string-format-2.0.0.tgz", + "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==" + }, "node_modules/string-length": { "version": "4.0.2", "dev": true, @@ -10087,7 +10126,6 @@ }, "node_modules/to-regex-range": { "version": "5.0.1", - "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -10570,6 +10608,15 @@ "node": ">=10.12.0" } }, + "node_modules/validator": { + "version": "13.7.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "peer": true, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/vary": { "version": "1.1.2", "license": "MIT", @@ -13458,6 +13505,11 @@ "version": "2.0.6", "dev": true }, + "accept-language-parser": { + "version": "1.5.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/accept-language-parser/-/accept-language-parser-1.5.0.tgz", + "integrity": "sha512-QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==" + }, "accepts": { "version": "1.3.8", "requires": { @@ -13573,7 +13625,6 @@ }, "anymatch": { "version": "3.1.2", - "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -13587,8 +13638,7 @@ "dev": true }, "argparse": { - "version": "2.0.1", - "dev": true + "version": "2.0.1" }, "array-flatten": { "version": "1.1.1" @@ -13767,8 +13817,7 @@ } }, "binary-extensions": { - "version": "2.2.0", - "dev": true + "version": "2.2.0" }, "binary-search": { "version": "1.3.6", @@ -13840,7 +13889,6 @@ }, "braces": { "version": "3.0.2", - "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -13945,7 +13993,6 @@ }, "chokidar": { "version": "3.5.3", - "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -13969,6 +14016,16 @@ "version": "1.2.2", "dev": true }, + "class-validator": { + "version": "0.13.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/class-validator/-/class-validator-0.13.2.tgz", + "integrity": "sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==", + "peer": true, + "requires": { + "libphonenumber-js": "^1.9.43", + "validator": "^13.7.0" + } + }, "cli-cursor": { "version": "3.1.0", "dev": true, @@ -15010,7 +15067,6 @@ }, "fill-range": { "version": "7.0.1", - "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -15218,7 +15274,6 @@ }, "glob-parent": { "version": "5.1.2", - "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -15480,7 +15535,6 @@ }, "is-binary-path": { "version": "2.1.0", - "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -15514,8 +15568,7 @@ } }, "is-extglob": { - "version": "2.1.1", - "dev": true + "version": "2.1.1" }, "is-finite": { "version": "1.1.0", @@ -15531,7 +15584,6 @@ }, "is-glob": { "version": "4.0.3", - "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -15568,8 +15620,7 @@ "integrity": "sha512-m2Rm8PhUFDNNhgvwZJjJG74a9h5CHU0fkA8WT+WGlCjyEbZ2jPwgb+ZxHu4np284EqNVyOsgppReK4qy/TwEwg==" }, "is-number": { - "version": "7.0.0", - "dev": true + "version": "7.0.0" }, "is-number-object": { "version": "1.0.7", @@ -16269,7 +16320,6 @@ }, "js-yaml": { "version": "4.1.0", - "dev": true, "requires": { "argparse": "^2.0.1" } @@ -16407,6 +16457,12 @@ "type-check": "~0.4.0" } }, + "libphonenumber-js": { + "version": "1.10.7", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/libphonenumber-js/-/libphonenumber-js-1.10.7.tgz", + "integrity": "sha512-jZXLCCWMe1b/HXkjiLeYt2JsytZMcqH26jLFIdzFDFF0xvSUWrYKyvPlyPG+XJzEyKUFbcZxLdWGMwQsWaHDxQ==", + "peer": true + }, "lines-and-columns": { "version": "1.2.4", "dev": true @@ -16688,6 +16744,26 @@ "version": "2.6.2", "dev": true }, + "nestjs-i18n": { + "version": "9.1.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/nestjs-i18n/-/nestjs-i18n-9.1.3.tgz", + "integrity": "sha512-55hLPenqoHq7sNybxjHoe6Q+RjeZelmaCnCx/niT28GvCLPUteNO4jOe/4AWvLvLrnW0cj7l0sHHzgXlPTilfg==", + "requires": { + "accept-language-parser": "^1.5.0", + "chokidar": "^3.5.3", + "cookie": "^0.4.1", + "iterare": "^1.2.1", + "js-yaml": "^4.1.0", + "string-format": "^2.0.0" + }, + "dependencies": { + "cookie": { + "version": "0.4.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + } + } + }, "next-line": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", @@ -16742,8 +16818,7 @@ "dev": true }, "normalize-path": { - "version": "3.0.0", - "dev": true + "version": "3.0.0" }, "npm-run-path": { "version": "4.0.1", @@ -17078,8 +17153,7 @@ "dev": true }, "picomatch": { - "version": "2.3.1", - "dev": true + "version": "2.3.1" }, "pino": { "version": "6.14.0", @@ -17292,7 +17366,6 @@ }, "readdirp": { "version": "3.6.0", - "dev": true, "requires": { "picomatch": "^2.2.1" } @@ -17689,6 +17762,11 @@ } } }, + "string-format": { + "version": "2.0.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/string-format/-/string-format-2.0.0.tgz", + "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==" + }, "string-length": { "version": "4.0.2", "dev": true, @@ -17923,7 +18001,6 @@ }, "to-regex-range": { "version": "5.0.1", - "dev": true, "requires": { "is-number": "^7.0.0" } @@ -18241,6 +18318,12 @@ "source-map": "^0.7.3" } }, + "validator": { + "version": "13.7.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "peer": true + }, "vary": { "version": "1.1.2" }, diff --git a/package.json b/package.json index c3e5c80..4b3c251 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "helmet": "^5.1.0", "jsonwebtoken": "^8.5.1", "jwk-to-pem": "^2.0.5", + "nestjs-i18n": "^9.1.3", "passport": "^0.6.0", "passport-facebook": "^3.0.0", "passport-forcedotcom": "^0.1.5", diff --git a/src/app.module.ts b/src/app.module.ts index d643c3e..aa062b3 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -41,6 +41,7 @@ import { ConnectorClientConfiguration } from './clients/connector/client.config' import { ConnectorController } from './modules/connector/connector.controller'; import { ConnectorClientService } from './clients/connector/client.service'; import { UsersModule } from './modules/users/users.module'; +import { RolesModule } from './modules/roles/roles.module'; const inputClient = new InputsClientConfiguration(); const outputClient = new OutputsClientConfiguration(); @@ -114,6 +115,8 @@ const connectorClient = new ConnectorClientConfiguration(); ]), UsersModule, + + RolesModule, ], }) export class AppModule {} diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 2c8a47d..0dc0b2a 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -12,6 +12,7 @@ export interface Permission { seqid: number; claim: string; usage: PermissionUsages; + name?: string; } /* @@ -22,7 +23,7 @@ export interface Permission { /*export const Permissions: { [P in keyof any]: { [Q in keyof any]: Permission }; } = {*/ -export const Permissions = { +export const Permissions: Record> = { AUTH: { CREATE: { seqid: 18, @@ -34,23 +35,27 @@ export const Permissions = { PIPELINE: { CREATE: { seqid: 23, - claim: 'POST /pipelines', + claim: 'pipeline:create', usage: PermissionUsages.PUBLIC, + name: 'PERMISSIONS.NAMES.PIPELINE_CREATE', }, GET: { seqid: 13, - claim: 'GET /pipelines', + claim: 'pipeline:get', usage: PermissionUsages.PUBLIC, + name: 'PERMISSIONS.NAMES.PIPELINE_GET', }, UPDATE: { seqid: 29, - claim: 'PUT /pipelines', + claim: 'pipeline:update', usage: PermissionUsages.PUBLIC, + name: 'PERMISSIONS.NAMES.PIPELINE_PUT', }, DELETE: { seqid: 5, - claim: 'DELETE /pipelines', + claim: 'pipeline:delete', usage: PermissionUsages.PUBLIC, + name: 'PERMISSIONS.NAMES.PIPELINE_DELETE', }, }, @@ -59,21 +64,25 @@ export const Permissions = { seqid: 21, claim: 'POST /inputs', usage: PermissionUsages.PUBLIC, + name: 'Criar conexões', }, GET: { seqid: 9, claim: 'GET /inputs', usage: PermissionUsages.PUBLIC, + name: 'Buscar conexões', }, UPDATE: { seqid: 27, claim: 'PUT /inputs', usage: PermissionUsages.PUBLIC, + name: 'Atualizar conexões', }, UPDATE_PARTIAL: { seqid: 17, claim: 'PATCH /inputs', usage: PermissionUsages.PUBLIC, + name: 'Atualizar conexões', }, DELETE: { seqid: 3, diff --git a/src/i18n/pt/messages.json b/src/i18n/pt/messages.json new file mode 100644 index 0000000..dc5f042 --- /dev/null +++ b/src/i18n/pt/messages.json @@ -0,0 +1,11 @@ +{ + "ERRORS": {}, + "PERMISSIONS": { + "NAMES": { + "PIPELINE_CREATE": "Criar pipeline", + "PIPELINE_GET": "Buscar pipelines", + "PIPELINE_PUT": "Atualizar pipeline", + "PIPELINE_DELETE": "Excluir pipeline" + } + } +} \ No newline at end of file diff --git a/src/modules/permissions/permissions.controller.spec.ts b/src/modules/permissions/permissions.controller.spec.ts new file mode 100644 index 0000000..3da89aa --- /dev/null +++ b/src/modules/permissions/permissions.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { PermissionsController } from './permissions.controller'; + +describe('PermissionsController', () => { + let controller: PermissionsController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [PermissionsController], + }).compile(); + + controller = module.get(PermissionsController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts new file mode 100644 index 0000000..2be94c4 --- /dev/null +++ b/src/modules/permissions/permissions.controller.ts @@ -0,0 +1,23 @@ +import { Controller, Get, Inject } from '@nestjs/common'; +import { ApiTags } from '@nestjs/swagger'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { User } from 'src/authentication/user.decorator'; +import { PermissionsClientService } from './permissions.service'; + +@ApiTags('Permissions') +@Controller('permissions') +export class PermissionsController { + logger: any; + + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + private permissionsService: PermissionsClientService, + ) { + this.logger = dadosferaLogger.logger; + } + @Get() + getPublicPermissions(@User() user) { + this.logger.info('getPublicPermissions', { user }); + } +} diff --git a/src/modules/permissions/permissions.module.ts b/src/modules/permissions/permissions.module.ts index f390558..3dca762 100644 --- a/src/modules/permissions/permissions.module.ts +++ b/src/modules/permissions/permissions.module.ts @@ -5,6 +5,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; import { PermissionsClientService } from './permissions.service'; import { DucClient } from '../../clients/duc/client.config'; +import { PermissionsController } from './permissions.controller'; const ducClient = new DucClient(); @Module({ @@ -17,5 +18,6 @@ const ducClient = new DucClient(); ]), ], providers: [PermissionsClientService, DadosferaLogger], + controllers: [PermissionsController], }) export class PermissionsModule {} diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts new file mode 100644 index 0000000..65eebcc --- /dev/null +++ b/src/modules/roles/dto/entities.ts @@ -0,0 +1,58 @@ +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; + +export class Permission { + @ApiProperty() + id: string; + @ApiProperty() + seqid: number; + @ApiProperty() + name: string; + @ApiProperty() + claim: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} +export class Role { + @ApiPropertyOptional({ type: [Permission] }) + permissions: Permission[]; + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} + +export enum TrueOrFalseEnum { + true = 'true', + false = 'false', +} +export class GetRolesByCustomerReq { + @ApiPropertyOptional() + permission_id: string[]; + @ApiPropertyOptional({ enum: TrueOrFalseEnum }) + get_users: TrueOrFalseEnum; +} + +export class GetRolesByCustomerRes { + @ApiProperty({ type: [Role] }) + roles: Role[]; +} +export class CreateRoleReq { + @ApiProperty() + name: string; + @ApiProperty() + permissionIds: string[]; + @ApiProperty() + userIds: string[]; + @ApiProperty() + customerId: string; +} +export class CreateRoleRes { + @ApiProperty({ type: [Role] }) + roles: Role[]; +} diff --git a/src/modules/roles/roles.controller.spec.ts b/src/modules/roles/roles.controller.spec.ts new file mode 100644 index 0000000..79260d6 --- /dev/null +++ b/src/modules/roles/roles.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { RolesController } from './roles.controller'; + +describe('RolesController', () => { + let controller: RolesController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [RolesController], + }).compile(); + + controller = module.get(RolesController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts new file mode 100644 index 0000000..13fe6b6 --- /dev/null +++ b/src/modules/roles/roles.controller.ts @@ -0,0 +1,53 @@ +import { + Body, + Controller, + Delete, + Get, + Inject, + Param, + Post, + Query, +} from '@nestjs/common'; +import { ApiResponse, ApiTags } from '@nestjs/swagger'; +import { User } from 'src/authentication/user.decorator'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { RolesService } from './roles.service'; +import { + CreateRoleReq, + CreateRoleRes, + GetRolesByCustomerReq, + GetRolesByCustomerRes, +} from './dto/entities'; + +@ApiTags('Roles') +@Controller('roles') +export class RolesController { + logger: any; + + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + private rolesService: RolesService, + ) { + this.logger = dadosferaLogger.logger; + } + @Get() + @ApiResponse({ type: GetRolesByCustomerRes }) + async getRolesByCustomer( + @User() user, + @Query() filters: GetRolesByCustomerReq, + ) { + this.logger.info('getRolesByCustomer', { user }); + this.rolesService.getRolesByCustomer(filters); + } + @Post() + @ApiResponse({ type: CreateRoleRes }) + async createRole(@User() user, @Body() body: CreateRoleReq) { + this.logger.info('createRole', { user }); + } + @Delete(':id') + async deleteRole(@User() user, @Param('id') id: string) { + this.logger.info('deleteRole', { user }); + return await this.rolesService.removeRole(id); + } +} diff --git a/src/modules/roles/roles.module.ts b/src/modules/roles/roles.module.ts new file mode 100644 index 0000000..4e3bec6 --- /dev/null +++ b/src/modules/roles/roles.module.ts @@ -0,0 +1,22 @@ +import { Module } from '@nestjs/common'; +import { ClientsModule } from '@nestjs/microservices'; +import { DucClient } from 'src/clients/duc/client.config'; +import { RolesController } from './roles.controller'; +import { RolesService } from './roles.service'; +import { DadosferaLogger } from 'dadosfera-logs'; + +const ducClient = new DucClient(); + +@Module({ + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], + controllers: [RolesController], + providers: [RolesService, DadosferaLogger], +}) +export class RolesModule {} diff --git a/src/modules/roles/roles.service.spec.ts b/src/modules/roles/roles.service.spec.ts new file mode 100644 index 0000000..058d35f --- /dev/null +++ b/src/modules/roles/roles.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { RolesService } from './roles.service'; + +describe('RolesService', () => { + let service: RolesService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [RolesService], + }).compile(); + + service = module.get(RolesService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts new file mode 100644 index 0000000..5b64d32 --- /dev/null +++ b/src/modules/roles/roles.service.ts @@ -0,0 +1,36 @@ +import { Inject, Injectable } from '@nestjs/common'; +import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; +import { RolesProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { GetRolesByCustomerReq } from './dto/entities'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { ClientGrpc } from '@nestjs/microservices'; +import { lastValueFrom } from 'rxjs'; + +@Injectable() +export class RolesService { + logger: any; + + private rolesClientService: RolesProtoService; + constructor( + @Inject(DadosferaLogger) + dadosferaLogger: DadosferaLogger, + @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc, + ) { + this.logger = dadosferaLogger.logger; + } + + onModuleInit() { + this.rolesClientService = this.grpcClient.getService( + ProtoServices.UsersProtoService, + ); + } + async getRolesByCustomer(filters: GetRolesByCustomerReq) { + let { permission_id } = filters; + if (!Array.isArray(permission_id)) permission_id = [permission_id]; + const { get_users } = filters; + const is_get_users = get_users === 'true'; + } + async removeRole(id: string) { + return lastValueFrom(this.rolesClientService.RoleRemove({ id })); + } +} diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index b6d4420..5a07fac 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,4 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { Role } from 'src/modules/roles/dto/entities'; export class Customer { @ApiProperty() id: string; @@ -15,28 +16,26 @@ export class Customer { @ApiProperty() updatedAt: string; } -export class Permission { - @ApiProperty() - id: string; - @ApiProperty() - seqid: number; - @ApiProperty() - name: string; - @ApiProperty() - claim: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; -} -export class Role { - @ApiProperty({ type: [Permission] }) - permissions: Permission[]; +export class User { @ApiProperty() id: string; @ApiProperty() name: string; @ApiProperty() + email: string; + @ApiProperty({ type: [Role] }) + roles: Role[]; + @ApiProperty() + jobTitle: string; + @ApiProperty() + department: string; + @ApiProperty() + hierarchy: number; + @ApiProperty() + customer: Customer; + @ApiProperty() + mfaStatus: string; + @ApiProperty() createdAt: string; @ApiProperty() updatedAt: string; @@ -57,61 +56,31 @@ export class UserByCustomer { @ApiProperty() updatedAt: string; } -export class User { - @ApiProperty() - id: string; - @ApiProperty() - name: string; - @ApiProperty() - username: string; - @ApiProperty() - UserRole: string[]; - @ApiProperty() - customer: Customer; - @ApiProperty() - mfaStatus: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; -} export class CreateUserReq { - @ApiProperty() + @ApiPropertyOptional() name: string; @ApiProperty() email: string; - @ApiProperty() + @ApiPropertyOptional() roles: string[]; - @ApiProperty() + @ApiPropertyOptional() jobTitle: string; - @ApiProperty() + @ApiPropertyOptional() department: string; - @ApiProperty() + @ApiPropertyOptional() hierarchy: number; } export class CreateUserRes { @ApiProperty() - id: string; - @ApiProperty() - name: string; - @ApiProperty() - email: string; - @ApiProperty() - roles: string[]; - @ApiProperty() - jobTitle: string; - @ApiProperty() - department: string; - @ApiProperty() - hierarchy: number; - @ApiProperty() - customer: Customer; - @ApiProperty() - mfaStatus: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; + user: User; +} +export class BatchCreateUserReq { + @ApiProperty({ type: [CreateUserReq] }) + users: CreateUserReq[]; +} +export class BatchCreateUserRes { + @ApiProperty({ type: [User] }) + users: User[]; } export class GetAllUsersByCustomerIdReq { diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 0871659..a2c2507 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -39,9 +39,14 @@ export class UsersController { @Post() @ApiOkResponse({ type: CreateUserRes }) async createUser(@User() user, @Body() body: CreateUserReq) { - console.log(body); + this.logger.info('createUser', { user }); } + @Post('batch') + @ApiOkResponse({ type: CreateUserRes }) + async batchCreateUser(@User() user, @Body() body: CreateUserReq) { + this.logger.info('batchCreateUser', { user }); + } @Delete(':id') @ApiOkResponse({ type: DeleteUserRes }) async deleteUser(@User() user, @Param('id') id: string) { diff --git a/src/modules/users/users.module.ts b/src/modules/users/users.module.ts index 8ee1859..87b5a5d 100644 --- a/src/modules/users/users.module.ts +++ b/src/modules/users/users.module.ts @@ -4,6 +4,7 @@ import { UsersService } from './users.service'; import { DadosferaLogger } from 'dadosfera-logs'; import { ClientsModule } from '@nestjs/microservices'; import { DucClient } from 'src/clients/duc/client.config'; + const ducClient = new DucClient(); @Module({ From 730fab8ed1d54c90fa6b50c57fb9ec06ed1df5d6 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 8 Jul 2022 19:03:32 -0300 Subject: [PATCH 06/47] FEAT: internationalization of permissions --- package-lock.json | 118 ++-- package.json | 1 - .../authentication.guard.spec.ts | 20 +- src/authentication/permissions.enum.ts | 518 ++++++++++++------ src/authentication/user.decorator.spec.ts | 4 +- src/i18n/pt/messages.json | 11 - src/modules/catalog/catalog.controller.ts | 4 +- src/modules/inputs/inputs.controller.ts | 6 +- src/modules/outputs/outputs.controllers.ts | 4 +- src/modules/permissions/dto/entities.ts | 30 + .../permissions/permissions.service.ts | 19 +- src/modules/pipelines/pipelines.controller.ts | 4 +- src/modules/roles/dto/entities.ts | 16 +- .../transformations.controller.ts | 4 +- 14 files changed, 469 insertions(+), 290 deletions(-) delete mode 100644 src/i18n/pt/messages.json create mode 100644 src/modules/permissions/dto/entities.ts diff --git a/package-lock.json b/package-lock.json index 8e2c785..2373222 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,6 @@ "helmet": "^5.1.0", "jsonwebtoken": "^8.5.1", "jwk-to-pem": "^2.0.5", - "nestjs-i18n": "^9.1.3", "passport": "^0.6.0", "passport-facebook": "^3.0.0", "passport-forcedotcom": "^0.1.5", @@ -3468,11 +3467,6 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/accept-language-parser": { - "version": "1.5.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/accept-language-parser/-/accept-language-parser-1.5.0.tgz", - "integrity": "sha512-QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==" - }, "node_modules/accepts": { "version": "1.3.8", "license": "MIT", @@ -3663,6 +3657,7 @@ }, "node_modules/anymatch": { "version": "3.1.2", + "dev": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -3683,6 +3678,7 @@ }, "node_modules/argparse": { "version": "2.0.1", + "dev": true, "license": "Python-2.0" }, "node_modules/array-flatten": { @@ -3924,6 +3920,7 @@ }, "node_modules/binary-extensions": { "version": "2.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4009,6 +4006,7 @@ }, "node_modules/braces": { "version": "3.0.2", + "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.0.1" @@ -4197,6 +4195,7 @@ }, "node_modules/chokidar": { "version": "3.5.3", + "dev": true, "funding": [ { "type": "individual", @@ -4242,6 +4241,7 @@ "version": "0.13.2", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/class-validator/-/class-validator-0.13.2.tgz", "integrity": "sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==", + "optional": true, "peer": true, "dependencies": { "libphonenumber-js": "^1.9.43", @@ -5718,6 +5718,7 @@ }, "node_modules/fill-range": { "version": "7.0.1", + "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -6051,6 +6052,7 @@ }, "node_modules/glob-parent": { "version": "5.1.2", + "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -6464,6 +6466,7 @@ }, "node_modules/is-binary-path": { "version": "2.1.0", + "dev": true, "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -6524,6 +6527,7 @@ }, "node_modules/is-extglob": { "version": "2.1.1", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -6557,6 +6561,7 @@ }, "node_modules/is-glob": { "version": "4.0.3", + "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -6608,6 +6613,7 @@ }, "node_modules/is-number": { "version": "7.0.0", + "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -7630,6 +7636,7 @@ }, "node_modules/js-yaml": { "version": "4.1.0", + "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -7831,6 +7838,7 @@ "version": "1.10.7", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/libphonenumber-js/-/libphonenumber-js-1.10.7.tgz", "integrity": "sha512-jZXLCCWMe1b/HXkjiLeYt2JsytZMcqH26jLFIdzFDFF0xvSUWrYKyvPlyPG+XJzEyKUFbcZxLdWGMwQsWaHDxQ==", + "optional": true, "peer": true }, "node_modules/lines-and-columns": { @@ -8249,33 +8257,6 @@ "dev": true, "license": "MIT" }, - "node_modules/nestjs-i18n": { - "version": "9.1.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/nestjs-i18n/-/nestjs-i18n-9.1.3.tgz", - "integrity": "sha512-55hLPenqoHq7sNybxjHoe6Q+RjeZelmaCnCx/niT28GvCLPUteNO4jOe/4AWvLvLrnW0cj7l0sHHzgXlPTilfg==", - "dependencies": { - "accept-language-parser": "^1.5.0", - "chokidar": "^3.5.3", - "cookie": "^0.4.1", - "iterare": "^1.2.1", - "js-yaml": "^4.1.0", - "string-format": "^2.0.0" - }, - "peerDependencies": { - "@nestjs/common": "*", - "@nestjs/core": "*", - "class-validator": "~0.13", - "rxjs": "*" - } - }, - "node_modules/nestjs-i18n/node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/next-line": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", @@ -8350,6 +8331,7 @@ }, "node_modules/normalize-path": { "version": "3.0.0", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -8848,6 +8830,7 @@ }, "node_modules/picomatch": { "version": "2.3.1", + "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -9167,6 +9150,7 @@ }, "node_modules/readdirp": { "version": "3.6.0", + "dev": true, "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -9750,11 +9734,6 @@ "version": "5.1.2", "license": "MIT" }, - "node_modules/string-format": { - "version": "2.0.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/string-format/-/string-format-2.0.0.tgz", - "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==" - }, "node_modules/string-length": { "version": "4.0.2", "dev": true, @@ -10126,6 +10105,7 @@ }, "node_modules/to-regex-range": { "version": "5.0.1", + "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -10612,6 +10592,7 @@ "version": "13.7.0", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/validator/-/validator-13.7.0.tgz", "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "optional": true, "peer": true, "engines": { "node": ">= 0.10" @@ -13505,11 +13486,6 @@ "version": "2.0.6", "dev": true }, - "accept-language-parser": { - "version": "1.5.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/accept-language-parser/-/accept-language-parser-1.5.0.tgz", - "integrity": "sha512-QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==" - }, "accepts": { "version": "1.3.8", "requires": { @@ -13625,6 +13601,7 @@ }, "anymatch": { "version": "3.1.2", + "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -13638,7 +13615,8 @@ "dev": true }, "argparse": { - "version": "2.0.1" + "version": "2.0.1", + "dev": true }, "array-flatten": { "version": "1.1.1" @@ -13817,7 +13795,8 @@ } }, "binary-extensions": { - "version": "2.2.0" + "version": "2.2.0", + "dev": true }, "binary-search": { "version": "1.3.6", @@ -13889,6 +13868,7 @@ }, "braces": { "version": "3.0.2", + "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -13993,6 +13973,7 @@ }, "chokidar": { "version": "3.5.3", + "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -14020,6 +14001,7 @@ "version": "0.13.2", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/class-validator/-/class-validator-0.13.2.tgz", "integrity": "sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==", + "optional": true, "peer": true, "requires": { "libphonenumber-js": "^1.9.43", @@ -15067,6 +15049,7 @@ }, "fill-range": { "version": "7.0.1", + "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -15274,6 +15257,7 @@ }, "glob-parent": { "version": "5.1.2", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -15535,6 +15519,7 @@ }, "is-binary-path": { "version": "2.1.0", + "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -15568,7 +15553,8 @@ } }, "is-extglob": { - "version": "2.1.1" + "version": "2.1.1", + "dev": true }, "is-finite": { "version": "1.1.0", @@ -15584,6 +15570,7 @@ }, "is-glob": { "version": "4.0.3", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -15620,7 +15607,8 @@ "integrity": "sha512-m2Rm8PhUFDNNhgvwZJjJG74a9h5CHU0fkA8WT+WGlCjyEbZ2jPwgb+ZxHu4np284EqNVyOsgppReK4qy/TwEwg==" }, "is-number": { - "version": "7.0.0" + "version": "7.0.0", + "dev": true }, "is-number-object": { "version": "1.0.7", @@ -16320,6 +16308,7 @@ }, "js-yaml": { "version": "4.1.0", + "dev": true, "requires": { "argparse": "^2.0.1" } @@ -16461,6 +16450,7 @@ "version": "1.10.7", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/libphonenumber-js/-/libphonenumber-js-1.10.7.tgz", "integrity": "sha512-jZXLCCWMe1b/HXkjiLeYt2JsytZMcqH26jLFIdzFDFF0xvSUWrYKyvPlyPG+XJzEyKUFbcZxLdWGMwQsWaHDxQ==", + "optional": true, "peer": true }, "lines-and-columns": { @@ -16744,26 +16734,6 @@ "version": "2.6.2", "dev": true }, - "nestjs-i18n": { - "version": "9.1.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/nestjs-i18n/-/nestjs-i18n-9.1.3.tgz", - "integrity": "sha512-55hLPenqoHq7sNybxjHoe6Q+RjeZelmaCnCx/niT28GvCLPUteNO4jOe/4AWvLvLrnW0cj7l0sHHzgXlPTilfg==", - "requires": { - "accept-language-parser": "^1.5.0", - "chokidar": "^3.5.3", - "cookie": "^0.4.1", - "iterare": "^1.2.1", - "js-yaml": "^4.1.0", - "string-format": "^2.0.0" - }, - "dependencies": { - "cookie": { - "version": "0.4.2", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" - } - } - }, "next-line": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", @@ -16818,7 +16788,8 @@ "dev": true }, "normalize-path": { - "version": "3.0.0" + "version": "3.0.0", + "dev": true }, "npm-run-path": { "version": "4.0.1", @@ -17153,7 +17124,8 @@ "dev": true }, "picomatch": { - "version": "2.3.1" + "version": "2.3.1", + "dev": true }, "pino": { "version": "6.14.0", @@ -17366,6 +17338,7 @@ }, "readdirp": { "version": "3.6.0", + "dev": true, "requires": { "picomatch": "^2.2.1" } @@ -17762,11 +17735,6 @@ } } }, - "string-format": { - "version": "2.0.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/string-format/-/string-format-2.0.0.tgz", - "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==" - }, "string-length": { "version": "4.0.2", "dev": true, @@ -18001,6 +17969,7 @@ }, "to-regex-range": { "version": "5.0.1", + "dev": true, "requires": { "is-number": "^7.0.0" } @@ -18322,6 +18291,7 @@ "version": "13.7.0", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/validator/-/validator-13.7.0.tgz", "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "optional": true, "peer": true }, "vary": { diff --git a/package.json b/package.json index 4b3c251..c3e5c80 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "helmet": "^5.1.0", "jsonwebtoken": "^8.5.1", "jwk-to-pem": "^2.0.5", - "nestjs-i18n": "^9.1.3", "passport": "^0.6.0", "passport-facebook": "^3.0.0", "passport-forcedotcom": "^0.1.5", diff --git a/src/authentication/authentication.guard.spec.ts b/src/authentication/authentication.guard.spec.ts index 5400831..a2b9ac3 100644 --- a/src/authentication/authentication.guard.spec.ts +++ b/src/authentication/authentication.guard.spec.ts @@ -13,7 +13,7 @@ import { RequireSomePermission, } from './authentication.decorator'; import { AuthenticationGuard } from './authentication.guard'; -import { Permissions } from './permissions.enum'; +import { PERMISSIONS } from './permissions.enum'; import { AuthClientService } from '../modules/auth/auth.service'; import ErrorCodes from '../utils/errorCodes'; @@ -32,19 +32,19 @@ class NoClassAuthController { } @Get('required-permission') - @RequireSomePermission(Permissions.ZENDESK.OPEN) + @RequireSomePermission(PERMISSIONS.ZENDESK.OPEN) async requiredPermission(@Body() body) { return { body }; } @Get('has-all-permissions') - @RequireAllPermissions(Permissions.ZENDESK.OPEN, Permissions.METABASE.OPEN) + @RequireAllPermissions(PERMISSIONS.ZENDESK.OPEN, PERMISSIONS.METABASE.OPEN) async hasAllPermissions(@Body() body) { return { body }; } @Get('has-some-permission') - @RequireSomePermission(Permissions.ZENDESK.OPEN, Permissions.METABASE.OPEN) + @RequireSomePermission(PERMISSIONS.ZENDESK.OPEN, PERMISSIONS.METABASE.OPEN) async hasSomePermission(@Body() body) { return { body }; } @@ -52,7 +52,7 @@ class NoClassAuthController { @Controller('class-auth-condition') @AuthenticateCondition((req) => req.get('x-on-class') === 'ok') -@RequireSomePermission(Permissions.METABASE.OPEN) +@RequireSomePermission(PERMISSIONS.METABASE.OPEN) class ClassAuthConditionController { @Get('body') async getBody(@Body() body) { @@ -67,7 +67,7 @@ class ClassAuthConditionController { @Get('required-permission') @AuthenticateCondition((req) => req.get('x-on-route') === 'ok') - @RequireSomePermission(Permissions.ZENDESK.OPEN) + @RequireSomePermission(PERMISSIONS.ZENDESK.OPEN) async requiredPermission(@Body() body) { return { body }; } @@ -430,17 +430,17 @@ describe('authentication.guard', () => { NoClassAuthTest(null, null); ClassAuthConditionTest(null, null); - const tokenZ = CreateToken([Permissions.ZENDESK.OPEN]); + const tokenZ = CreateToken([PERMISSIONS.ZENDESK.OPEN]); NoClassAuthTest(tokenZ, ['zendesk']); ClassAuthConditionTest(tokenZ, ['zendesk']); - const tokenM = CreateToken([Permissions.METABASE.OPEN]); + const tokenM = CreateToken([PERMISSIONS.METABASE.OPEN]); NoClassAuthTest(tokenM, ['metabase']); ClassAuthConditionTest(tokenM, ['metabase']); const tokenZM = CreateToken([ - Permissions.ZENDESK.OPEN, - Permissions.METABASE.OPEN, + PERMISSIONS.ZENDESK.OPEN, + PERMISSIONS.METABASE.OPEN, ]); NoClassAuthTest(tokenZM, ['zendesk', 'metabase']); ClassAuthConditionTest(tokenZM, ['zendesk', 'metabase']); diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 0dc0b2a..4589d3a 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -12,7 +12,17 @@ export interface Permission { seqid: number; claim: string; usage: PermissionUsages; - name?: string; + name?: { + 'pt-br': string; + 'en-us': string; + }; +} +export interface PermissionGroup { + title: { + 'pt-br': string; + 'en-us': string; + }; + permissions: Record; } /* @@ -23,224 +33,406 @@ export interface Permission { /*export const Permissions: { [P in keyof any]: { [Q in keyof any]: Permission }; } = {*/ -export const Permissions: Record> = { +export const PERMISSIONS = { AUTH: { - CREATE: { - seqid: 18, - claim: 'POST /auth', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Autenticação', + 'en-us': 'Authentication', + }, + permissions: { + CREATE: { + seqid: 18, + claim: 'POST /auth', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': '', + 'en-us': '', + }, + }, }, }, PIPELINE: { - CREATE: { - seqid: 23, - claim: 'pipeline:create', - usage: PermissionUsages.PUBLIC, - name: 'PERMISSIONS.NAMES.PIPELINE_CREATE', + title: { + 'pt-br': 'Pipelines', + 'en-us': 'Pipelines', }, - GET: { - seqid: 13, - claim: 'pipeline:get', - usage: PermissionUsages.PUBLIC, - name: 'PERMISSIONS.NAMES.PIPELINE_GET', - }, - UPDATE: { - seqid: 29, - claim: 'pipeline:update', - usage: PermissionUsages.PUBLIC, - name: 'PERMISSIONS.NAMES.PIPELINE_PUT', - }, - DELETE: { - seqid: 5, - claim: 'pipeline:delete', - usage: PermissionUsages.PUBLIC, - name: 'PERMISSIONS.NAMES.PIPELINE_DELETE', + permissions: { + CREATE: { + seqid: 23, + claim: 'POST /pipelines', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Criar pipelines', + 'en-us': 'Create pipelines', + }, + }, + GET: { + seqid: 13, + claim: 'GET /pipelines', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Buscar pipelines', + 'en-us': 'Get pipelines', + }, + }, + UPDATE: { + seqid: 29, + claim: 'PUT /pipelines', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Atualizar pipeline', + 'en-us': 'Update pipeline', + }, + }, + DELETE: { + seqid: 5, + claim: 'DELETE /pipelines', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Remover pipeline', + 'en-us': 'Delete pipeline', + }, + }, }, }, INPUT: { - CREATE: { - seqid: 21, - claim: 'POST /inputs', - usage: PermissionUsages.PUBLIC, - name: 'Criar conexões', + title: { + 'pt-br': 'Conexões', + 'en-us': 'Connections', }, - GET: { - seqid: 9, - claim: 'GET /inputs', - usage: PermissionUsages.PUBLIC, - name: 'Buscar conexões', - }, - UPDATE: { - seqid: 27, - claim: 'PUT /inputs', - usage: PermissionUsages.PUBLIC, - name: 'Atualizar conexões', - }, - UPDATE_PARTIAL: { - seqid: 17, - claim: 'PATCH /inputs', - usage: PermissionUsages.PUBLIC, - name: 'Atualizar conexões', - }, - DELETE: { - seqid: 3, - claim: 'DELETE /inputs', - usage: PermissionUsages.PUBLIC, - }, - GET_ENTITIES: { - seqid: 10, - claim: 'GET /inputs/available-entities', - usage: PermissionUsages.PUBLIC, + permissions: { + CREATE: { + seqid: 21, + claim: 'POST /inputs', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Criar conexões', + 'en-us': 'Create connections', + }, + }, + GET: { + seqid: 9, + claim: 'GET /inputs', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Buscar conexões', + 'en-us': 'Get connections', + }, + }, + UPDATE: { + seqid: 27, + claim: 'PUT /inputs', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Atualizar conexões', + 'en-us': 'Create connections', + }, + }, + DELETE: { + seqid: 3, + claim: 'DELETE /inputs', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Remover conexões', + 'en-us': 'Delete connections', + }, + }, + GET_ENTITIES: { + seqid: 10, + claim: 'GET /inputs/available-entities', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Remover conexões', + 'en-us': 'Delete connections', + }, + }, }, }, OUTPUT: { - CREATE: { - seqid: 22, - claim: 'POST /outputs', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Output', + 'en-us': 'Output', }, - GET: { - seqid: 12, - claim: 'GET /outputs', - usage: PermissionUsages.PUBLIC, - }, - UPDATE: { - seqid: 28, - claim: 'PUT /outputs', - usage: PermissionUsages.PUBLIC, - }, - DELETE: { - seqid: 4, - claim: 'DELETE /outputs', - usage: PermissionUsages.PUBLIC, + permissions: { + CREATE: { + seqid: 22, + claim: 'POST /outputs', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Criar outputs', + 'en-us': 'Create outputs', + }, + }, + GET: { + seqid: 12, + claim: 'GET /outputs', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Buscar outputs', + 'en-us': 'Get outputs', + }, + }, + UPDATE: { + seqid: 28, + claim: 'PUT /outputs', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Editar outputs', + 'en-us': 'Edit outputs', + }, + }, + DELETE: { + seqid: 4, + claim: 'DELETE /outputs', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Remover outputs', + 'en-us': 'Remove outputs', + }, + }, }, }, TRANSFORMATIONS: { - CREATE: { - seqid: 24, - claim: 'POST /transformations', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Micro-transformações', + 'en-us': 'Micro-transformations', }, - GET: { - seqid: 15, - claim: 'GET /transformations', - usage: PermissionUsages.PUBLIC, - }, - UPDATE: { - seqid: 30, - claim: 'PUT /transformations', - usage: PermissionUsages.PUBLIC, - }, - DELETE: { - seqid: 6, - claim: 'DELETE /transformations', - usage: PermissionUsages.PUBLIC, + permissions: { + CREATE: { + seqid: 24, + claim: 'POST /transformations', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Criar micro-transformações', + 'en-us': 'Create micro-transformations', + }, + }, + GET: { + seqid: 15, + claim: 'GET /transformations', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Buscar micro-transformações', + 'en-us': 'Get micro-transformations', + }, + }, + UPDATE: { + seqid: 30, + claim: 'PUT /transformations', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Editar micro-transformações', + 'en-us': 'Edit micro-transformations', + }, + }, + DELETE: { + seqid: 6, + claim: 'DELETE /transformations', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Remover micro-transformações', + 'en-us': 'Remove micro-transformations', + }, + }, }, }, CATALOG: { - CREATE: { - seqid: 19, - claim: 'POST /catalog', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Catálogo', + 'en-us': 'Catalog', }, - GET: { - seqid: 7, - claim: 'GET /catalog', - usage: PermissionUsages.PUBLIC, - }, - UPDATE: { - seqid: 25, - claim: 'PUT /catalog', - usage: PermissionUsages.PUBLIC, - }, - DELETE: { - seqid: 1, - claim: 'DELETE /catalog', - usage: PermissionUsages.PUBLIC, + permissions: { + CREATE: { + seqid: 19, + claim: 'POST /catalog', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Criar atributos no catálogo', + 'en-us': 'Create catalog attributes', + }, + }, + GET: { + seqid: 7, + claim: 'GET /catalog', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Buscar catálogos', + 'en-us': 'Get catalogs', + }, + }, + UPDATE: { + seqid: 25, + claim: 'PUT /catalog', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Editar catálogo', + 'en-us': 'Edit catalogs', + }, + }, + DELETE: { + seqid: 1, + claim: 'DELETE /catalog', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Remover catálogo', + 'en-us': 'Remove catalogs', + }, + }, }, }, CONNECTORS: { - CREATE: { - seqid: 20, - claim: 'POST /connectors', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Conectores', + 'en-us': 'Connectors', }, - GET: { - seqid: 8, - claim: 'GET /connectors', - usage: PermissionUsages.PUBLIC, - }, - UPDATE: { - seqid: 26, - claim: 'PUT /connectors', - usage: PermissionUsages.PUBLIC, - }, - DELETE: { - seqid: 2, - claim: 'DELETE /connectors', - usage: PermissionUsages.PUBLIC, + permissions: { + CREATE: { + seqid: 20, + claim: 'POST /connectors', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Criar conectores', + 'en-us': 'Create connectors', + }, + }, + GET: { + seqid: 8, + claim: 'GET /connectors', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Buscar conectores', + 'en-us': 'Get connectors', + }, + }, + UPDATE: { + seqid: 26, + claim: 'PUT /connectors', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Editar conectores', + 'en-us': 'Edit connectors', + }, + }, + DELETE: { + seqid: 2, + claim: 'DELETE /connectors', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Remover conectores', + 'en-us': 'Remove connectors', + }, + }, }, }, SNOWFLAKE: { - OPEN: { - seqid: 14, - claim: 'GET /snowflake', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Snowflake', + 'en-us': 'Snowflake', + }, + permissions: { + OPEN: { + seqid: 14, + claim: 'GET /snowflake', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Acessar Snowflake', + 'en-us': 'Access Snowflake', + }, + }, }, }, ZENDESK: { - OPEN: { - seqid: 16, - claim: 'GET /zendesk', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Zendesk', + 'en-us': 'Zendesk', + }, + permissions: { + OPEN: { + seqid: 16, + claim: 'GET /zendesk', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Acessar Zendesk', + 'en-us': 'Access Zendesk', + }, + }, }, }, METABASE: { - OPEN: { - seqid: 11, - claim: 'GET /metabase', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Metabase', + 'en-us': 'Metabase', + }, + permissions: { + OPEN: { + seqid: 11, + claim: 'GET /metabase', + usage: PermissionUsages.INTERNAL, + name: { + 'pt-br': 'Acessar Metabase', + 'en-us': 'Access Metabase', + }, + }, }, }, ORCHEST: { - INTELLIGENCE: { - seqid: 31, - claim: 'intelligence:open', - usage: PermissionUsages.PUBLIC, + title: { + 'pt-br': 'Orchest', + 'en-us': 'Orchest', }, - APP_BUILDER: { - seqid: 32, - claim: 'app-builder:open', - usage: PermissionUsages.PUBLIC, - }, - MACHINE_LEARNING: { - seqid: 33, - claim: 'machine-learning:open', - usage: PermissionUsages.PUBLIC, + permissions: { + INTELLIGENCE: { + seqid: 31, + claim: 'intelligence:open', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Acessar inteligência', + 'en-us': 'Access intelligence', + }, + }, + APP_BUILDER: { + seqid: 32, + claim: 'app-builder:open', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Acessar App Builder', + 'en-us': 'Access App Builder', + }, + }, + MACHINE_LEARNING: { + seqid: 33, + claim: 'machine-learning:open', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Acessar Machine Learning', + 'en-us': 'Access Machine Learning', + }, + }, }, }, }; +export type PermissionsObject = typeof PERMISSIONS; // traverses the object searching for duplicate seqids or claims (executes at runtime) let nextAvailableSeqid = 0; -const seqids = Object.values(Permissions).flatMap((namespace) => - Object.values(namespace).map(({ seqid }) => seqid), +const seqids = Object.values(PERMISSIONS).flatMap((namespace) => + Object.values(namespace.permissions).map(({ seqid }) => seqid), ); -const claims = Object.values(Permissions).flatMap((namespace) => - Object.values(namespace).map(({ claim }) => claim), +const claims = Object.values(PERMISSIONS).flatMap((namespace) => + Object.values(namespace.permissions).map(({ claim }) => claim), ); -Object.values(Permissions).map((namespace) => - Object.values(namespace).map(({ seqid, claim }) => { +Object.values(PERMISSIONS).map((namespace) => + Object.values(namespace.permissions).map(({ seqid, claim }) => { const seqidsCount = seqids.filter((x) => x === seqid).length; assert(seqidsCount === 1, `seqid ${seqid} count is not 1`); diff --git a/src/authentication/user.decorator.spec.ts b/src/authentication/user.decorator.spec.ts index cc57a88..91eee24 100644 --- a/src/authentication/user.decorator.spec.ts +++ b/src/authentication/user.decorator.spec.ts @@ -11,7 +11,7 @@ import { AuthClientService } from '../modules/auth/auth.service'; import ErrorCodes from '../utils/errorCodes'; import { User } from './user.decorator'; -import { Permissions } from './permissions.enum'; +import { PERMISSIONS } from './permissions.enum'; @Controller('user') class UserController { @@ -45,7 +45,7 @@ describe('user.decorator', () => { const fakeUserPayload = { user_id: 'd50d33c7-6c2b-463c-861f-e21667e7c125', username: 'super.admin', - permissions: [Permissions.METABASE.OPEN].map(({ seqid }) => seqid), + permissions: [PERMISSIONS.METABASE.OPEN].map(({ seqid }) => seqid), customer_id: '9d18e8ae-24b9-41a3-9e8f-a25ce57555b11', customer_name: 'dadosfera', customer_tier: 'BASIC', diff --git a/src/i18n/pt/messages.json b/src/i18n/pt/messages.json deleted file mode 100644 index dc5f042..0000000 --- a/src/i18n/pt/messages.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ERRORS": {}, - "PERMISSIONS": { - "NAMES": { - "PIPELINE_CREATE": "Criar pipeline", - "PIPELINE_GET": "Buscar pipelines", - "PIPELINE_PUT": "Atualizar pipeline", - "PIPELINE_DELETE": "Excluir pipeline" - } - } -} \ No newline at end of file diff --git a/src/modules/catalog/catalog.controller.ts b/src/modules/catalog/catalog.controller.ts index 7c44f81..1d32ebe 100644 --- a/src/modules/catalog/catalog.controller.ts +++ b/src/modules/catalog/catalog.controller.ts @@ -10,7 +10,7 @@ import { } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { AuthenticateCondition } from '../../authentication/authentication.decorator'; -import { Permissions } from '../../authentication/permissions.enum'; +import { PERMISSIONS } from '../../authentication/permissions.enum'; import { CatalogService } from './catalog.service'; import { DadosferaLogger } from 'dadosfera-logs'; @@ -32,7 +32,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(Permissions.CATALOG[action].seqid); + return user.permissions.includes(PERMISSIONS.CATALOG[action].seqid); }) export class CatalogController { logger: any; diff --git a/src/modules/inputs/inputs.controller.ts b/src/modules/inputs/inputs.controller.ts index 7ac86e3..38dd1ba 100644 --- a/src/modules/inputs/inputs.controller.ts +++ b/src/modules/inputs/inputs.controller.ts @@ -12,7 +12,7 @@ import { InputsService } from './inputs.service'; import { DadosferaLogger } from 'dadosfera-logs'; import { InputsClientService } from 'src/clients/inputs/client.service'; import { UpdateInputRequest } from 'src/clients/inputs/interfaces'; -import { Permissions } from '../../authentication/permissions.enum'; +import { PERMISSIONS } from '../../authentication/permissions.enum'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { @@ -41,7 +41,7 @@ import { break; case 'PATCH': - action = 'UPDATE_PARTIAL'; + action = 'UPDATE'; break; default: @@ -55,7 +55,7 @@ import { action = 'GET_ENTITIES'; } - return user.permissions.includes(Permissions.INPUT[action].seqid); + return user.permissions.includes(PERMISSIONS.INPUT[action].seqid); }) export class InputsController { inputService: InputsService; diff --git a/src/modules/outputs/outputs.controllers.ts b/src/modules/outputs/outputs.controllers.ts index e13bf70..ba7b283 100644 --- a/src/modules/outputs/outputs.controllers.ts +++ b/src/modules/outputs/outputs.controllers.ts @@ -12,7 +12,7 @@ import { Payload } from '@nestjs/microservices'; import { ApiTags } from '@nestjs/swagger'; import { OutputsClientService } from 'src/clients/outputs/client.service'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; -import { Permissions } from '../../authentication/permissions.enum'; +import { PERMISSIONS } from '../../authentication/permissions.enum'; import { OutputsService } from './outputs.service'; import { DadosferaLogger } from 'dadosfera-logs'; @@ -34,7 +34,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(Permissions.OUTPUT[action].seqid); + return user.permissions.includes(PERMISSIONS.OUTPUT[action].seqid); }) export class OutputsController { logger: any; diff --git a/src/modules/permissions/dto/entities.ts b/src/modules/permissions/dto/entities.ts new file mode 100644 index 0000000..07a2528 --- /dev/null +++ b/src/modules/permissions/dto/entities.ts @@ -0,0 +1,30 @@ +import { ApiProperty } from '@nestjs/swagger'; + +export class PermissionDto { + @ApiProperty() + name: string; + @ApiProperty() + id: number; +} + +export class PermissionGroup { + @ApiProperty() + title: string; + @ApiProperty({ type: [PermissionDto] }) + permissions: PermissionDto[]; +} + +export class Permission { + @ApiProperty() + id: string; + @ApiProperty() + seqid: number; + @ApiProperty() + name: string; + @ApiProperty() + claim: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 2c0ec54..67c700e 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -11,8 +11,14 @@ import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; import { PermissionsProtoService as PermissionsServiceInterface } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; import { InjectPermissionsRequest } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; import { DadosferaLogger } from 'dadosfera-logs'; -import { Permissions } from '../../authentication/permissions.enum'; +import { + Permission, + PERMISSIONS, + PermissionsObject, + PermissionUsages, +} from '../../authentication/permissions.enum'; import ErrorBuilder from '../../utils/ErrorBuilder'; +import { PermissionGroup } from './dto/entities'; @Injectable() export class PermissionsClientService @@ -40,8 +46,8 @@ export class PermissionsClientService async onApplicationBootstrap() { this.logger.info('sending permissions to DUC...'); - const permissions = Object.values(Permissions).flatMap((namespace) => - Object.values(namespace), + const permissions = Object.values(PERMISSIONS).flatMap((namespace) => + Object.values(namespace.permissions), ); return this.injectPermissions({ @@ -67,4 +73,11 @@ export class PermissionsClientService this.permissionsService.InjectPermissions({ permissions }), ); } + getPublicPermissions() { + return this.getPermissions(PermissionUsages.PUBLIC); + } + getPermissions(permissionUsage?: PermissionUsages): PermissionGroup[] { + const groups: PermissionGroup[] = []; + return groups; + } } diff --git a/src/modules/pipelines/pipelines.controller.ts b/src/modules/pipelines/pipelines.controller.ts index 1c40836..cc17671 100644 --- a/src/modules/pipelines/pipelines.controller.ts +++ b/src/modules/pipelines/pipelines.controller.ts @@ -11,7 +11,7 @@ import { import { ApiTags } from '@nestjs/swagger'; import { PipelinesClientService } from 'src/clients/pipelines/client.service'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; -import { Permissions } from '../../authentication/permissions.enum'; +import { PERMISSIONS } from '../../authentication/permissions.enum'; import { PipelinesService } from './pipelines.service'; import { DadosferaLogger } from 'dadosfera-logs'; @@ -33,7 +33,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(Permissions.PIPELINE[action].seqid); + return user.permissions.includes(PERMISSIONS.PIPELINE[action].seqid); }) export class PipelinesController { logger: any; diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index 65eebcc..deefd83 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -1,19 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; - -export class Permission { - @ApiProperty() - id: string; - @ApiProperty() - seqid: number; - @ApiProperty() - name: string; - @ApiProperty() - claim: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; -} +import { Permission } from 'src/modules/permissions/dto/entities'; export class Role { @ApiPropertyOptional({ type: [Permission] }) permissions: Permission[]; diff --git a/src/modules/transformations/transformations.controller.ts b/src/modules/transformations/transformations.controller.ts index 71b2d21..0c96dbd 100644 --- a/src/modules/transformations/transformations.controller.ts +++ b/src/modules/transformations/transformations.controller.ts @@ -13,7 +13,7 @@ import { ApiTags } from '@nestjs/swagger'; import { TransformationsClientService } from 'src/clients/transformations/client.service'; import { IIdRequest } from 'src/clients/transformations/interfaces'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; -import { Permissions } from '../../authentication/permissions.enum'; +import { PERMISSIONS } from '../../authentication/permissions.enum'; import { TransformationsService } from './transformations.service'; import { DadosferaLogger } from 'dadosfera-logs'; @@ -35,7 +35,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(Permissions.TRANSFORMATIONS[action].seqid); + return user.permissions.includes(PERMISSIONS.TRANSFORMATIONS[action].seqid); }) export class TransformationsController { logger: any; From 5c079bb4f5ca40e7ffe02d85cefbb175c2bee745 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 11 Jul 2022 10:09:06 -0300 Subject: [PATCH 07/47] FIX: permissions contract --- src/modules/permissions/dto/entities.ts | 5 +++++ src/modules/permissions/permissions.controller.ts | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/permissions/dto/entities.ts b/src/modules/permissions/dto/entities.ts index 07a2528..f4dc174 100644 --- a/src/modules/permissions/dto/entities.ts +++ b/src/modules/permissions/dto/entities.ts @@ -28,3 +28,8 @@ export class Permission { @ApiProperty() updatedAt: string; } + +export class GetPublicPermissionsRes { + @ApiProperty({ type: [PermissionGroup] }) + permissionGroups: PermissionGroup[]; +} diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index 2be94c4..539c87a 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -1,7 +1,8 @@ import { Controller, Get, Inject } from '@nestjs/common'; -import { ApiTags } from '@nestjs/swagger'; +import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; import { User } from 'src/authentication/user.decorator'; +import { GetPublicPermissionsRes } from './dto/entities'; import { PermissionsClientService } from './permissions.service'; @ApiTags('Permissions') @@ -16,7 +17,9 @@ export class PermissionsController { ) { this.logger = dadosferaLogger.logger; } + @Get() + @ApiOkResponse({ type: GetPublicPermissionsRes }) getPublicPermissions(@User() user) { this.logger.info('getPublicPermissions', { user }); } From 83dcc7942ceb1a88067789c40ada98a333472864 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 11 Jul 2022 10:42:01 -0300 Subject: [PATCH 08/47] FIX: better code organization --- src/modules/users/users.controller.ts | 37 ++++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index a2c2507..6fde82e 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -36,24 +36,6 @@ export class UsersController { this.logger = dadosferaLogger.logger; } - @Post() - @ApiOkResponse({ type: CreateUserRes }) - async createUser(@User() user, @Body() body: CreateUserReq) { - this.logger.info('createUser', { user }); - } - - @Post('batch') - @ApiOkResponse({ type: CreateUserRes }) - async batchCreateUser(@User() user, @Body() body: CreateUserReq) { - this.logger.info('batchCreateUser', { user }); - } - @Delete(':id') - @ApiOkResponse({ type: DeleteUserRes }) - async deleteUser(@User() user, @Param('id') id: string) { - this.logger.info('deleteUser', { user }); - return await this.userService.deleteUser({ id }); - } - @Get() @ApiOkResponse({ type: GetAllUsersByCustomerIdRes, @@ -70,6 +52,25 @@ export class UsersController { ); } + @Post() + @ApiOkResponse({ type: CreateUserRes }) + async createUser(@User() user, @Body() body: CreateUserReq) { + this.logger.info('createUser', { user }); + } + + @Post('batch') + @ApiOkResponse({ type: CreateUserRes }) + async batchCreateUser(@User() user, @Body() body: CreateUserReq) { + this.logger.info('batchCreateUser', { user }); + } + + @Delete(':id') + @ApiOkResponse({ type: DeleteUserRes }) + async deleteUser(@User() user, @Param('id') id: string) { + this.logger.info('deleteUser', { user }); + return await this.userService.deleteUser({ id }); + } + @Put('role') async assignRoleToUser(@User() user, @Body() body: AssignRoleToUserReq) { this.logger.info('assignRoleToUser', { user }); From 039f837914da3d6c7789d31abf4595f5d5e35fae Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 11 Jul 2022 11:07:08 -0300 Subject: [PATCH 09/47] FIX: tests fixing --- package.json | 8 ++++++- .../authentication.guard.spec.ts | 24 ++++++++++++------- src/authentication/user.decorator.spec.ts | 4 +++- src/modules/catalog/catalog.controller.ts | 4 +++- src/modules/inputs/inputs.controller.ts | 2 +- src/modules/outputs/outputs.controllers.ts | 4 +++- .../permissions.controller.spec.ts | 15 ++++++++++++ src/modules/permissions/permissions.module.ts | 1 + src/modules/pipelines/pipelines.controller.ts | 4 +++- src/modules/roles/roles.controller.spec.ts | 15 ++++++++++++ src/modules/roles/roles.service.spec.ts | 16 ++++++++++++- .../transformations.controller.ts | 4 +++- src/modules/users/users.controller.spec.ts | 15 ++++++++++++ src/modules/users/users.service.spec.ts | 17 ++++++++++++- 14 files changed, 115 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index c3e5c80..e267cb9 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,13 @@ "json", "ts" ], - "rootDir": "src", + "rootDir": ".", + "modulePaths": [ + "" + ], + "moduleDirectories": [ + "node_modules" + ], "testRegex": ".*\\.spec\\.ts$", "transform": { "^.+\\.(t|j)s$": "ts-jest" diff --git a/src/authentication/authentication.guard.spec.ts b/src/authentication/authentication.guard.spec.ts index a2b9ac3..fc6fed1 100644 --- a/src/authentication/authentication.guard.spec.ts +++ b/src/authentication/authentication.guard.spec.ts @@ -32,19 +32,25 @@ class NoClassAuthController { } @Get('required-permission') - @RequireSomePermission(PERMISSIONS.ZENDESK.OPEN) + @RequireSomePermission(PERMISSIONS.ZENDESK.permissions.OPEN) async requiredPermission(@Body() body) { return { body }; } @Get('has-all-permissions') - @RequireAllPermissions(PERMISSIONS.ZENDESK.OPEN, PERMISSIONS.METABASE.OPEN) + @RequireAllPermissions( + PERMISSIONS.ZENDESK.permissions.OPEN, + PERMISSIONS.METABASE.permissions.OPEN, + ) async hasAllPermissions(@Body() body) { return { body }; } @Get('has-some-permission') - @RequireSomePermission(PERMISSIONS.ZENDESK.OPEN, PERMISSIONS.METABASE.OPEN) + @RequireSomePermission( + PERMISSIONS.ZENDESK.permissions.OPEN, + PERMISSIONS.METABASE.permissions.OPEN, + ) async hasSomePermission(@Body() body) { return { body }; } @@ -52,7 +58,7 @@ class NoClassAuthController { @Controller('class-auth-condition') @AuthenticateCondition((req) => req.get('x-on-class') === 'ok') -@RequireSomePermission(PERMISSIONS.METABASE.OPEN) +@RequireSomePermission(PERMISSIONS.METABASE.permissions.OPEN) class ClassAuthConditionController { @Get('body') async getBody(@Body() body) { @@ -67,7 +73,7 @@ class ClassAuthConditionController { @Get('required-permission') @AuthenticateCondition((req) => req.get('x-on-route') === 'ok') - @RequireSomePermission(PERMISSIONS.ZENDESK.OPEN) + @RequireSomePermission(PERMISSIONS.ZENDESK.permissions.OPEN) async requiredPermission(@Body() body) { return { body }; } @@ -430,17 +436,17 @@ describe('authentication.guard', () => { NoClassAuthTest(null, null); ClassAuthConditionTest(null, null); - const tokenZ = CreateToken([PERMISSIONS.ZENDESK.OPEN]); + const tokenZ = CreateToken([PERMISSIONS.ZENDESK.permissions.OPEN]); NoClassAuthTest(tokenZ, ['zendesk']); ClassAuthConditionTest(tokenZ, ['zendesk']); - const tokenM = CreateToken([PERMISSIONS.METABASE.OPEN]); + const tokenM = CreateToken([PERMISSIONS.METABASE.permissions.OPEN]); NoClassAuthTest(tokenM, ['metabase']); ClassAuthConditionTest(tokenM, ['metabase']); const tokenZM = CreateToken([ - PERMISSIONS.ZENDESK.OPEN, - PERMISSIONS.METABASE.OPEN, + PERMISSIONS.ZENDESK.permissions.OPEN, + PERMISSIONS.METABASE.permissions.OPEN, ]); NoClassAuthTest(tokenZM, ['zendesk', 'metabase']); ClassAuthConditionTest(tokenZM, ['zendesk', 'metabase']); diff --git a/src/authentication/user.decorator.spec.ts b/src/authentication/user.decorator.spec.ts index 91eee24..77b084d 100644 --- a/src/authentication/user.decorator.spec.ts +++ b/src/authentication/user.decorator.spec.ts @@ -45,7 +45,9 @@ describe('user.decorator', () => { const fakeUserPayload = { user_id: 'd50d33c7-6c2b-463c-861f-e21667e7c125', username: 'super.admin', - permissions: [PERMISSIONS.METABASE.OPEN].map(({ seqid }) => seqid), + permissions: [PERMISSIONS.METABASE.permissions.OPEN].map( + ({ seqid }) => seqid, + ), customer_id: '9d18e8ae-24b9-41a3-9e8f-a25ce57555b11', customer_name: 'dadosfera', customer_tier: 'BASIC', diff --git a/src/modules/catalog/catalog.controller.ts b/src/modules/catalog/catalog.controller.ts index 1d32ebe..b627f73 100644 --- a/src/modules/catalog/catalog.controller.ts +++ b/src/modules/catalog/catalog.controller.ts @@ -32,7 +32,9 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(PERMISSIONS.CATALOG[action].seqid); + return user.permissions.includes( + PERMISSIONS.CATALOG.permissions[action].seqid, + ); }) export class CatalogController { logger: any; diff --git a/src/modules/inputs/inputs.controller.ts b/src/modules/inputs/inputs.controller.ts index 38dd1ba..ce2ed85 100644 --- a/src/modules/inputs/inputs.controller.ts +++ b/src/modules/inputs/inputs.controller.ts @@ -55,7 +55,7 @@ import { action = 'GET_ENTITIES'; } - return user.permissions.includes(PERMISSIONS.INPUT[action].seqid); + return user.permissions.includes(PERMISSIONS.INPUT.permissions[action].seqid); }) export class InputsController { inputService: InputsService; diff --git a/src/modules/outputs/outputs.controllers.ts b/src/modules/outputs/outputs.controllers.ts index ba7b283..45b07f1 100644 --- a/src/modules/outputs/outputs.controllers.ts +++ b/src/modules/outputs/outputs.controllers.ts @@ -34,7 +34,9 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(PERMISSIONS.OUTPUT[action].seqid); + return user.permissions.includes( + PERMISSIONS.OUTPUT.permissions[action].seqid, + ); }) export class OutputsController { logger: any; diff --git a/src/modules/permissions/permissions.controller.spec.ts b/src/modules/permissions/permissions.controller.spec.ts index 3da89aa..0f34649 100644 --- a/src/modules/permissions/permissions.controller.spec.ts +++ b/src/modules/permissions/permissions.controller.spec.ts @@ -1,12 +1,27 @@ +import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; +import { DucClient } from 'src/clients/duc/client.config'; import { PermissionsController } from './permissions.controller'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { PermissionsClientService } from './permissions.service'; + +const ducClient = new DucClient(); describe('PermissionsController', () => { let controller: PermissionsController; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], controllers: [PermissionsController], + providers: [DadosferaLogger, PermissionsClientService], }).compile(); controller = module.get(PermissionsController); diff --git a/src/modules/permissions/permissions.module.ts b/src/modules/permissions/permissions.module.ts index 3dca762..b569e7c 100644 --- a/src/modules/permissions/permissions.module.ts +++ b/src/modules/permissions/permissions.module.ts @@ -6,6 +6,7 @@ import { PermissionsClientService } from './permissions.service'; import { DucClient } from '../../clients/duc/client.config'; import { PermissionsController } from './permissions.controller'; + const ducClient = new DucClient(); @Module({ diff --git a/src/modules/pipelines/pipelines.controller.ts b/src/modules/pipelines/pipelines.controller.ts index cc17671..5267807 100644 --- a/src/modules/pipelines/pipelines.controller.ts +++ b/src/modules/pipelines/pipelines.controller.ts @@ -33,7 +33,9 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(PERMISSIONS.PIPELINE[action].seqid); + return user.permissions.includes( + PERMISSIONS.PIPELINE.permissions[action].seqid, + ); }) export class PipelinesController { logger: any; diff --git a/src/modules/roles/roles.controller.spec.ts b/src/modules/roles/roles.controller.spec.ts index 79260d6..cc003fa 100644 --- a/src/modules/roles/roles.controller.spec.ts +++ b/src/modules/roles/roles.controller.spec.ts @@ -1,12 +1,27 @@ +import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; +import { DucClient } from 'src/clients/duc/client.config'; import { RolesController } from './roles.controller'; +import { RolesService } from './roles.service'; +import { DadosferaLogger } from 'dadosfera-logs'; + +const ducClient = new DucClient(); describe('RolesController', () => { let controller: RolesController; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], controllers: [RolesController], + providers: [RolesService, DadosferaLogger], }).compile(); controller = module.get(RolesController); diff --git a/src/modules/roles/roles.service.spec.ts b/src/modules/roles/roles.service.spec.ts index 058d35f..79bffd2 100644 --- a/src/modules/roles/roles.service.spec.ts +++ b/src/modules/roles/roles.service.spec.ts @@ -1,12 +1,26 @@ +import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; +import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { DucClient } from 'src/clients/duc/client.config'; + +const ducClient = new DucClient(); describe('RolesService', () => { let service: RolesService; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ - providers: [RolesService], + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], + providers: [RolesService, DadosferaLogger], }).compile(); service = module.get(RolesService); diff --git a/src/modules/transformations/transformations.controller.ts b/src/modules/transformations/transformations.controller.ts index 0c96dbd..d4dea00 100644 --- a/src/modules/transformations/transformations.controller.ts +++ b/src/modules/transformations/transformations.controller.ts @@ -35,7 +35,9 @@ import { DadosferaLogger } from 'dadosfera-logs'; action = req.method; } - return user.permissions.includes(PERMISSIONS.TRANSFORMATIONS[action].seqid); + return user.permissions.includes( + PERMISSIONS.TRANSFORMATIONS.permissions[action].seqid, + ); }) export class TransformationsController { logger: any; diff --git a/src/modules/users/users.controller.spec.ts b/src/modules/users/users.controller.spec.ts index 3e27c39..25524cd 100644 --- a/src/modules/users/users.controller.spec.ts +++ b/src/modules/users/users.controller.spec.ts @@ -1,12 +1,27 @@ +import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; +import { DucClient } from 'src/clients/duc/client.config'; import { UsersController } from './users.controller'; +import { UsersService } from './users.service'; +import { DadosferaLogger } from 'dadosfera-logs'; + +const ducClient = new DucClient(); describe('UsersController', () => { let controller: UsersController; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], controllers: [UsersController], + providers: [UsersService, DadosferaLogger], }).compile(); controller = module.get(UsersController); diff --git a/src/modules/users/users.service.spec.ts b/src/modules/users/users.service.spec.ts index 62815ba..e6c05ef 100644 --- a/src/modules/users/users.service.spec.ts +++ b/src/modules/users/users.service.spec.ts @@ -1,12 +1,27 @@ +import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; +import { UsersController } from './users.controller'; import { UsersService } from './users.service'; +import { DadosferaLogger } from 'dadosfera-logs'; +import { DucClient } from 'src/clients/duc/client.config'; + +const ducClient = new DucClient(); describe('UsersService', () => { let service: UsersService; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ - providers: [UsersService], + imports: [ + ClientsModule.register([ + { + name: 'DUC_PACKAGE', + ...ducClient.config(), + }, + ]), + ], + controllers: [UsersController], + providers: [UsersService, DadosferaLogger], }).compile(); service = module.get(UsersService); From b9612609d912e49b1341e08f1d970937aa9c8d9c Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 11 Jul 2022 16:58:40 -0300 Subject: [PATCH 10/47] FIX: add description on create role documentation --- src/modules/roles/dto/entities.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index deefd83..bec0c4b 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -33,10 +33,10 @@ export class CreateRoleReq { name: string; @ApiProperty() permissionIds: string[]; - @ApiProperty() + @ApiPropertyOptional() userIds: string[]; @ApiProperty() - customerId: string; + description: string; } export class CreateRoleRes { @ApiProperty({ type: [Role] }) From 398360fadbdda9f41e7433c663168e041d7bcae4 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Tue, 12 Jul 2022 12:11:03 -0300 Subject: [PATCH 11/47] FEAT: new routes do add or remove permisisons from role --- src/modules/roles/dto/entities.ts | 33 +++++++++++++++++++++++---- src/modules/roles/roles.controller.ts | 22 ++++++++++++++++++ src/modules/users/dtos/entities.ts | 22 ++++++++++++++++++ 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index bec0c4b..6dc5e40 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -1,12 +1,15 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { Permission } from 'src/modules/permissions/dto/entities'; +import { UserWithoutRoles } from 'src/modules/users/dtos/entities'; export class Role { - @ApiPropertyOptional({ type: [Permission] }) - permissions: Permission[]; @ApiProperty() id: string; @ApiProperty() name: string; + @ApiPropertyOptional({ type: () => [Permission] }) + permissions: Permission[]; + @ApiPropertyOptional({ type: () => [UserWithoutRoles] }) + users: UserWithoutRoles[]; @ApiProperty() createdAt: string; @ApiProperty() @@ -39,6 +42,28 @@ export class CreateRoleReq { description: string; } export class CreateRoleRes { - @ApiProperty({ type: [Role] }) - roles: Role[]; + @ApiProperty() + role: Role; +} + +export class AssignPermissionsToRoleReq { + @ApiProperty() + roleId: string; + @ApiProperty() + permissionIds: string[]; +} +export class AssignPermissionsToRoleRes { + @ApiProperty() + role: Role; +} + +export class UnassignPermissionsToRoleReq { + @ApiProperty() + roleId: string; + @ApiProperty() + permissionIds: string[]; +} +export class UnassignPermissionsToRoleRes { + @ApiProperty() + role: Role; } diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 13fe6b6..f0e38d3 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -6,6 +6,7 @@ import { Inject, Param, Post, + Put, Query, } from '@nestjs/common'; import { ApiResponse, ApiTags } from '@nestjs/swagger'; @@ -13,10 +14,14 @@ import { User } from 'src/authentication/user.decorator'; import { DadosferaLogger } from 'dadosfera-logs'; import { RolesService } from './roles.service'; import { + AssignPermissionsToRoleReq, + AssignPermissionsToRoleRes, CreateRoleReq, CreateRoleRes, GetRolesByCustomerReq, GetRolesByCustomerRes, + UnassignPermissionsToRoleReq, + UnassignPermissionsToRoleRes, } from './dto/entities'; @ApiTags('Roles') @@ -50,4 +55,21 @@ export class RolesController { this.logger.info('deleteRole', { user }); return await this.rolesService.removeRole(id); } + @Put('permissions') + @ApiResponse({ type: AssignPermissionsToRoleRes }) + async assignPermissionsToRole( + @User() user, + @Body() body: AssignPermissionsToRoleReq, + ) { + this.logger.info('assignPermissionsToRole', { user }); + } + + @Delete('permissions') + @ApiResponse({ type: UnassignPermissionsToRoleRes }) + async unassignPermissionsToRole( + @User() user, + @Body() body: UnassignPermissionsToRoleReq, + ) { + this.logger.info('unassignPermissionsToRole', { user }); + } } diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 5a07fac..f1cc1ad 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -40,6 +40,28 @@ export class User { @ApiProperty() updatedAt: string; } +export class UserWithoutRoles { + @ApiProperty() + id: string; + @ApiProperty() + name: string; + @ApiProperty() + email: string; + @ApiProperty() + jobTitle: string; + @ApiProperty() + department: string; + @ApiProperty() + hierarchy: number; + @ApiProperty() + customer: Customer; + @ApiProperty() + mfaStatus: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} export class UserByCustomer { @ApiProperty({ type: [Role] }) roles: Role[]; From bb5befb2f6075022f2147341e71b8cff111180b2 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Tue, 12 Jul 2022 14:27:54 -0300 Subject: [PATCH 12/47] FEAT: new route for updating Roles and changed hierarchy to string --- src/modules/roles/dto/entities.ts | 16 ++++++++++++++++ src/modules/roles/roles.controller.ts | 11 +++++++++++ src/modules/users/dtos/entities.ts | 6 +++--- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index 6dc5e40..a0495f8 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -67,3 +67,19 @@ export class UnassignPermissionsToRoleRes { @ApiProperty() role: Role; } + +export class UpdateRoleReq { + @ApiPropertyOptional() + name: string; + @ApiPropertyOptional() + description: string; + @ApiPropertyOptional() + userIds: string; + @ApiPropertyOptional() + permissionIds: string; +} + +export class UpdateRoleRes { + @ApiProperty() + role: Role; +} diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index f0e38d3..21b1222 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -5,6 +5,7 @@ import { Get, Inject, Param, + Patch, Post, Put, Query, @@ -22,6 +23,7 @@ import { GetRolesByCustomerRes, UnassignPermissionsToRoleReq, UnassignPermissionsToRoleRes, + UpdateRoleReq, } from './dto/entities'; @ApiTags('Roles') @@ -72,4 +74,13 @@ export class RolesController { ) { this.logger.info('unassignPermissionsToRole', { user }); } + @Patch(':id') + @ApiResponse({ type: UpdateRoleRes }) + async updateRole( + @User() user, + @Param('id') id: string, + @Body() body: UpdateRoleReq, + ) { + this.logger.info('updateRole', { user }); + } } diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index f1cc1ad..1d9f010 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -30,7 +30,7 @@ export class User { @ApiProperty() department: string; @ApiProperty() - hierarchy: number; + hierarchy: string; @ApiProperty() customer: Customer; @ApiProperty() @@ -52,7 +52,7 @@ export class UserWithoutRoles { @ApiProperty() department: string; @ApiProperty() - hierarchy: number; + hierarchy: string; @ApiProperty() customer: Customer; @ApiProperty() @@ -90,7 +90,7 @@ export class CreateUserReq { @ApiPropertyOptional() department: string; @ApiPropertyOptional() - hierarchy: number; + hierarchy: string; } export class CreateUserRes { @ApiProperty() From f5064420a7bcbf1b8f77e2f331b712682252875c Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Tue, 12 Jul 2022 14:48:01 -0300 Subject: [PATCH 13/47] FIX: missing import --- src/modules/roles/roles.controller.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 21b1222..a8f615c 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -24,6 +24,7 @@ import { UnassignPermissionsToRoleReq, UnassignPermissionsToRoleRes, UpdateRoleReq, + UpdateRoleRes, } from './dto/entities'; @ApiTags('Roles') From d5cd5628609c0805bac3fcc7e376f7971a9f79a6 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Tue, 12 Jul 2022 15:43:21 -0300 Subject: [PATCH 14/47] FEAT: get permissions working --- .../authentication.decorator.ts | 10 +++++-- src/authentication/permissions.enum.ts | 6 ++-- src/modules/permissions/dto/entities.ts | 11 ++++++- .../permissions/permissions.controller.ts | 20 +++++++++++-- .../permissions/permissions.service.ts | 29 +++++++++++++++---- 5 files changed, 60 insertions(+), 16 deletions(-) diff --git a/src/authentication/authentication.decorator.ts b/src/authentication/authentication.decorator.ts index 6c86f13..5bebd81 100644 --- a/src/authentication/authentication.decorator.ts +++ b/src/authentication/authentication.decorator.ts @@ -1,6 +1,6 @@ import { Request } from 'express'; import { CustomDecorator } from '@nestjs/common'; -import { Permission } from './permissions.enum'; +import { PermissionsObjectPermission } from './permissions.enum'; import { RequestUser } from './user.decorator'; export const AUTH_FUNCTION_KEY = '__AUTH_FUNCTION__'; @@ -31,13 +31,17 @@ function SetMultipleMetadata(metadataKey, metadataValue): CustomDecorator { return decoratorFactory as any; } -export function RequireAllPermissions(...permissions: Permission[]) { +export function RequireAllPermissions( + ...permissions: PermissionsObjectPermission[] +) { return SetMultipleMetadata(AUTH_FUNCTION_KEY, (req, user: RequestUser) => permissions.every(({ seqid }) => user.permissions.includes(seqid)), ); } -export function RequireSomePermission(...permissions: Permission[]) { +export function RequireSomePermission( + ...permissions: PermissionsObjectPermission[] +) { return SetMultipleMetadata(AUTH_FUNCTION_KEY, (req, user: RequestUser) => permissions.some(({ seqid }) => user.permissions.includes(seqid)), ); diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 4589d3a..4f0b3f3 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -8,7 +8,7 @@ export enum PermissionUsages { INTERNAL = 'internal', } -export interface Permission { +export interface PermissionsObjectPermission { seqid: number; claim: string; usage: PermissionUsages; @@ -17,12 +17,12 @@ export interface Permission { 'en-us': string; }; } -export interface PermissionGroup { +export interface PermissionsObjectGroup { title: { 'pt-br': string; 'en-us': string; }; - permissions: Record; + permissions: Record; } /* diff --git a/src/modules/permissions/dto/entities.ts b/src/modules/permissions/dto/entities.ts index f4dc174..9e084d5 100644 --- a/src/modules/permissions/dto/entities.ts +++ b/src/modules/permissions/dto/entities.ts @@ -1,4 +1,4 @@ -import { ApiProperty } from '@nestjs/swagger'; +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; export class PermissionDto { @ApiProperty() @@ -33,3 +33,12 @@ export class GetPublicPermissionsRes { @ApiProperty({ type: [PermissionGroup] }) permissionGroups: PermissionGroup[]; } + +export enum LanguageEnum { + ptbr = 'pt-br', + enus = 'en-us', +} +export class GetPublicPermissionsHeader { + @ApiPropertyOptional({ enum: LanguageEnum }) + 'dadosfera-lang'; +} diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index 539c87a..12c8db1 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -1,8 +1,13 @@ -import { Controller, Get, Inject } from '@nestjs/common'; +import { Controller, Get, Headers, Inject } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; +import { PermissionUsages } from 'src/authentication/permissions.enum'; import { User } from 'src/authentication/user.decorator'; -import { GetPublicPermissionsRes } from './dto/entities'; +import { + GetPublicPermissionsHeader, + GetPublicPermissionsRes, + LanguageEnum, +} from './dto/entities'; import { PermissionsClientService } from './permissions.service'; @ApiTags('Permissions') @@ -20,7 +25,16 @@ export class PermissionsController { @Get() @ApiOkResponse({ type: GetPublicPermissionsRes }) - getPublicPermissions(@User() user) { + getPublicPermissions( + @User() user, + @Headers() headers: GetPublicPermissionsHeader, + ) { this.logger.info('getPublicPermissions', { user }); + + const language: LanguageEnum = headers['dadosfera-lang']; + return this.permissionsService.getPermissions( + PermissionUsages.PUBLIC, + language, + ); } } diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 67c700e..480dab7 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -12,13 +12,14 @@ import { PermissionsProtoService as PermissionsServiceInterface } from 'protospa import { InjectPermissionsRequest } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; import { DadosferaLogger } from 'dadosfera-logs'; import { - Permission, + PermissionsObjectPermission, PERMISSIONS, PermissionsObject, PermissionUsages, + PermissionsObjectGroup, } from '../../authentication/permissions.enum'; import ErrorBuilder from '../../utils/ErrorBuilder'; -import { PermissionGroup } from './dto/entities'; +import { LanguageEnum, PermissionDto, PermissionGroup } from './dto/entities'; @Injectable() export class PermissionsClientService @@ -73,11 +74,27 @@ export class PermissionsClientService this.permissionsService.InjectPermissions({ permissions }), ); } - getPublicPermissions() { - return this.getPermissions(PermissionUsages.PUBLIC); - } - getPermissions(permissionUsage?: PermissionUsages): PermissionGroup[] { + getPermissions( + permissionUsage?: PermissionUsages, + language: LanguageEnum = LanguageEnum.ptbr, + ): PermissionGroup[] { const groups: PermissionGroup[] = []; + for (const key in PERMISSIONS) { + const permissionGroup: PermissionsObjectGroup = PERMISSIONS[key]; + const title = permissionGroup.title[language]; + const permissions: PermissionDto[] = Object.values( + permissionGroup.permissions, + ) + .filter(({ usage }) => + permissionUsage ? usage === permissionUsage : true, + ) + .map(({ seqid, name }) => ({ id: seqid, name: name[language] })); + + groups.push({ + title, + permissions, + }); + } return groups; } } From 14cfc46492a38996fbbecd359b59c3211f2019da Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 14 Jul 2022 10:23:04 -0300 Subject: [PATCH 15/47] FEAT: Roles WIP --- package-lock.json | 16 +-- package.json | 2 +- src/authentication/permissions.enum.ts | 6 ++ .../permissions.controller.spec.ts | 4 +- .../permissions/permissions.controller.ts | 10 +- src/modules/permissions/permissions.module.ts | 5 +- .../permissions/permissions.service.ts | 31 ++++-- src/modules/roles/dto/entities.ts | 25 +++-- src/modules/roles/roles.controller.ts | 62 +++++++----- src/modules/roles/roles.module.ts | 2 + src/modules/roles/roles.service.ts | 97 +++++++++++++++++-- src/modules/users/dtos/entities.ts | 50 +++------- src/modules/users/users.controller.ts | 30 +++--- src/utils/ErrorBuilder.ts | 18 +++- src/utils/errorCodes.ts | 5 +- 15 files changed, 247 insertions(+), 116 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2373222..5e807ab 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.0.0", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,10 +9015,12 @@ } }, "node_modules/protospack-v2": { - "version": "3.0.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.0.0.tgz", - "integrity": "sha512-GEFbf8+vVaq/lA28K4nFf7bOSlghQJn/aeVnrYzh4YJUaa1+ccNz3uQs9p5OGbfjt2u/fFE5rHGEBUtueAA8KA==", + "version": "0.0.0", + "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-/Pmor5eTfl0kRUC0uMsqsMojLnl3j5vMHhO9CYYQ9/5bYWSvq40+NovS9msyuqNsTW2oAYpGvMNDm6zeaV4Ciw==", + "license": "ISC", "dependencies": { + "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", "ts-proto": "^1.112.2" } @@ -17244,10 +17246,10 @@ } }, "protospack-v2": { - "version": "3.0.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.0.0.tgz", - "integrity": "sha512-GEFbf8+vVaq/lA28K4nFf7bOSlghQJn/aeVnrYzh4YJUaa1+ccNz3uQs9p5OGbfjt2u/fFE5rHGEBUtueAA8KA==", + "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-/Pmor5eTfl0kRUC0uMsqsMojLnl3j5vMHhO9CYYQ9/5bYWSvq40+NovS9msyuqNsTW2oAYpGvMNDm6zeaV4Ciw==", "requires": { + "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", "ts-proto": "^1.112.2" } diff --git a/package.json b/package.json index e267cb9..ed44165 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.0.0", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "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 4f0b3f3..3a8f1cc 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -17,6 +17,12 @@ export interface PermissionsObjectPermission { 'en-us': string; }; } +export interface PermissionsObjectPermissionTranslated { + seqid: number; + claim: string; + usage: PermissionUsages; + name?: string; +} export interface PermissionsObjectGroup { title: { 'pt-br': string; diff --git a/src/modules/permissions/permissions.controller.spec.ts b/src/modules/permissions/permissions.controller.spec.ts index 0f34649..04a0822 100644 --- a/src/modules/permissions/permissions.controller.spec.ts +++ b/src/modules/permissions/permissions.controller.spec.ts @@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { DucClient } from 'src/clients/duc/client.config'; import { PermissionsController } from './permissions.controller'; import { DadosferaLogger } from 'dadosfera-logs'; -import { PermissionsClientService } from './permissions.service'; +import { PermissionsService } from './permissions.service'; const ducClient = new DucClient(); @@ -21,7 +21,7 @@ describe('PermissionsController', () => { ]), ], controllers: [PermissionsController], - providers: [DadosferaLogger, PermissionsClientService], + providers: [DadosferaLogger, PermissionsService], }).compile(); controller = module.get(PermissionsController); diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index 12c8db1..d63f3af 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -2,13 +2,13 @@ import { Controller, Get, Headers, Inject } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; import { PermissionUsages } from 'src/authentication/permissions.enum'; -import { User } from 'src/authentication/user.decorator'; +import { RequestUser, User } from 'src/authentication/user.decorator'; import { GetPublicPermissionsHeader, GetPublicPermissionsRes, LanguageEnum, } from './dto/entities'; -import { PermissionsClientService } from './permissions.service'; +import { PermissionsService } from './permissions.service'; @ApiTags('Permissions') @Controller('permissions') @@ -18,7 +18,7 @@ export class PermissionsController { constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, - private permissionsService: PermissionsClientService, + private permissionsService: PermissionsService, ) { this.logger = dadosferaLogger.logger; } @@ -26,13 +26,13 @@ export class PermissionsController { @Get() @ApiOkResponse({ type: GetPublicPermissionsRes }) getPublicPermissions( - @User() user, + @User() user: RequestUser, @Headers() headers: GetPublicPermissionsHeader, ) { this.logger.info('getPublicPermissions', { user }); const language: LanguageEnum = headers['dadosfera-lang']; - return this.permissionsService.getPermissions( + return this.permissionsService.getPermissionsGrouped( PermissionUsages.PUBLIC, language, ); diff --git a/src/modules/permissions/permissions.module.ts b/src/modules/permissions/permissions.module.ts index b569e7c..4475a81 100644 --- a/src/modules/permissions/permissions.module.ts +++ b/src/modules/permissions/permissions.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { ClientsModule } from '@nestjs/microservices'; import { DadosferaLogger } from 'dadosfera-logs'; -import { PermissionsClientService } from './permissions.service'; +import { PermissionsService } from './permissions.service'; import { DucClient } from '../../clients/duc/client.config'; import { PermissionsController } from './permissions.controller'; @@ -18,7 +18,8 @@ const ducClient = new DucClient(); }, ]), ], - providers: [PermissionsClientService, DadosferaLogger], + providers: [PermissionsService, DadosferaLogger], controllers: [PermissionsController], + exports: [PermissionsService], }) export class PermissionsModule {} diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 480dab7..026dcbd 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -12,22 +12,21 @@ import { PermissionsProtoService as PermissionsServiceInterface } from 'protospa import { InjectPermissionsRequest } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; import { DadosferaLogger } from 'dadosfera-logs'; import { - PermissionsObjectPermission, PERMISSIONS, - PermissionsObject, PermissionUsages, PermissionsObjectGroup, + PermissionsObjectPermissionTranslated, } from '../../authentication/permissions.enum'; import ErrorBuilder from '../../utils/ErrorBuilder'; import { LanguageEnum, PermissionDto, PermissionGroup } from './dto/entities'; @Injectable() -export class PermissionsClientService +export class PermissionsService implements OnModuleInit, OnApplicationBootstrap { logger: any; - private permissionsService: PermissionsServiceInterface; + private permissionsClientService: PermissionsServiceInterface; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, @@ -37,7 +36,7 @@ export class PermissionsClientService } onModuleInit() { - this.permissionsService = + this.permissionsClientService = this.grpcClient.getService( ProtoServices.PermissionsProtoService, ); @@ -71,10 +70,10 @@ export class PermissionsClientService this.logger.info('InjectPermissions'); return lastValueFrom( - this.permissionsService.InjectPermissions({ permissions }), + this.permissionsClientService.InjectPermissions({ permissions }), ); } - getPermissions( + getPermissionsGrouped( permissionUsage?: PermissionUsages, language: LanguageEnum = LanguageEnum.ptbr, ): PermissionGroup[] { @@ -97,4 +96,22 @@ export class PermissionsClientService } return groups; } + getAllPermissions(language: LanguageEnum = LanguageEnum.ptbr) { + const permissions: PermissionsObjectPermissionTranslated[] = []; + for (const key in PERMISSIONS) { + const permissionGroup: PermissionsObjectGroup = PERMISSIONS[key]; + const permissionGroupPermissions: PermissionsObjectPermissionTranslated[] = + Object.values(permissionGroup.permissions).map((p) => ({ + ...p, + name: p.name[language], + })); + permissions.concat(permissionGroupPermissions); + } + return permissions; + } + getPermissionsBySeqId(seqIds: number[]) { + const permissionGroupPermissions = this.getAllPermissions(); + + return permissionGroupPermissions.filter((p) => seqIds.includes(p.seqid)); + } } diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index a0495f8..c0ecdd2 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -1,30 +1,39 @@ -import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; import { Permission } from 'src/modules/permissions/dto/entities'; -import { UserWithoutRoles } from 'src/modules/users/dtos/entities'; +import { + Customer, + UserNoRolesAndCustomer, +} from 'src/modules/users/dtos/entities'; export class Role { @ApiProperty() id: string; @ApiProperty() name: string; + @ApiProperty() + description: string; @ApiPropertyOptional({ type: () => [Permission] }) permissions: Permission[]; - @ApiPropertyOptional({ type: () => [UserWithoutRoles] }) - users: UserWithoutRoles[]; + @ApiPropertyOptional({ type: () => [UserNoRolesAndCustomer] }) + users: UserNoRolesAndCustomer[]; @ApiProperty() createdAt: string; @ApiProperty() updatedAt: string; + @ApiProperty({ type: () => Customer }) + customer?: Customer; } +export class CustomerRole extends OmitType(Role, ['customer']) {} + export enum TrueOrFalseEnum { true = 'true', false = 'false', } export class GetRolesByCustomerReq { @ApiPropertyOptional() - permission_id: string[]; + permissionIds: string[]; @ApiPropertyOptional({ enum: TrueOrFalseEnum }) - get_users: TrueOrFalseEnum; + getUsers: TrueOrFalseEnum; } export class GetRolesByCustomerRes { @@ -35,7 +44,7 @@ export class CreateRoleReq { @ApiProperty() name: string; @ApiProperty() - permissionIds: string[]; + permissionIds: number[]; @ApiPropertyOptional() userIds: string[]; @ApiProperty() @@ -43,7 +52,7 @@ export class CreateRoleReq { } export class CreateRoleRes { @ApiProperty() - role: Role; + role: CustomerRole; } export class AssignPermissionsToRoleReq { diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index a8f615c..d249773 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -9,25 +9,28 @@ import { Post, Put, Query, + UseFilters, } from '@nestjs/common'; -import { ApiResponse, ApiTags } from '@nestjs/swagger'; -import { User } from 'src/authentication/user.decorator'; +import { ApiCreatedResponse, ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { RequestUser, User } from 'src/authentication/user.decorator'; import { DadosferaLogger } from 'dadosfera-logs'; import { RolesService } from './roles.service'; import { - AssignPermissionsToRoleReq, - AssignPermissionsToRoleRes, + AssignPermissionsToRoleReq as grantPermissionsToRoleReq, + AssignPermissionsToRoleRes as GrantPermissionsToRoleRes, CreateRoleReq, CreateRoleRes, GetRolesByCustomerReq, GetRolesByCustomerRes, - UnassignPermissionsToRoleReq, - UnassignPermissionsToRoleRes, + UnassignPermissionsToRoleReq as RevokePermissionsToRoleReq, + UnassignPermissionsToRoleRes as RevokePermissionsToRoleRes, UpdateRoleReq, UpdateRoleRes, } from './dto/entities'; +import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; @ApiTags('Roles') +@UseFilters(new GrpcToHttpExceptionFilter()) @Controller('roles') export class RolesController { logger: any; @@ -39,46 +42,57 @@ export class RolesController { ) { this.logger = dadosferaLogger.logger; } + @Get() - @ApiResponse({ type: GetRolesByCustomerRes }) + @ApiOkResponse({ type: GetRolesByCustomerRes }) async getRolesByCustomer( - @User() user, + @User() user: RequestUser, @Query() filters: GetRolesByCustomerReq, ) { this.logger.info('getRolesByCustomer', { user }); - this.rolesService.getRolesByCustomer(filters); + return await this.rolesService.getRolesByCustomer( + filters, + user.customer_id, + ); } + @Post() - @ApiResponse({ type: CreateRoleRes }) - async createRole(@User() user, @Body() body: CreateRoleReq) { + @ApiCreatedResponse({ type: CreateRoleRes }) + async createRole(@User() user: RequestUser, @Body() body: CreateRoleReq) { this.logger.info('createRole', { user }); + return await this.rolesService.createRole(body, user.customer_id); } + @Delete(':id') - async deleteRole(@User() user, @Param('id') id: string) { + async deleteRole(@User() user: RequestUser, @Param('id') id: string) { this.logger.info('deleteRole', { user }); return await this.rolesService.removeRole(id); } + @Put('permissions') - @ApiResponse({ type: AssignPermissionsToRoleRes }) - async assignPermissionsToRole( - @User() user, - @Body() body: AssignPermissionsToRoleReq, + @ApiOkResponse({ type: GrantPermissionsToRoleRes }) + async grantPermissionsToRole( + @User() user: RequestUser, + @Body() body: grantPermissionsToRoleReq, ) { - this.logger.info('assignPermissionsToRole', { user }); + this.logger.info('grantPermissionsToRole', { user }); + return await this.rolesService.grantPermissionsToRole(body); } @Delete('permissions') - @ApiResponse({ type: UnassignPermissionsToRoleRes }) - async unassignPermissionsToRole( - @User() user, - @Body() body: UnassignPermissionsToRoleReq, + @ApiOkResponse({ type: RevokePermissionsToRoleRes }) + async revokePermissionsToRole( + @User() user: RequestUser, + @Body() body: RevokePermissionsToRoleReq, ) { - this.logger.info('unassignPermissionsToRole', { user }); + this.logger.info('revokePermissionsToRole', { user }); + return await this.rolesService.revokePermissionToRole(body); } + @Patch(':id') - @ApiResponse({ type: UpdateRoleRes }) + @ApiOkResponse({ type: UpdateRoleRes }) async updateRole( - @User() user, + @User() user: RequestUser, @Param('id') id: string, @Body() body: UpdateRoleReq, ) { diff --git a/src/modules/roles/roles.module.ts b/src/modules/roles/roles.module.ts index 4e3bec6..5b3a3b9 100644 --- a/src/modules/roles/roles.module.ts +++ b/src/modules/roles/roles.module.ts @@ -4,6 +4,7 @@ import { DucClient } from 'src/clients/duc/client.config'; import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; import { DadosferaLogger } from 'dadosfera-logs'; +import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); @@ -15,6 +16,7 @@ const ducClient = new DucClient(); ...ducClient.config(), }, ]), + PermissionsModule, ], controllers: [RolesController], providers: [RolesService, DadosferaLogger], diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 5b64d32..142021d 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -1,10 +1,16 @@ -import { Inject, Injectable } from '@nestjs/common'; +import { BadRequestException, Inject, Injectable } from '@nestjs/common'; import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; import { RolesProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; -import { GetRolesByCustomerReq } from './dto/entities'; +import { CreateRoleReq, GetRolesByCustomerReq, Role } from './dto/entities'; import { DadosferaLogger } from 'dadosfera-logs'; import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; +import { PermissionsService } from '../permissions/permissions.service'; +import { + GrantPermissionsToRoleRequest, + RevokePermissionsFromRoleRequest, + RoleUpdateRequest, +} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; @Injectable() export class RolesService { @@ -15,22 +21,97 @@ export class RolesService { @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc, + private permissionsService: PermissionsService, ) { this.logger = dadosferaLogger.logger; } onModuleInit() { this.rolesClientService = this.grpcClient.getService( - ProtoServices.UsersProtoService, + ProtoServices.RolesProtoService, ); } - async getRolesByCustomer(filters: GetRolesByCustomerReq) { - let { permission_id } = filters; - if (!Array.isArray(permission_id)) permission_id = [permission_id]; - const { get_users } = filters; - const is_get_users = get_users === 'true'; + async getRolesByCustomer(filters: GetRolesByCustomerReq, customerId: string) { + let { permissionIds } = filters; + if (permissionIds && !Array.isArray(permissionIds)) + permissionIds = [permissionIds]; + const { getUsers } = filters; + const isGetUsers = getUsers === 'true'; + const permissionSeqIds = + permissionIds?.map((id) => { + const seqId = Number(id); + if (isNaN(seqId)) + throw new BadRequestException(`permissionId ${id} not valid`); + return seqId; + }) || []; + const roles = await lastValueFrom( + this.rolesClientService.RoleFindAllByCustomerId({ + customerId, + getUsers: isGetUsers, + permissionIds: [], + permissionSeqIds, + }), + ); + const rolesTreated = this.getRolesPermissionsName(roles.roles); + return { roles: rolesTreated }; } + + async createRole(data: CreateRoleReq, customerId: string) { + const { description, name, permissionIds, userIds } = data; + const role = await lastValueFrom( + this.rolesClientService.RoleCreate({ + customerId, + name, + permissionIds: [], + permissionSeqIds: permissionIds, + description, + userIds, + }), + ); + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; + } + async removeRole(id: string) { return lastValueFrom(this.rolesClientService.RoleRemove({ id })); } + async grantPermissionsToRole({ + roleId, + permissionIds, + }: GrantPermissionsToRoleRequest) { + const role = await lastValueFrom( + this.rolesClientService.GrantPermissionsToRole({ + permissionIds, + roleId, + }), + ); + } + + async revokePermissionToRole({ + roleId, + permissionIds, + }: RevokePermissionsFromRoleRequest) { + const role = await lastValueFrom( + this.rolesClientService.RevokePermissionsFromRole({ + permissionIds, + roleId, + }), + ); + } + + async updateRole(req: RoleUpdateRequest) { + const role = await lastValueFrom(this.rolesClientService.RoleUpdate(req)); + } + getRolesPermissionsName(roles: Role[]) { + for (const role of roles) { + const permisisonSeqIds = role.permissions.map((p) => p.seqid); + const permissions = + this.permissionsService.getPermissionsBySeqId(permisisonSeqIds); + role.permissions.forEach((p) => { + const permission = permissions.find((per) => per.seqid === p.seqid); + p.name = permission.name; + }); + } + return roles; + } } diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 1d9f010..3664d05 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,4 +1,4 @@ -import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; import { Role } from 'src/modules/roles/dto/entities'; export class Customer { @ApiProperty() @@ -26,35 +26,13 @@ export class User { @ApiProperty({ type: [Role] }) roles: Role[]; @ApiProperty() - jobTitle: string; + jobTitle?: string; @ApiProperty() - department: string; + department?: string; @ApiProperty() - hierarchy: string; - @ApiProperty() - customer: Customer; - @ApiProperty() - mfaStatus: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; -} -export class UserWithoutRoles { - @ApiProperty() - id: string; - @ApiProperty() - name: string; - @ApiProperty() - email: string; - @ApiProperty() - jobTitle: string; - @ApiProperty() - department: string; - @ApiProperty() - hierarchy: string; - @ApiProperty() - customer: Customer; + hierarchy?: string; + @ApiPropertyOptional() + customer?: Customer; @ApiProperty() mfaStatus: string; @ApiProperty() @@ -62,6 +40,10 @@ export class UserWithoutRoles { @ApiProperty() updatedAt: string; } +export class UserNoRoles extends OmitType(User, ['roles']) {} +export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [ + 'customer', +]) {} export class UserByCustomer { @ApiProperty({ type: [Role] }) roles: Role[]; @@ -80,17 +62,17 @@ export class UserByCustomer { } export class CreateUserReq { @ApiPropertyOptional() - name: string; + name?: string; @ApiProperty() email: string; @ApiPropertyOptional() - roles: string[]; + roles?: string[]; @ApiPropertyOptional() - jobTitle: string; + jobTitle?: string; @ApiPropertyOptional() - department: string; + department?: string; @ApiPropertyOptional() - hierarchy: string; + hierarchy?: string; } export class CreateUserRes { @ApiProperty() @@ -107,7 +89,7 @@ export class BatchCreateUserRes { export class GetAllUsersByCustomerIdReq { @ApiPropertyOptional() - s: string; + s?: string; } export class GetAllUsersByCustomerIdRes { @ApiProperty({ type: [UserByCustomer] }) diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 6fde82e..7d7b3ed 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -23,6 +23,7 @@ import { } from './dtos/entities'; import { UsersService } from './users.service'; +// TODO GET de hierarquias e do PATCH em usuário @ApiTags('Users') @Controller('users') export class UsersController { @@ -54,42 +55,41 @@ export class UsersController { @Post() @ApiOkResponse({ type: CreateUserRes }) - async createUser(@User() user, @Body() body: CreateUserReq) { + async createUser(@User() user: RequestUser, @Body() body: CreateUserReq) { this.logger.info('createUser', { user }); } @Post('batch') @ApiOkResponse({ type: CreateUserRes }) - async batchCreateUser(@User() user, @Body() body: CreateUserReq) { + async batchCreateUser( + @User() user: RequestUser, + @Body() body: CreateUserReq, + ) { this.logger.info('batchCreateUser', { user }); } @Delete(':id') @ApiOkResponse({ type: DeleteUserRes }) - async deleteUser(@User() user, @Param('id') id: string) { + async deleteUser(@User() user: RequestUser, @Param('id') id: string) { this.logger.info('deleteUser', { user }); return await this.userService.deleteUser({ id }); } @Put('role') - async assignRoleToUser(@User() user, @Body() body: AssignRoleToUserReq) { + async assignRoleToUser( + @User() user: RequestUser, + @Body() body: AssignRoleToUserReq, + ) { this.logger.info('assignRoleToUser', { user }); return await this.userService.assignRoleToUser(body); } @Delete('role') - async unassignRoleToUser(@User() user, @Body() body: UnassignRoleToUserReq) { + async unassignRoleToUser( + @User() user: RequestUser, + @Body() body: UnassignRoleToUserReq, + ) { this.logger.info('unassignRoleToUser', { user }); return await this.userService.unassignRoleToUser(body); } - - // @Get('search') - // @ApiOkResponse({ type: SearchUserRes }) - // async searchUser( - // @User() user: RequestUser, - // @Query('s') searchQuery: SearchUserReq, - // ) { - // this.logger.info('searchUser', { user }); - // console.log(searchQuery); - // } } diff --git a/src/utils/ErrorBuilder.ts b/src/utils/ErrorBuilder.ts index 2f2cfd9..b00e8f1 100644 --- a/src/utils/ErrorBuilder.ts +++ b/src/utils/ErrorBuilder.ts @@ -112,6 +112,13 @@ export function EnrichErrorCode(code: string) { code, }; + case ErrorCodes.ROLE.ALREADY_EXIST: + return { + statusCode: HttpStatus.BAD_REQUEST, + error: 'Grupo já existe', + message: 'Não é possível criar um grupo com esse nome', + code, + }; case ErrorCodes.INTERNAL: case ErrorCodes.UNKNOWN: default: @@ -121,6 +128,7 @@ export function EnrichErrorCode(code: string) { message: 'Erro desconhecido. Tente novamente ou entre em contato com o suporte', code: ErrorCodes.UNKNOWN, + details: code, }; } } @@ -138,8 +146,14 @@ export default class ErrorBuilder extends HttpException { logger.log(code); } - const { statusCode, message, error, code: rCode } = EnrichErrorCode(code); - super({ statusCode, message, error, code: rCode }, statusCode); + const { + statusCode, + message, + error, + code: rCode, + details, + } = EnrichErrorCode(code); + super({ statusCode, message, error, code: rCode, details }, statusCode); this.code = code; } } diff --git a/src/utils/errorCodes.ts b/src/utils/errorCodes.ts index 5d345df..74a60ec 100644 --- a/src/utils/errorCodes.ts +++ b/src/utils/errorCodes.ts @@ -13,12 +13,15 @@ export const AUTH = { RESET_PASSWORD_CODE_INVALID: 'AUTH.RESET_PASSWORD_CODE_INVALID', WEAK_NEW_PASSWORD: 'AUTH.WEAK_NEW_PASSWORD', }; - +export const ROLE = { + ALREADY_EXIST: 'ROLE.ALREADY_EXISTS', +}; const ErrorCodes = { UNKNOWN: 'UNKNOWN', RATE_LIMIT: 'RATE_LIMIT', INTERNAL: 'INTERNAL', AUTH, + ROLE, }; export default ErrorCodes; From de57bfed1e08c66d4d9041000c763bba26e572bd Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 14 Jul 2022 12:53:00 -0300 Subject: [PATCH 16/47] FEAT: new roles routes working --- package-lock.json | 4 +-- src/main.ts | 1 + src/modules/roles/dto/entities.ts | 16 ++++----- src/modules/roles/roles.controller.ts | 19 ++++++----- src/modules/roles/roles.service.ts | 47 +++++++++++++++++++-------- 5 files changed, 55 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5e807ab..2f0c031 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9017,7 +9017,7 @@ "node_modules/protospack-v2": { "version": "0.0.0", "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-/Pmor5eTfl0kRUC0uMsqsMojLnl3j5vMHhO9CYYQ9/5bYWSvq40+NovS9msyuqNsTW2oAYpGvMNDm6zeaV4Ciw==", + "integrity": "sha512-kj/mJbme5CULhsRW4fyXdRUtJKzG5Q5zVYg4BSYMRovHi/jcZUgOIXWwOn0rnqLlMlzdl2msx0S9mA7b62IQzQ==", "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", @@ -17247,7 +17247,7 @@ }, "protospack-v2": { "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-/Pmor5eTfl0kRUC0uMsqsMojLnl3j5vMHhO9CYYQ9/5bYWSvq40+NovS9msyuqNsTW2oAYpGvMNDm6zeaV4Ciw==", + "integrity": "sha512-kj/mJbme5CULhsRW4fyXdRUtJKzG5Q5zVYg4BSYMRovHi/jcZUgOIXWwOn0rnqLlMlzdl2msx0S9mA7b62IQzQ==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/src/main.ts b/src/main.ts index 788cf4c..7e54651 100644 --- a/src/main.ts +++ b/src/main.ts @@ -42,6 +42,7 @@ async function bootstrap() { .setDescription('Documentation for Maestro gateway') .setVersion('1.0') .addBearerAuth() + .addServer('http://127.0.0.1:3333') .build(); const document = SwaggerModule.createDocument(app, config); diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index c0ecdd2..70e9e8f 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -55,24 +55,24 @@ export class CreateRoleRes { role: CustomerRole; } -export class AssignPermissionsToRoleReq { +export class GrantPermissionsToRoleReq { @ApiProperty() roleId: string; @ApiProperty() - permissionIds: string[]; + permissionIds: number[]; } -export class AssignPermissionsToRoleRes { +export class GrantPermissionsToRoleRes { @ApiProperty() role: Role; } -export class UnassignPermissionsToRoleReq { +export class RevokePermissionsFromRoleReq { @ApiProperty() roleId: string; @ApiProperty() - permissionIds: string[]; + permissionIds: number[]; } -export class UnassignPermissionsToRoleRes { +export class RevokePermissionsFromRoleRes { @ApiProperty() role: Role; } @@ -83,9 +83,9 @@ export class UpdateRoleReq { @ApiPropertyOptional() description: string; @ApiPropertyOptional() - userIds: string; + userIds: string[]; @ApiPropertyOptional() - permissionIds: string; + permissionIds: number[]; } export class UpdateRoleRes { diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index d249773..53771d7 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -16,14 +16,14 @@ import { RequestUser, User } from 'src/authentication/user.decorator'; import { DadosferaLogger } from 'dadosfera-logs'; import { RolesService } from './roles.service'; import { - AssignPermissionsToRoleReq as grantPermissionsToRoleReq, - AssignPermissionsToRoleRes as GrantPermissionsToRoleRes, + GrantPermissionsToRoleReq, + GrantPermissionsToRoleRes, CreateRoleReq, CreateRoleRes, GetRolesByCustomerReq, GetRolesByCustomerRes, - UnassignPermissionsToRoleReq as RevokePermissionsToRoleReq, - UnassignPermissionsToRoleRes as RevokePermissionsToRoleRes, + RevokePermissionsFromRoleReq, + RevokePermissionsFromRoleRes, UpdateRoleReq, UpdateRoleRes, } from './dto/entities'; @@ -73,20 +73,20 @@ export class RolesController { @ApiOkResponse({ type: GrantPermissionsToRoleRes }) async grantPermissionsToRole( @User() user: RequestUser, - @Body() body: grantPermissionsToRoleReq, + @Body() body: GrantPermissionsToRoleReq, ) { this.logger.info('grantPermissionsToRole', { user }); return await this.rolesService.grantPermissionsToRole(body); } @Delete('permissions') - @ApiOkResponse({ type: RevokePermissionsToRoleRes }) - async revokePermissionsToRole( + @ApiOkResponse({ type: RevokePermissionsFromRoleRes }) + async revokePermissionsFromRole( @User() user: RequestUser, - @Body() body: RevokePermissionsToRoleReq, + @Body() body: RevokePermissionsFromRoleReq, ) { this.logger.info('revokePermissionsToRole', { user }); - return await this.rolesService.revokePermissionToRole(body); + return await this.rolesService.revokePermissionFromRole(body); } @Patch(':id') @@ -97,5 +97,6 @@ export class RolesController { @Body() body: UpdateRoleReq, ) { this.logger.info('updateRole', { user }); + return this.rolesService.updateRole(id, body); } } diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 142021d..a8197ee 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -1,16 +1,18 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common'; import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; import { RolesProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; -import { CreateRoleReq, GetRolesByCustomerReq, Role } from './dto/entities'; +import { + CreateRoleReq, + GetRolesByCustomerReq, + GrantPermissionsToRoleReq, + RevokePermissionsFromRoleReq, + Role, + UpdateRoleReq, +} from './dto/entities'; import { DadosferaLogger } from 'dadosfera-logs'; import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; -import { - GrantPermissionsToRoleRequest, - RevokePermissionsFromRoleRequest, - RoleUpdateRequest, -} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; @Injectable() export class RolesService { @@ -78,29 +80,48 @@ export class RolesService { async grantPermissionsToRole({ roleId, permissionIds, - }: GrantPermissionsToRoleRequest) { + }: GrantPermissionsToRoleReq) { const role = await lastValueFrom( this.rolesClientService.GrantPermissionsToRole({ - permissionIds, + permissionIds: [], roleId, + permissionReqIds: permissionIds, }), ); + + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; } - async revokePermissionToRole({ + async revokePermissionFromRole({ roleId, permissionIds, - }: RevokePermissionsFromRoleRequest) { + }: RevokePermissionsFromRoleReq) { const role = await lastValueFrom( this.rolesClientService.RevokePermissionsFromRole({ - permissionIds, + permissionIds: [], roleId, + permissionReqIds: permissionIds, }), ); + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; } - async updateRole(req: RoleUpdateRequest) { - const role = await lastValueFrom(this.rolesClientService.RoleUpdate(req)); + async updateRole(id: string, req: UpdateRoleReq) { + const { description, name, permissionIds, userIds } = req; + const role = await lastValueFrom( + this.rolesClientService.RoleUpdate({ + id, + description, + name, + permissionIds: [], + permissionReqIds: permissionIds, + userIds, + }), + ); + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; } getRolesPermissionsName(roles: Role[]) { for (const role of roles) { From 1b620b6fb0cafb2244d46ef6095f7a9ae82450e2 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 15 Jul 2022 11:08:57 -0300 Subject: [PATCH 17/47] FEAT: ROle management --- package-lock.json | 4 +- src/authentication/authentication.guard.ts | 2 +- src/authentication/permissions.enum.ts | 10 ++- src/modules/permissions/dto/entities.ts | 9 -- .../permissions/permissions.controller.ts | 13 ++- .../permissions/permissions.service.ts | 7 +- src/modules/roles/dto/entities.ts | 26 +++++- src/modules/roles/roles.controller.ts | 89 +++++++++++++++++-- src/modules/roles/roles.service.ts | 55 ++++++++++-- src/utils/ErrorBuilder.ts | 11 ++- src/utils/errorCodes.ts | 1 + 11 files changed, 179 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f0c031..adaeabe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9017,7 +9017,7 @@ "node_modules/protospack-v2": { "version": "0.0.0", "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-kj/mJbme5CULhsRW4fyXdRUtJKzG5Q5zVYg4BSYMRovHi/jcZUgOIXWwOn0rnqLlMlzdl2msx0S9mA7b62IQzQ==", + "integrity": "sha512-ABgU0d8MFh0VhWkGFa3nnSLzmm8Her2rof9Ajoi46FMjwp3N0895F6e7IecM13CUJgcOtkFqbmQF7JU33hB+BA==", "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", @@ -17247,7 +17247,7 @@ }, "protospack-v2": { "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-kj/mJbme5CULhsRW4fyXdRUtJKzG5Q5zVYg4BSYMRovHi/jcZUgOIXWwOn0rnqLlMlzdl2msx0S9mA7b62IQzQ==", + "integrity": "sha512-ABgU0d8MFh0VhWkGFa3nnSLzmm8Her2rof9Ajoi46FMjwp3N0895F6e7IecM13CUJgcOtkFqbmQF7JU33hB+BA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index 6e04694..062a87f 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -107,7 +107,7 @@ export class AuthenticationGuard } catch (err) { // log errors if authentication is required if (mustBeAuthenticated) { - this.logger.error('Unable to verify duc access token\n' + err.stack); + this.logger.error('Unable to verify duc access token\n' + err?.stack); } return false; diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index 3a8f1cc..bf5da2f 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -3,6 +3,11 @@ import assert from 'assert'; const logger = new Logger(); +export enum LanguageEnum { + ptbr = 'pt-br', + enus = 'en-us', +} + export enum PermissionUsages { PUBLIC = 'public', INTERNAL = 'internal', @@ -12,10 +17,7 @@ export interface PermissionsObjectPermission { seqid: number; claim: string; usage: PermissionUsages; - name?: { - 'pt-br': string; - 'en-us': string; - }; + name?: Record; } export interface PermissionsObjectPermissionTranslated { seqid: number; diff --git a/src/modules/permissions/dto/entities.ts b/src/modules/permissions/dto/entities.ts index 9e084d5..4fee93f 100644 --- a/src/modules/permissions/dto/entities.ts +++ b/src/modules/permissions/dto/entities.ts @@ -33,12 +33,3 @@ export class GetPublicPermissionsRes { @ApiProperty({ type: [PermissionGroup] }) permissionGroups: PermissionGroup[]; } - -export enum LanguageEnum { - ptbr = 'pt-br', - enus = 'en-us', -} -export class GetPublicPermissionsHeader { - @ApiPropertyOptional({ enum: LanguageEnum }) - 'dadosfera-lang'; -} diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index d63f3af..aa2e6e6 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -1,13 +1,12 @@ import { Controller, Get, Headers, Inject } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; -import { PermissionUsages } from 'src/authentication/permissions.enum'; -import { RequestUser, User } from 'src/authentication/user.decorator'; import { - GetPublicPermissionsHeader, - GetPublicPermissionsRes, LanguageEnum, -} from './dto/entities'; + PermissionUsages, +} from 'src/authentication/permissions.enum'; +import { RequestUser, User } from 'src/authentication/user.decorator'; +import { GetPublicPermissionsRes } from './dto/entities'; import { PermissionsService } from './permissions.service'; @ApiTags('Permissions') @@ -27,11 +26,9 @@ export class PermissionsController { @ApiOkResponse({ type: GetPublicPermissionsRes }) getPublicPermissions( @User() user: RequestUser, - @Headers() headers: GetPublicPermissionsHeader, + @Headers('dadosfera-lang') language: LanguageEnum, ) { this.logger.info('getPublicPermissions', { user }); - - const language: LanguageEnum = headers['dadosfera-lang']; return this.permissionsService.getPermissionsGrouped( PermissionUsages.PUBLIC, language, diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 026dcbd..55d774f 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -16,9 +16,10 @@ import { PermissionUsages, PermissionsObjectGroup, PermissionsObjectPermissionTranslated, + LanguageEnum, } from '../../authentication/permissions.enum'; import ErrorBuilder from '../../utils/ErrorBuilder'; -import { LanguageEnum, PermissionDto, PermissionGroup } from './dto/entities'; +import { PermissionDto, PermissionGroup } from './dto/entities'; @Injectable() export class PermissionsService @@ -97,7 +98,7 @@ export class PermissionsService return groups; } getAllPermissions(language: LanguageEnum = LanguageEnum.ptbr) { - const permissions: PermissionsObjectPermissionTranslated[] = []; + let permissions: PermissionsObjectPermissionTranslated[] = []; for (const key in PERMISSIONS) { const permissionGroup: PermissionsObjectGroup = PERMISSIONS[key]; const permissionGroupPermissions: PermissionsObjectPermissionTranslated[] = @@ -105,7 +106,7 @@ export class PermissionsService ...p, name: p.name[language], })); - permissions.concat(permissionGroupPermissions); + permissions = permissions.concat(permissionGroupPermissions); } return permissions; } diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index 70e9e8f..50ab808 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -82,13 +82,31 @@ export class UpdateRoleReq { name: string; @ApiPropertyOptional() description: string; - @ApiPropertyOptional() - userIds: string[]; - @ApiPropertyOptional() - permissionIds: number[]; } export class UpdateRoleRes { @ApiProperty() role: Role; } + +export class SetRolePermissionsReq { + @ApiProperty() + roleId: string; + @ApiProperty() + permissionIds: number[]; +} +export class SetRolePermissionsRes { + @ApiProperty() + role: Role; +} + +export class SetRoleUsersReq { + @ApiProperty() + roleId: string; + @ApiProperty() + userIds: string[]; +} +export class SetRoleUsersRes { + @ApiProperty() + role: Role; +} diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 53771d7..0260665 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -3,6 +3,7 @@ import { Controller, Delete, Get, + Headers, Inject, Param, Patch, @@ -11,7 +12,12 @@ import { Query, UseFilters, } from '@nestjs/common'; -import { ApiCreatedResponse, ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { + ApiCreatedResponse, + ApiHeader, + ApiOkResponse, + ApiTags, +} from '@nestjs/swagger'; import { RequestUser, User } from 'src/authentication/user.decorator'; import { DadosferaLogger } from 'dadosfera-logs'; import { RolesService } from './roles.service'; @@ -26,11 +32,25 @@ import { RevokePermissionsFromRoleRes, UpdateRoleReq, UpdateRoleRes, + Role, + SetRolePermissionsReq, + SetRolePermissionsRes, + SetRoleUsersRes, + 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'; @ApiTags('Roles') +@ApiHeader({ + name: 'dadosfera-lang', + enum: LanguageEnum, + required: false, + description: 'Defaults to pt-br', +}) @UseFilters(new GrpcToHttpExceptionFilter()) +@Authenticated() @Controller('roles') export class RolesController { logger: any; @@ -48,8 +68,10 @@ export class RolesController { async getRolesByCustomer( @User() user: RequestUser, @Query() filters: GetRolesByCustomerReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('getRolesByCustomer', { user }); + this.rolesService.setLanguage(language); return await this.rolesService.getRolesByCustomer( filters, user.customer_id, @@ -58,24 +80,25 @@ export class RolesController { @Post() @ApiCreatedResponse({ type: CreateRoleRes }) - async createRole(@User() user: RequestUser, @Body() body: CreateRoleReq) { + async createRole( + @User() user: RequestUser, + @Body() body: CreateRoleReq, + @Headers('dadosfera-lang') language, + ) { this.logger.info('createRole', { user }); + this.rolesService.setLanguage(language); return await this.rolesService.createRole(body, user.customer_id); } - @Delete(':id') - async deleteRole(@User() user: RequestUser, @Param('id') id: string) { - this.logger.info('deleteRole', { user }); - return await this.rolesService.removeRole(id); - } - @Put('permissions') @ApiOkResponse({ type: GrantPermissionsToRoleRes }) async grantPermissionsToRole( @User() user: RequestUser, @Body() body: GrantPermissionsToRoleReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('grantPermissionsToRole', { user }); + this.rolesService.setLanguage(language); return await this.rolesService.grantPermissionsToRole(body); } @@ -84,19 +107,69 @@ export class RolesController { async revokePermissionsFromRole( @User() user: RequestUser, @Body() body: RevokePermissionsFromRoleReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('revokePermissionsToRole', { user }); + this.rolesService.setLanguage(language); return await this.rolesService.revokePermissionFromRole(body); } + @Patch('permissions') + @ApiOkResponse({ type: SetRolePermissionsRes }) + async setRolePermissions( + @User() user: RequestUser, + @Body() body: SetRolePermissionsReq, + @Headers('dadosfera-lang') language, + ) { + this.logger.info('setRolePermissions', { user }); + this.rolesService.setLanguage(language); + return this.rolesService.setRolePermissions(body); + } + @Patch('users') + @ApiOkResponse({ type: SetRoleUsersRes }) + async setRoleUsers( + @User() user: RequestUser, + @Body() body: SetRoleUsersReq, + @Headers('dadosfera-lang') language, + ) { + this.logger.info('setRoleUsers', { user }); + this.rolesService.setLanguage(language); + return this.rolesService.setRoleUsers(body); + } + + @Get(':id') + @ApiOkResponse({ type: Role }) + async getRoleById( + @User() user: RequestUser, + @Param('id') id: string, + @Headers('dadosfera-lang') language, + ) { + this.logger.info('getRoleById', { user }); + this.rolesService.setLanguage(language); + return await this.rolesService.getRolesById(id); + } + + @Delete(':id') + async deleteRole( + @User() user: RequestUser, + @Param('id') id: string, + @Headers('dadosfera-lang') language, + ) { + this.logger.info('deleteRole', { user }); + this.rolesService.setLanguage(language); + return await this.rolesService.removeRole(id); + } + @Patch(':id') @ApiOkResponse({ type: UpdateRoleRes }) async updateRole( @User() user: RequestUser, @Param('id') id: string, @Body() body: UpdateRoleReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('updateRole', { user }); + this.rolesService.setLanguage(language); return this.rolesService.updateRole(id, body); } } diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index a8197ee..58857f1 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -7,17 +7,20 @@ import { GrantPermissionsToRoleReq, RevokePermissionsFromRoleReq, Role, + SetRolePermissionsReq, + SetRoleUsersReq, UpdateRoleReq, } from './dto/entities'; import { DadosferaLogger } from 'dadosfera-logs'; import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; +import { LanguageEnum } from 'src/authentication/permissions.enum'; @Injectable() export class RolesService { logger: any; - + private language: LanguageEnum = LanguageEnum.ptbr; private rolesClientService: RolesProtoService; constructor( @Inject(DadosferaLogger) @@ -27,12 +30,24 @@ export class RolesService { ) { this.logger = dadosferaLogger.logger; } + setLanguage(lang: LanguageEnum = LanguageEnum.ptbr) { + this.language = lang; + } onModuleInit() { this.rolesClientService = this.grpcClient.getService( ProtoServices.RolesProtoService, ); } + async getRolesById(id: string) { + const role = await lastValueFrom( + this.rolesClientService.RoleFindOneById({ + id, + }), + ); + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; + } async getRolesByCustomer(filters: GetRolesByCustomerReq, customerId: string) { let { permissionIds } = filters; if (permissionIds && !Array.isArray(permissionIds)) @@ -109,15 +124,41 @@ export class RolesService { } async updateRole(id: string, req: UpdateRoleReq) { - const { description, name, permissionIds, userIds } = req; + const { description, name } = req; const role = await lastValueFrom( this.rolesClientService.RoleUpdate({ id, description, name, - permissionIds: [], - permissionReqIds: permissionIds, + }), + ); + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; + } + + async setRolePermissions(req: SetRolePermissionsReq) { + const { roleId: id, permissionIds } = req; + const clearPermissions = + Array.isArray(permissionIds) && permissionIds.length === 0; + const role = await lastValueFrom( + this.rolesClientService.RoleSetPermissions({ + id, + permissionSeqIds: permissionIds, + clearPermissions, + }), + ); + const [roleTreated] = this.getRolesPermissionsName([role.role]); + return { role: roleTreated }; + } + + async setRoleUsers(req: SetRoleUsersReq) { + const { roleId: id, userIds } = req; + const clearUsers = Array.isArray(userIds) && userIds.length === 0; + const role = await lastValueFrom( + this.rolesClientService.RoleSetUsers({ + id, userIds, + clearUsers, }), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); @@ -125,9 +166,9 @@ export class RolesService { } getRolesPermissionsName(roles: Role[]) { for (const role of roles) { - const permisisonSeqIds = role.permissions.map((p) => p.seqid); - const permissions = - this.permissionsService.getPermissionsBySeqId(permisisonSeqIds); + const permissions = this.permissionsService.getAllPermissions( + this.language, + ); role.permissions.forEach((p) => { const permission = permissions.find((per) => per.seqid === p.seqid); p.name = permission.name; diff --git a/src/utils/ErrorBuilder.ts b/src/utils/ErrorBuilder.ts index b00e8f1..e89f2d1 100644 --- a/src/utils/ErrorBuilder.ts +++ b/src/utils/ErrorBuilder.ts @@ -119,6 +119,13 @@ export function EnrichErrorCode(code: string) { message: 'Não é possível criar um grupo com esse nome', code, }; + case ErrorCodes.ROLE.NOT_FOUND: + return { + statusCode: HttpStatus.NOT_FOUND, + error: 'Grupo não encontrado', + message: 'Grupo solicitado não encontrado', + code, + }; case ErrorCodes.INTERNAL: case ErrorCodes.UNKNOWN: default: @@ -138,9 +145,9 @@ const logger = new Logger(); export default class ErrorBuilder extends HttpException { code: string; - constructor(code: string | RpcException) { + constructor(code: string | RpcException = '') { if (typeof code !== 'string') { - logger.log(code.stack); + logger.log(code?.stack); code = (code as any).details as string; } else { logger.log(code); diff --git a/src/utils/errorCodes.ts b/src/utils/errorCodes.ts index 74a60ec..4eb3671 100644 --- a/src/utils/errorCodes.ts +++ b/src/utils/errorCodes.ts @@ -15,6 +15,7 @@ export const AUTH = { }; export const ROLE = { ALREADY_EXIST: 'ROLE.ALREADY_EXISTS', + NOT_FOUND: 'ROLE.NOT_FOUND', }; const ErrorCodes = { UNKNOWN: 'UNKNOWN', From 1de4eedd3842b30d63667051507897ccd9923b9a Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 15 Jul 2022 12:27:49 -0300 Subject: [PATCH 18/47] 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]); From 071c524a2e59ff751bff0e54d3e3d60686dfb97b Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 15 Jul 2022 14:39:30 -0300 Subject: [PATCH 19/47] 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: [], From 339432df1608dc33700227947688fa505753e501 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 15 Jul 2022 15:24:42 -0300 Subject: [PATCH 20/47] FIX: server urls on swagger --- src/main.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index 7e54651..add8d4c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -42,7 +42,11 @@ async function bootstrap() { .setDescription('Documentation for Maestro gateway') .setVersion('1.0') .addBearerAuth() - .addServer('http://127.0.0.1:3333') + .addServer( + process.env.ENV === 'local' + ? 'http://127.0.0.1:3333' + : 'https://maestro.dev.dadosfera.ai', + ) .build(); const document = SwaggerModule.createDocument(app, config); From a5e424c854ef876905efcac7d32bc81fcbfadae6 Mon Sep 17 00:00:00 2001 From: Victor Radael <53879758+victorradael@users.noreply.github.com> Date: Fri, 15 Jul 2022 17:53:38 -0300 Subject: [PATCH 21/47] Update app.module.ts --- src/app.module.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app.module.ts b/src/app.module.ts index 3eff0d1..e28c53e 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -54,7 +54,6 @@ const transformationClient = new TransformationsClientConfiguration(); TransformationsController, OutputsController, PipelinesController, - AuthController, HealthController, CatalogController, OauthController, From ccef7628f9f51c60280275bc28f17357abf8ddb7 Mon Sep 17 00:00:00 2001 From: Victor Radael <53879758+victorradael@users.noreply.github.com> Date: Fri, 15 Jul 2022 18:00:09 -0300 Subject: [PATCH 22/47] FIX: Remove AuthController --- src/app.module.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app.module.ts b/src/app.module.ts index e28c53e..03dafda 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,7 +1,6 @@ import { Module } from '@nestjs/common'; import { ClientsModule } from '@nestjs/microservices'; import { ConfigModule } from '@nestjs/config'; - import { InputsController } from './modules/inputs/inputs.controller'; import { TransformationsController } from './modules/transformations/transformations.controller'; import { OutputsController } from './modules/outputs/outputs.controllers'; From 52f9d06ad0c571b6088c046e66161c32ce7007f4 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 11:24:52 -0300 Subject: [PATCH 23/47] FIX: get permissions route --- src/modules/permissions/permissions.controller.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index 77615d1..83c71eb 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -42,9 +42,10 @@ export class PermissionsController { @Headers('dadosfera-lang') language: LanguageEnum, ) { this.logger.info('getPublicPermissions', { user }); - return this.permissionsService.getPermissionsGrouped( + const permissionGroups = this.permissionsService.getPermissionsGrouped( PermissionUsages.PUBLIC, language, ); + return { permissionGroups }; } } From 82310c63142e9b00051050fc789cd29d9703c51f Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 14:04:35 -0300 Subject: [PATCH 24/47] FEAT: Users roles id = seqid --- package-lock.json | 14 +++--- package.json | 2 +- src/modules/permissions/dto/entities.ts | 2 +- src/modules/roles/dto/entities.ts | 27 +++++----- src/modules/roles/roles.controller.ts | 4 +- src/modules/roles/roles.service.ts | 22 ++++++--- src/modules/users/dtos/entities.ts | 26 +++++++--- src/modules/users/users.controller.ts | 65 ++++++++++++++++++------- src/modules/users/users.service.ts | 49 ++++++++++++++++++- src/utils/ErrorBuilder.ts | 21 ++++++++ src/utils/errorCodes.ts | 15 ++++++ 11 files changed, 193 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index 59f61ba..c99b3fe 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.1", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,10 @@ } }, "node_modules/protospack-v2": { - "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==", + "version": "0.0.0", + "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-e9xqk0tm7AQcd4tZa1PbMsGRDHSbwJ6dUHAePL4myVGRH+j/g4K7K1dg5igd9daKVNIrJaTwZb5RmgoFaU6T4Q==", + "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17246,8 @@ } }, "protospack-v2": { - "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==", + "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-e9xqk0tm7AQcd4tZa1PbMsGRDHSbwJ6dUHAePL4myVGRH+j/g4K7K1dg5igd9daKVNIrJaTwZb5RmgoFaU6T4Q==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index c02610b..ed44165 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.1", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/permissions/dto/entities.ts b/src/modules/permissions/dto/entities.ts index 4fee93f..f4dc174 100644 --- a/src/modules/permissions/dto/entities.ts +++ b/src/modules/permissions/dto/entities.ts @@ -1,4 +1,4 @@ -import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { ApiProperty } from '@nestjs/swagger'; export class PermissionDto { @ApiProperty() diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index a5cbaa2..b7ce791 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -1,18 +1,21 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { Permission } from 'src/modules/permissions/dto/entities'; +import { + Permission, + PermissionDto, +} from 'src/modules/permissions/dto/entities'; import { Customer, UserNoRolesAndCustomer, } from 'src/modules/users/dtos/entities'; -export class Role { +export class RoleDto { @ApiProperty() id: string; @ApiProperty() name: string; @ApiProperty() description: string; - @ApiPropertyOptional({ type: () => [Permission] }) - permissions: Permission[]; + @ApiPropertyOptional({ type: () => [PermissionDto] }) + permissions: PermissionDto[]; @ApiPropertyOptional({ type: () => [UserNoRolesAndCustomer] }) users: UserNoRolesAndCustomer[]; @ApiProperty() @@ -23,7 +26,7 @@ export class Role { customer?: Customer; } -export class CustomerRole extends OmitType(Role, ['customer']) {} +export class CustomerRole extends OmitType(RoleDto, ['customer']) {} export enum TrueOrFalseEnum { true = 'true', @@ -37,8 +40,8 @@ export class GetRolesByCustomerReq { } export class GetRolesByCustomerRes { - @ApiProperty({ type: [Role] }) - roles: Role[]; + @ApiProperty({ type: [RoleDto] }) + roles: RoleDto[]; } export class CreateRoleReq { @ApiProperty() @@ -63,7 +66,7 @@ export class GrantPermissionsToRoleReq { } export class GrantPermissionsToRoleRes { @ApiProperty() - role: Role; + role: RoleDto; } export class RevokePermissionsFromRoleReq { @@ -74,7 +77,7 @@ export class RevokePermissionsFromRoleReq { } export class RevokePermissionsFromRoleRes { @ApiProperty() - role: Role; + role: RoleDto; } export class UpdateRoleReq { @@ -86,7 +89,7 @@ export class UpdateRoleReq { export class UpdateRoleRes { @ApiProperty() - role: Role; + role: RoleDto; } export class SetRolePermissionsReq { @@ -97,7 +100,7 @@ export class SetRolePermissionsReq { } export class SetRolePermissionsRes { @ApiProperty() - role: Role; + role: RoleDto; } export class SetRoleUsersReq { @@ -108,5 +111,5 @@ export class SetRoleUsersReq { } export class SetRoleUsersRes { @ApiProperty() - role: Role; + role: RoleDto; } diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index d2c2289..fd904ad 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -32,7 +32,7 @@ import { RevokePermissionsFromRoleRes, UpdateRoleReq, UpdateRoleRes, - Role, + RoleDto, SetRolePermissionsReq, SetRolePermissionsRes, SetRoleUsersRes, @@ -144,7 +144,7 @@ export class RolesController { } @Get(':id') - @ApiOkResponse({ type: Role }) + @ApiOkResponse({ type: RoleDto }) @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async getRoleById( @User() user: RequestUser, diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 1aebc5c..9ef20f7 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -6,7 +6,7 @@ import { GetRolesByCustomerReq, GrantPermissionsToRoleReq, RevokePermissionsFromRoleReq, - Role, + RoleDto, SetRolePermissionsReq, SetRoleUsersReq, UpdateRoleReq, @@ -16,6 +16,7 @@ import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; import { LanguageEnum } from 'src/authentication/permissions.enum'; +import { Role } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; @Injectable() export class RolesService { @@ -164,16 +165,23 @@ export class RolesService { const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - getRolesPermissionsName(roles: Role[]) { + getRolesPermissionsName(roles: Role[]): RoleDto[] { + const newRoles: RoleDto[] = []; for (const role of roles) { - const permissions = this.permissionsService.getAllPermissions( + const allPermissions = this.permissionsService.getAllPermissions( this.language, ); - role.permissions.forEach((p) => { - const permission = permissions.find((per) => per.seqid === p.seqid); - p.name = permission.name; + const newPermissions = role.permissions.map((p) => { + const permission = allPermissions.find((per) => per.seqid === p.seqid); + return { + ...p, + name: permission.name, + id: p.seqid, + }; }); + const newRole: RoleDto = { ...role, permissions: newPermissions }; + newRoles.push(newRole); } - return roles; + return newRoles; } } diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 3664d05..46170c3 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { Role } from 'src/modules/roles/dto/entities'; +import { RoleDto } from 'src/modules/roles/dto/entities'; export class Customer { @ApiProperty() id: string; @@ -23,8 +23,8 @@ export class User { name: string; @ApiProperty() email: string; - @ApiProperty({ type: [Role] }) - roles: Role[]; + @ApiProperty({ type: [RoleDto] }) + roles: RoleDto[]; @ApiProperty() jobTitle?: string; @ApiProperty() @@ -45,8 +45,8 @@ export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [ 'customer', ]) {} export class UserByCustomer { - @ApiProperty({ type: [Role] }) - roles: Role[]; + @ApiProperty({ type: [RoleDto] }) + roles: RoleDto[]; @ApiProperty() id: string; @ApiProperty() @@ -72,7 +72,7 @@ export class CreateUserReq { @ApiPropertyOptional() department?: string; @ApiPropertyOptional() - hierarchy?: string; + hierarchy?: number; } export class CreateUserRes { @ApiProperty() @@ -87,6 +87,19 @@ export class BatchCreateUserRes { users: User[]; } +export class UpdateUserReq { + @ApiPropertyOptional() + name?: string; + @ApiPropertyOptional() + roles?: string[]; + @ApiPropertyOptional() + jobTitle?: string; + @ApiPropertyOptional() + department?: string; + @ApiPropertyOptional() + hierarchy?: number; +} + export class GetAllUsersByCustomerIdReq { @ApiPropertyOptional() s?: string; @@ -117,4 +130,5 @@ export class SearchUserReq { @ApiProperty() s: string; } + export class SearchUserRes extends GetAllUsersByCustomerIdRes {} diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 7d7b3ed..ac3e021 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -5,27 +5,35 @@ import { Get, Inject, Param, + Patch, Post, Put, - Query, + Req, + UseFilters, } from '@nestjs/common'; -import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { ApiCreatedResponse, ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; +import { RequireAllPermissions } from 'src/authentication/authentication.decorator'; +import { PERMISSIONS } from 'src/authentication/permissions.enum'; import { RequestUser, User } from 'src/authentication/user.decorator'; +import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; import { AssignRoleToUserReq, + BatchCreateUserReq, + BatchCreateUserRes, CreateUserReq, CreateUserRes, DeleteUserRes, - GetAllUsersByCustomerIdReq, GetAllUsersByCustomerIdRes, UnassignRoleToUserReq, + UserByCustomer, } from './dtos/entities'; import { UsersService } from './users.service'; // TODO GET de hierarquias e do PATCH em usuário @ApiTags('Users') @Controller('users') +@UseFilters(GrpcToHttpExceptionFilter) export class UsersController { logger: any; @@ -38,37 +46,48 @@ export class UsersController { } @Get() + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: GetAllUsersByCustomerIdRes, description: 'List of users of a customer', }) - async getAllUsersByCustomerId( - @User() user: RequestUser, - @Query('s') searchQuery: GetAllUsersByCustomerIdReq, - ) { + async getAllUsersByCustomerId(@User() user: RequestUser) { this.logger.info('getAllUsersByCustomerId', { user }); - return await this.userService.findAllUsersByCustomerId( - user.customer_id, - searchQuery, - ); + return await this.userService.findAllUsersByCustomerId(user.customer_id); } - @Post() - @ApiOkResponse({ type: CreateUserRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiCreatedResponse({ type: CreateUserRes }) async createUser(@User() user: RequestUser, @Body() body: CreateUserReq) { this.logger.info('createUser', { user }); + return await this.userService.createUser(body); + } + + @Patch(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiCreatedResponse({ type: CreateUserRes }) + async updateUser( + @User() user: RequestUser, + @Body() body: CreateUserReq, + @Param('id') id: string, + ) { + this.logger.info('createUser', { user }); + return await this.userService.updateUser(body, id); } @Post('batch') - @ApiOkResponse({ type: CreateUserRes }) + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiCreatedResponse({ type: BatchCreateUserRes }) async batchCreateUser( @User() user: RequestUser, - @Body() body: CreateUserReq, + @Body() body: BatchCreateUserReq, ) { this.logger.info('batchCreateUser', { user }); + return await this.userService.batchCreateUser(body); } @Delete(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: DeleteUserRes }) async deleteUser(@User() user: RequestUser, @Param('id') id: string) { this.logger.info('deleteUser', { user }); @@ -76,6 +95,7 @@ export class UsersController { } @Put('role') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async assignRoleToUser( @User() user: RequestUser, @Body() body: AssignRoleToUserReq, @@ -85,11 +105,22 @@ export class UsersController { } @Delete('role') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async unassignRoleToUser( @User() user: RequestUser, - @Body() body: UnassignRoleToUserReq, + @Req() request: UnassignRoleToUserReq, ) { this.logger.info('unassignRoleToUser', { user }); - return await this.userService.unassignRoleToUser(body); + return await this.userService.unassignRoleToUser(request); + } + + @Get(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ + type: UserByCustomer, + }) + async findOneById(@User() user: RequestUser, @Param('id') id: string) { + this.logger.info('findOneById', { user }); + return await this.userService.findOneById(id); } } diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 86263ac..6a69216 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -10,6 +10,11 @@ import { UnassignRoleFromUserRequest, } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; import { lastValueFrom } from 'rxjs'; +import { + BatchCreateUserReq, + CreateUserReq, + UpdateUserReq, +} from './dtos/entities'; @Injectable() export class UsersService implements OnModuleInit { @@ -30,12 +35,54 @@ export class UsersService implements OnModuleInit { ); } - async findAllUsersByCustomerId(customerId, searchQuery) { + async findAllUsersByCustomerId(customerId: string) { return lastValueFrom( this.usersService.UserFindAllByCustomerId({ customerId }), ); } + async findOneById(id: string) { + return lastValueFrom(this.usersService.UserFindOneById({ id })); + } + + async createUser(user: CreateUserReq) { + const { email, department, hierarchy, jobTitle, name, roles } = user; + return lastValueFrom( + this.usersService.UserCreate({ + email, + hierarchy, + name, + roleIds: roles, + department, + jobTitle, + }), + ); + } + + async updateUser(user: UpdateUserReq, id: string) { + const { department, hierarchy, jobTitle, name, roles } = user; + return lastValueFrom( + this.usersService.UserUpdate({ + name, + customerId: '', + id, + }), + ); + } + + async batchCreateUser({ users }: BatchCreateUserReq) { + const usersToCreate = users.map((u) => ({ + ...u, + roleIds: u.roles, + name: u.name || '', + hierarchy: u.hierarchy || null, + })); + return lastValueFrom( + this.usersService.UserBatchCreate({ + users: usersToCreate, + }), + ); + } async assignRoleToUser(body: AssignRoleToUserRequest) { return lastValueFrom(this.usersService.AssignRoleToUser(body)); } diff --git a/src/utils/ErrorBuilder.ts b/src/utils/ErrorBuilder.ts index 4555b44..ec353be 100644 --- a/src/utils/ErrorBuilder.ts +++ b/src/utils/ErrorBuilder.ts @@ -142,6 +142,27 @@ export function EnrichErrorCode(code: string) { message: 'Grupo solicitado não encontrado', code, }; + case ErrorCodes.USER.NOT_FOUND: + return { + statusCode: HttpStatus.NOT_FOUND, + error: 'Usuário não encontrado', + message: 'Usuário solicitado não encontrado', + code, + }; + case ErrorCodes.USER.ALREADY_EXISTS: + return { + statusCode: HttpStatus.NOT_FOUND, + error: 'Usuário encontrado', + message: 'Nome de usuário já existente', + code, + }; + case ErrorCodes.USER.INVALID_ID: + return { + statusCode: HttpStatus.NOT_FOUND, + error: 'Id inválido', + message: 'Id encontra-se num formato inválido', + code, + }; case ErrorCodes.INTERNAL: case ErrorCodes.UNKNOWN: default: diff --git a/src/utils/errorCodes.ts b/src/utils/errorCodes.ts index f8d976a..04a9eb0 100644 --- a/src/utils/errorCodes.ts +++ b/src/utils/errorCodes.ts @@ -18,6 +18,19 @@ export const ROLE = { NOT_FOUND: 'ROLE.NOT_FOUND', }; +export const USER = { + INVALID_ID: 'USER.INVALID_ID', + NOT_FOUND: 'USER.NOT_FOUND', + ALREADY_EXISTS: 'USER.ALREADY_EXISTS', + ROLE_ALREADY_ASSIGNED: 'USER.ROLE_ALREADY_ASSIGNED', + ROLE_NOT_ASSIGNED: 'USER.ROLE_NOT_ASSIGNED', +}; + +export const CUSTOMER = { + INVALID_ID: 'CUSTOMER.INVALID_ID', + NOT_FOUND: 'CUSTOMER.NOT_FOUND', + ALREADY_EXISTS: 'CUSTOMER.ALREADY_EXISTS', +}; const TERMS_OF_USE = { UP_TO_DATE: 'TERMS_OF_USE.UP_TO_DATE', REQUIRED: 'TERMS_OF_USE.REQUIRED', @@ -30,6 +43,8 @@ const ErrorCodes = { AUTH, ROLE, TERMS_OF_USE, + USER, + CUSTOMER, }; export default ErrorCodes; From a55da8e20fe787db182eb480efcf9fe2b00468fd Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 15:37:56 -0300 Subject: [PATCH 25/47] FEAT: batch create user --- package-lock.json | 4 ++-- src/modules/roles/dto/entities.ts | 5 +---- src/modules/users/users.service.ts | 9 ++++++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index c99b3fe..abb1638 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9017,7 +9017,7 @@ "node_modules/protospack-v2": { "version": "0.0.0", "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-e9xqk0tm7AQcd4tZa1PbMsGRDHSbwJ6dUHAePL4myVGRH+j/g4K7K1dg5igd9daKVNIrJaTwZb5RmgoFaU6T4Q==", + "integrity": "sha512-tT+tkBmv9rQlWS6kX/NqVCBZfMsSe7aym2sENQqaMKPGMD1yKR2BI5fvn9Oq3D7wTF0BFNxXHIz4CkmNwdp/OQ==", "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", @@ -17247,7 +17247,7 @@ }, "protospack-v2": { "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-e9xqk0tm7AQcd4tZa1PbMsGRDHSbwJ6dUHAePL4myVGRH+j/g4K7K1dg5igd9daKVNIrJaTwZb5RmgoFaU6T4Q==", + "integrity": "sha512-tT+tkBmv9rQlWS6kX/NqVCBZfMsSe7aym2sENQqaMKPGMD1yKR2BI5fvn9Oq3D7wTF0BFNxXHIz4CkmNwdp/OQ==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index b7ce791..74b8de5 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -1,8 +1,5 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { - Permission, - PermissionDto, -} from 'src/modules/permissions/dto/entities'; +import { PermissionDto } from 'src/modules/permissions/dto/entities'; import { Customer, UserNoRolesAndCustomer, diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 6a69216..79c9b79 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -8,6 +8,7 @@ import { AssignRoleToUserRequest, IdRequest, UnassignRoleFromUserRequest, + UserCreateRequest, } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; import { lastValueFrom } from 'rxjs'; import { @@ -52,9 +53,10 @@ export class UsersService implements OnModuleInit { email, hierarchy, name, - roleIds: roles, + roleIds: [], department, jobTitle, + roleNames: roles, }), ); } @@ -71,9 +73,10 @@ export class UsersService implements OnModuleInit { } async batchCreateUser({ users }: BatchCreateUserReq) { - const usersToCreate = users.map((u) => ({ + const usersToCreate: UserCreateRequest[] = users.map((u) => ({ ...u, - roleIds: u.roles, + roleIds: [], + roleNames: u.roles, name: u.name || '', hierarchy: u.hierarchy || null, })); From cfcb8c1c423c8fdce6e0941ccfa0ce23b8af1ce3 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 17:50:12 -0300 Subject: [PATCH 26/47] FEAT: new user endpoints --- package-lock.json | 4 +- src/modules/permissions/dto/entities.ts | 20 +++- .../permissions/permissions.service.ts | 4 +- src/modules/roles/dto/entities.ts | 3 +- src/modules/roles/roles.controller.ts | 1 + src/modules/roles/roles.module.ts | 1 + src/modules/roles/roles.service.ts | 4 +- src/modules/users/dtos/entities.ts | 31 ++++-- src/modules/users/users.controller.ts | 36 ++++--- src/modules/users/users.module.ts | 4 + src/modules/users/users.service.ts | 100 ++++++++++++++---- 11 files changed, 158 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index abb1638..4e0f471 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9017,7 +9017,7 @@ "node_modules/protospack-v2": { "version": "0.0.0", "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-tT+tkBmv9rQlWS6kX/NqVCBZfMsSe7aym2sENQqaMKPGMD1yKR2BI5fvn9Oq3D7wTF0BFNxXHIz4CkmNwdp/OQ==", + "integrity": "sha512-S0CjzM2xctP6b2eJuelF802FkrndD+UA/ghSaLunTfw+my0yNtXZLxLbAC+0pphAZTkFrvWg3TdP4KIRA+59cA==", "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", @@ -17247,7 +17247,7 @@ }, "protospack-v2": { "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-tT+tkBmv9rQlWS6kX/NqVCBZfMsSe7aym2sENQqaMKPGMD1yKR2BI5fvn9Oq3D7wTF0BFNxXHIz4CkmNwdp/OQ==", + "integrity": "sha512-S0CjzM2xctP6b2eJuelF802FkrndD+UA/ghSaLunTfw+my0yNtXZLxLbAC+0pphAZTkFrvWg3TdP4KIRA+59cA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/src/modules/permissions/dto/entities.ts b/src/modules/permissions/dto/entities.ts index f4dc174..faa4a3b 100644 --- a/src/modules/permissions/dto/entities.ts +++ b/src/modules/permissions/dto/entities.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -export class PermissionDto { +export class PermissionGroupPermission { @ApiProperty() name: string; @ApiProperty() @@ -10,8 +10,8 @@ export class PermissionDto { export class PermissionGroup { @ApiProperty() title: string; - @ApiProperty({ type: [PermissionDto] }) - permissions: PermissionDto[]; + @ApiProperty({ type: [PermissionGroupPermission] }) + permissions: PermissionGroupPermission[]; } export class Permission { @@ -29,6 +29,20 @@ export class Permission { updatedAt: string; } +export class PermissionDto { + @ApiProperty() + id: number; + @ApiProperty() + seqid: number; + @ApiProperty() + name: string; + @ApiProperty() + claim: string; + @ApiProperty() + createdAt: string; + @ApiProperty() + updatedAt: string; +} export class GetPublicPermissionsRes { @ApiProperty({ type: [PermissionGroup] }) permissionGroups: PermissionGroup[]; diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 58b75e2..1344299 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -19,7 +19,7 @@ import { LanguageEnum, } from '../../authentication/permissions.enum'; import ErrorBuilder from '../../utils/ErrorBuilder'; -import { PermissionDto, PermissionGroup } from './dto/entities'; +import { PermissionGroupPermission, PermissionGroup } from './dto/entities'; @Injectable() export class PermissionsService @@ -82,7 +82,7 @@ export class PermissionsService for (const key in PERMISSIONS) { const permissionGroup: PermissionsObjectGroup = PERMISSIONS[key]; const title = permissionGroup.title[language]; - const permissions: PermissionDto[] = Object.values( + const permissions: PermissionGroupPermission[] = Object.values( permissionGroup.permissions, ) .filter(({ usage }) => diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index 74b8de5..275896e 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -14,7 +14,7 @@ export class RoleDto { @ApiPropertyOptional({ type: () => [PermissionDto] }) permissions: PermissionDto[]; @ApiPropertyOptional({ type: () => [UserNoRolesAndCustomer] }) - users: UserNoRolesAndCustomer[]; + users?: UserNoRolesAndCustomer[]; @ApiProperty() createdAt: string; @ApiProperty() @@ -24,6 +24,7 @@ export class RoleDto { } export class CustomerRole extends OmitType(RoleDto, ['customer']) {} +export class UserRole extends OmitType(RoleDto, ['users']) {} export enum TrueOrFalseEnum { true = 'true', diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index fd904ad..651ea0d 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -130,6 +130,7 @@ export class RolesController { this.rolesService.setLanguage(language); return this.rolesService.setRolePermissions(body); } + @Patch('users') @ApiOkResponse({ type: SetRoleUsersRes }) @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) diff --git a/src/modules/roles/roles.module.ts b/src/modules/roles/roles.module.ts index 5b3a3b9..2ec4a05 100644 --- a/src/modules/roles/roles.module.ts +++ b/src/modules/roles/roles.module.ts @@ -20,5 +20,6 @@ const ducClient = new DucClient(); ], controllers: [RolesController], providers: [RolesService, DadosferaLogger], + exports: [RolesService], }) export class RolesModule {} diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 9ef20f7..6925715 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -16,7 +16,7 @@ import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; import { LanguageEnum } from 'src/authentication/permissions.enum'; -import { Role } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; +import { Role, UserRole } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; @Injectable() export class RolesService { @@ -165,7 +165,7 @@ export class RolesService { const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - getRolesPermissionsName(roles: Role[]): RoleDto[] { + getRolesPermissionsName(roles: UserRole[]): RoleDto[] { const newRoles: RoleDto[] = []; for (const role of roles) { const allPermissions = this.permissionsService.getAllPermissions( diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 46170c3..02a154e 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { RoleDto } from 'src/modules/roles/dto/entities'; +import { RoleDto, UserRole } from 'src/modules/roles/dto/entities'; export class Customer { @ApiProperty() id: string; @@ -23,8 +23,8 @@ export class User { name: string; @ApiProperty() email: string; - @ApiProperty({ type: [RoleDto] }) - roles: RoleDto[]; + @ApiProperty({ type: [UserRole] }) + roles: UserRole[]; @ApiProperty() jobTitle?: string; @ApiProperty() @@ -66,7 +66,7 @@ export class CreateUserReq { @ApiProperty() email: string; @ApiPropertyOptional() - roles?: string[]; + roleNames?: string[]; @ApiPropertyOptional() jobTitle?: string; @ApiPropertyOptional() @@ -84,15 +84,15 @@ export class BatchCreateUserReq { } export class BatchCreateUserRes { @ApiProperty({ type: [User] }) - users: User[]; + usersCreated: User[]; + @ApiProperty({ type: [CreateUserReq] }) + errorUsers: CreateUserReq[]; } export class UpdateUserReq { @ApiPropertyOptional() name?: string; @ApiPropertyOptional() - roles?: string[]; - @ApiPropertyOptional() jobTitle?: string; @ApiPropertyOptional() department?: string; @@ -100,6 +100,11 @@ export class UpdateUserReq { hierarchy?: number; } +export class UpdateUserRes { + @ApiProperty() + user: UserByCustomer; +} + export class GetAllUsersByCustomerIdReq { @ApiPropertyOptional() s?: string; @@ -131,4 +136,16 @@ export class SearchUserReq { s: string; } +export class SetUserRolesReq { + @ApiProperty() + userId: string; + @ApiProperty() + roleNames: string[]; +} + +export class SetUserRolesRes { + @ApiProperty() + user: UserByCustomer; +} + export class SearchUserRes extends GetAllUsersByCustomerIdRes {} diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index ac3e021..29e75ed 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -25,7 +25,11 @@ import { CreateUserRes, DeleteUserRes, GetAllUsersByCustomerIdRes, + SetUserRolesReq, + SetUserRolesRes, UnassignRoleToUserReq, + UpdateUserReq, + UpdateUserRes, UserByCustomer, } from './dtos/entities'; import { UsersService } from './users.service'; @@ -63,18 +67,6 @@ export class UsersController { return await this.userService.createUser(body); } - @Patch(':id') - @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) - @ApiCreatedResponse({ type: CreateUserRes }) - async updateUser( - @User() user: RequestUser, - @Body() body: CreateUserReq, - @Param('id') id: string, - ) { - this.logger.info('createUser', { user }); - return await this.userService.updateUser(body, id); - } - @Post('batch') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiCreatedResponse({ type: BatchCreateUserRes }) @@ -94,6 +86,14 @@ export class UsersController { return await this.userService.deleteUser({ id }); } + @Patch('roles') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ type: SetUserRolesRes }) + async setUserRoles(@User() user: RequestUser, @Body() body: SetUserRolesReq) { + this.logger.info('createUser', { user }); + return await this.userService.setRoles(body); + } + @Put('role') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) async assignRoleToUser( @@ -123,4 +123,16 @@ export class UsersController { this.logger.info('findOneById', { user }); return await this.userService.findOneById(id); } + + @Patch(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ type: UpdateUserRes }) + async updateUser( + @User() user: RequestUser, + @Body() body: UpdateUserReq, + @Param('id') id: string, + ) { + this.logger.info('createUser', { user }); + return await this.userService.updateUser(body, id); + } } diff --git a/src/modules/users/users.module.ts b/src/modules/users/users.module.ts index 87b5a5d..8ff3a49 100644 --- a/src/modules/users/users.module.ts +++ b/src/modules/users/users.module.ts @@ -4,6 +4,8 @@ import { UsersService } from './users.service'; import { DadosferaLogger } from 'dadosfera-logs'; import { ClientsModule } from '@nestjs/microservices'; import { DucClient } from 'src/clients/duc/client.config'; +import { RolesModule } from '../roles/roles.module'; +import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); @@ -15,6 +17,8 @@ const ducClient = new DucClient(); ...ducClient.config(), }, ]), + RolesModule, + PermissionsModule, ], controllers: [UsersController], providers: [UsersService, DadosferaLogger], diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 79c9b79..691b48f 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -14,87 +14,145 @@ import { lastValueFrom } from 'rxjs'; import { BatchCreateUserReq, CreateUserReq, + SetUserRolesReq, UpdateUserReq, } from './dtos/entities'; +import { RolesService } from '../roles/roles.service'; @Injectable() export class UsersService implements OnModuleInit { logger: any; - private usersService: UsersProtoService; + private usersClientService: UsersProtoService; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc, + private rolesService: RolesService, ) { this.logger = dadosferaLogger.logger; } onModuleInit() { - this.usersService = this.grpcClient.getService( + this.usersClientService = this.grpcClient.getService( ProtoServices.UsersProtoService, ); } async findAllUsersByCustomerId(customerId: string) { - return lastValueFrom( - this.usersService.UserFindAllByCustomerId({ customerId }), + const { users } = await lastValueFrom( + this.usersClientService.UserFindAllByCustomerId({ customerId }), ); + users?.forEach((u) => { + const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); + u.roles = roles; + }); + return users; } async findOneById(id: string) { - return lastValueFrom(this.usersService.UserFindOneById({ id })); + const { user } = await lastValueFrom( + this.usersClientService.UserFindOneById({ id }), + ); + if (user) { + const roles: any[] = this.rolesService.getRolesPermissionsName( + user.roles, + ); + user.roles = roles; + } + return user; } - async createUser(user: CreateUserReq) { - const { email, department, hierarchy, jobTitle, name, roles } = user; - return lastValueFrom( - this.usersService.UserCreate({ + async createUser(req: CreateUserReq) { + const { email, department, hierarchy, jobTitle, name, roleNames } = req; + const { user } = await lastValueFrom( + this.usersClientService.UserCreate({ email, hierarchy, name, roleIds: [], department, jobTitle, - roleNames: roles, + roleNames, }), ); + if (user) { + const roles: any[] = this.rolesService.getRolesPermissionsName( + user.roles, + ); + user.roles = roles; + } + return user; } - async updateUser(user: UpdateUserReq, id: string) { - const { department, hierarchy, jobTitle, name, roles } = user; - return lastValueFrom( - this.usersService.UserUpdate({ + async updateUser(req: UpdateUserReq, id: string) { + const { department, hierarchy, jobTitle, name } = req; + const { user } = await lastValueFrom( + this.usersClientService.UserUpdate({ name, - customerId: '', + customerId: undefined, id, + department, + hierarchy, + jobTitle, }), ); + if (user) { + const roles: any[] = this.rolesService.getRolesPermissionsName( + user.roles, + ); + user.roles = roles; + } + return user; } + async setRoles(body: SetUserRolesReq) { + const { roleNames, userId } = body; + const clearRoles = roleNames && roleNames.length === 0; + const { user } = await lastValueFrom( + this.usersClientService.UserSetRoles({ + userId, + roleIds: [], + roleNames, + clearRoles, + }), + ); + if (user) { + const roles: any[] = this.rolesService.getRolesPermissionsName( + user.roles, + ); + user.roles = roles; + } + return user; + } async batchCreateUser({ users }: BatchCreateUserReq) { const usersToCreate: UserCreateRequest[] = users.map((u) => ({ ...u, roleIds: [], - roleNames: u.roles, + roleNames: u.roleNames, name: u.name || '', hierarchy: u.hierarchy || null, })); - return lastValueFrom( - this.usersService.UserBatchCreate({ + const { errorUsers, usersCreated } = await lastValueFrom( + this.usersClientService.UserBatchCreate({ users: usersToCreate, }), ); + usersCreated?.forEach((u) => { + const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); + u.roles = roles; + }); + return { errorUsers, usersCreated }; } async assignRoleToUser(body: AssignRoleToUserRequest) { - return lastValueFrom(this.usersService.AssignRoleToUser(body)); + return lastValueFrom(this.usersClientService.AssignRoleToUser(body)); } async unassignRoleToUser(body: UnassignRoleFromUserRequest) { - return lastValueFrom(this.usersService.UnassignRoleFromUser(body)); + return lastValueFrom(this.usersClientService.UnassignRoleFromUser(body)); } async deleteUser(id: IdRequest) { - return lastValueFrom(this.usersService.UserRemove(id)); + return lastValueFrom(this.usersClientService.UserRemove(id)); } } From a6a35c507a88d787e16ff26509aedec7811711bd Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 17:56:50 -0300 Subject: [PATCH 27/47] new Protospack --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e0f471..24dd7c9 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.6.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-S0CjzM2xctP6b2eJuelF802FkrndD+UA/ghSaLunTfw+my0yNtXZLxLbAC+0pphAZTkFrvWg3TdP4KIRA+59cA==", - "license": "ISC", + "version": "3.6.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.0.tgz", + "integrity": "sha512-5yDRmKokHcGflyldmwDB4dnQXUdbn8MhkYD4OPVt1mkS9Vonc/AY6LR2mn7KueAeIFniZRW0cBcIwZLFZEMaVA==", "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-S0CjzM2xctP6b2eJuelF802FkrndD+UA/ghSaLunTfw+my0yNtXZLxLbAC+0pphAZTkFrvWg3TdP4KIRA+59cA==", + "version": "3.6.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.0.tgz", + "integrity": "sha512-5yDRmKokHcGflyldmwDB4dnQXUdbn8MhkYD4OPVt1mkS9Vonc/AY6LR2mn7KueAeIFniZRW0cBcIwZLFZEMaVA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index ed44165..871c9a5 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.6.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", From 4ab955a7a1ad5e3dfc65e632a8685d8fb431b31c Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 18:00:44 -0300 Subject: [PATCH 28/47] removed unused import --- src/app.module.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app.module.ts b/src/app.module.ts index de2f572..c82ce41 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -5,7 +5,6 @@ import { InputsController } from './modules/inputs/inputs.controller'; import { TransformationsController } from './modules/transformations/transformations.controller'; import { OutputsController } from './modules/outputs/outputs.controllers'; import { PipelinesController } from './modules/pipelines/pipelines.controller'; -import { AuthController } from './modules/auth/auth.controller'; import { HealthController } from './modules/health/health.controller'; import { InputsService } from './modules/inputs/inputs.service'; From 57f47d3b2e38e6768cb8756cbe5928f2b0b2729e Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 18 Jul 2022 18:20:15 -0300 Subject: [PATCH 29/47] FIX: get all hierarchies --- package-lock.json | 14 ++++++------ package.json | 2 +- src/modules/users/dtos/entities.ts | 11 +++++++++ src/modules/users/users.controller.ts | 32 ++++++++++++++++++--------- src/modules/users/users.service.ts | 13 ++++++----- 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ef5b38..e87ec8d 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.2", - "protospack-v2": "3.6.0", + "protospack-v2": "3.6.1", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.6.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.0.tgz", - "integrity": "sha512-5yDRmKokHcGflyldmwDB4dnQXUdbn8MhkYD4OPVt1mkS9Vonc/AY6LR2mn7KueAeIFniZRW0cBcIwZLFZEMaVA==", + "version": "3.6.1", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.1.tgz", + "integrity": "sha512-kiulN1JFVAXGcC1lLOeXrB8DvL9gPvujXWYM+iJfoRm/SGDwSnw1LTS3Ytwxg9z55c3LiN9uli6AYXeTU30HcA==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.6.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.0.tgz", - "integrity": "sha512-5yDRmKokHcGflyldmwDB4dnQXUdbn8MhkYD4OPVt1mkS9Vonc/AY6LR2mn7KueAeIFniZRW0cBcIwZLFZEMaVA==", + "version": "3.6.1", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.1.tgz", + "integrity": "sha512-kiulN1JFVAXGcC1lLOeXrB8DvL9gPvujXWYM+iJfoRm/SGDwSnw1LTS3Ytwxg9z55c3LiN9uli6AYXeTU30HcA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index f880808..7df4352 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.2", - "protospack-v2": "3.6.0", + "protospack-v2": "3.6.1", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 02a154e..d6116d2 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,5 +1,11 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; import { RoleDto, UserRole } from 'src/modules/roles/dto/entities'; +export class Hierarchy { + @ApiProperty() + id: number; + @ApiProperty() + name: string; +} export class Customer { @ApiProperty() id: string; @@ -149,3 +155,8 @@ export class SetUserRolesRes { } export class SearchUserRes extends GetAllUsersByCustomerIdRes {} + +export class GetAllHierarchiesRes { + @ApiProperty({ type: [Hierarchy] }) + hierarchies: Hierarchy[]; +} diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 29e75ed..de09fea 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -24,6 +24,7 @@ import { CreateUserReq, CreateUserRes, DeleteUserRes, + GetAllHierarchiesRes, GetAllUsersByCustomerIdRes, SetUserRolesReq, SetUserRolesRes, @@ -59,6 +60,25 @@ export class UsersController { this.logger.info('getAllUsersByCustomerId', { user }); return await this.userService.findAllUsersByCustomerId(user.customer_id); } + + @Get('hierarchies') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ type: GetAllHierarchiesRes }) + async getAllHierarchies(@User() user: RequestUser) { + this.logger.info('getAllHierarchies', { user }); + return await this.userService.getAllHierarchies(); + } + + @Get(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ + type: UserByCustomer, + }) + async findOneById(@User() user: RequestUser, @Param('id') id: string) { + this.logger.info('findOneById', { user }); + return await this.userService.findOneById(id); + } + @Post() @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiCreatedResponse({ type: CreateUserRes }) @@ -114,16 +134,6 @@ export class UsersController { return await this.userService.unassignRoleToUser(request); } - @Get(':id') - @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) - @ApiOkResponse({ - type: UserByCustomer, - }) - async findOneById(@User() user: RequestUser, @Param('id') id: string) { - this.logger.info('findOneById', { user }); - return await this.userService.findOneById(id); - } - @Patch(':id') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: UpdateUserRes }) @@ -132,7 +142,7 @@ export class UsersController { @Body() body: UpdateUserReq, @Param('id') id: string, ) { - this.logger.info('createUser', { user }); + this.logger.info('updateUser', { user }); return await this.userService.updateUser(body, id); } } diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 691b48f..36acb64 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -47,7 +47,7 @@ export class UsersService implements OnModuleInit { const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); u.roles = roles; }); - return users; + return { users }; } async findOneById(id: string) { @@ -60,7 +60,7 @@ export class UsersService implements OnModuleInit { ); user.roles = roles; } - return user; + return { user }; } async createUser(req: CreateUserReq) { @@ -82,7 +82,7 @@ export class UsersService implements OnModuleInit { ); user.roles = roles; } - return user; + return { user }; } async updateUser(req: UpdateUserReq, id: string) { @@ -103,7 +103,7 @@ export class UsersService implements OnModuleInit { ); user.roles = roles; } - return user; + return { user }; } async setRoles(body: SetUserRolesReq) { @@ -123,7 +123,7 @@ export class UsersService implements OnModuleInit { ); user.roles = roles; } - return user; + return { user }; } async batchCreateUser({ users }: BatchCreateUserReq) { const usersToCreate: UserCreateRequest[] = users.map((u) => ({ @@ -155,4 +155,7 @@ export class UsersService implements OnModuleInit { async deleteUser(id: IdRequest) { return lastValueFrom(this.usersClientService.UserRemove(id)); } + async getAllHierarchies() { + return lastValueFrom(this.usersClientService.UserFindAllHierarchies({})); + } } From 9cdb0a5d38da8abc7b8d5e4bf0abfcda7d6e01fe Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Tue, 19 Jul 2022 10:17:57 -0300 Subject: [PATCH 30/47] FIX: Update user accepting roleIds --- package-lock.json | 14 +++++++------- package.json | 2 +- src/modules/users/dtos/entities.ts | 2 ++ src/modules/users/users.controller.ts | 4 ++-- src/modules/users/users.service.ts | 10 +++++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index e87ec8d..888abea 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.2", - "protospack-v2": "3.6.1", + "protospack-v2": "3.6.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.6.1", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.1.tgz", - "integrity": "sha512-kiulN1JFVAXGcC1lLOeXrB8DvL9gPvujXWYM+iJfoRm/SGDwSnw1LTS3Ytwxg9z55c3LiN9uli6AYXeTU30HcA==", + "version": "3.6.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.2.tgz", + "integrity": "sha512-H1tpfCrj5cAJQFyES3+liZh0OoRUqCjLGGykEBhIOBTUGRPnr0CuU+czCjHdF/jBxO7ToTc3RS+kngX1scXyLg==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.6.1", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.1.tgz", - "integrity": "sha512-kiulN1JFVAXGcC1lLOeXrB8DvL9gPvujXWYM+iJfoRm/SGDwSnw1LTS3Ytwxg9z55c3LiN9uli6AYXeTU30HcA==", + "version": "3.6.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.2.tgz", + "integrity": "sha512-H1tpfCrj5cAJQFyES3+liZh0OoRUqCjLGGykEBhIOBTUGRPnr0CuU+czCjHdF/jBxO7ToTc3RS+kngX1scXyLg==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 7df4352..ebf5760 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.2", - "protospack-v2": "3.6.1", + "protospack-v2": "3.6.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index d6116d2..65abbc7 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -104,6 +104,8 @@ export class UpdateUserReq { department?: string; @ApiPropertyOptional() hierarchy?: number; + @ApiPropertyOptional() + roleNames?: string[]; } export class UpdateUserRes { diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index de09fea..3365fc9 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -111,7 +111,7 @@ export class UsersController { @ApiOkResponse({ type: SetUserRolesRes }) async setUserRoles(@User() user: RequestUser, @Body() body: SetUserRolesReq) { this.logger.info('createUser', { user }); - return await this.userService.setRoles(body); + return await this.userService.setRoles(body, user.customer_id); } @Put('role') @@ -143,6 +143,6 @@ export class UsersController { @Param('id') id: string, ) { this.logger.info('updateUser', { user }); - return await this.userService.updateUser(body, id); + return await this.userService.updateUser(body, id, user.customer_id); } } diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 36acb64..eb8600a 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -85,8 +85,11 @@ export class UsersService implements OnModuleInit { return { user }; } - async updateUser(req: UpdateUserReq, id: string) { - const { department, hierarchy, jobTitle, name } = req; + async updateUser(req: UpdateUserReq, id: string, customerId: string) { + const { department, hierarchy, jobTitle, name, roleNames } = req; + if (roleNames) { + await this.setRoles({ roleNames, userId: id }, customerId); + } const { user } = await lastValueFrom( this.usersClientService.UserUpdate({ name, @@ -106,7 +109,7 @@ export class UsersService implements OnModuleInit { return { user }; } - async setRoles(body: SetUserRolesReq) { + async setRoles(body: SetUserRolesReq, customerId: string) { const { roleNames, userId } = body; const clearRoles = roleNames && roleNames.length === 0; const { user } = await lastValueFrom( @@ -115,6 +118,7 @@ export class UsersService implements OnModuleInit { roleIds: [], roleNames, clearRoles, + customerId, }), ); if (user) { From 5ce8099c25ace8a5d2e0594e3079b0ebff3fd58a Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Tue, 19 Jul 2022 16:22:24 -0300 Subject: [PATCH 31/47] tests fixes --- src/authentication/authentication.guard.spec.ts | 6 +++++- src/authentication/authentication.guard.ts | 2 +- src/authentication/user.decorator.spec.ts | 6 +++++- .../permissions/permissions.controller.spec.ts | 13 +++++++++++-- src/modules/roles/roles.controller.spec.ts | 15 ++++++++++++++- src/modules/roles/roles.service.spec.ts | 16 +++++++++++++++- src/modules/users/users.controller.spec.ts | 16 +++++++++++++++- src/modules/users/users.service.spec.ts | 16 +++++++++++++++- 8 files changed, 81 insertions(+), 9 deletions(-) diff --git a/src/authentication/authentication.guard.spec.ts b/src/authentication/authentication.guard.spec.ts index fc6fed1..6ee76d0 100644 --- a/src/authentication/authentication.guard.spec.ts +++ b/src/authentication/authentication.guard.spec.ts @@ -18,6 +18,10 @@ import { AuthClientService } from '../modules/auth/auth.service'; import ErrorCodes from '../utils/errorCodes'; +const logger = { + info: (...args) => args, + error: (...args) => args, +}; @Controller('no-class-auth') class NoClassAuthController { @Get('body') @@ -110,7 +114,7 @@ describe('authentication.guard', () => { }, { provide: DadosferaLogger, - useValue: { logger: console }, + useValue: { logger }, }, { provide: APP_GUARD, diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index 062a87f..1de43e1 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -95,7 +95,7 @@ export class AuthenticationGuard );*/ assert( - accessTokenDecoded.payload.token_use === 'access', + accessTokenDecoded?.payload?.token_use === 'access', 'should be an access token', ); diff --git a/src/authentication/user.decorator.spec.ts b/src/authentication/user.decorator.spec.ts index 77b084d..30d4baa 100644 --- a/src/authentication/user.decorator.spec.ts +++ b/src/authentication/user.decorator.spec.ts @@ -13,6 +13,10 @@ import ErrorCodes from '../utils/errorCodes'; import { User } from './user.decorator'; import { PERMISSIONS } from './permissions.enum'; +const logger = { + info: (...args) => args, + error: (...args) => args, +}; @Controller('user') class UserController { @Get() @@ -66,7 +70,7 @@ describe('user.decorator', () => { }, { provide: DadosferaLogger, - useValue: { logger: console }, + useValue: { logger }, }, { provide: APP_GUARD, diff --git a/src/modules/permissions/permissions.controller.spec.ts b/src/modules/permissions/permissions.controller.spec.ts index 04a0822..9bf04b1 100644 --- a/src/modules/permissions/permissions.controller.spec.ts +++ b/src/modules/permissions/permissions.controller.spec.ts @@ -6,7 +6,10 @@ import { DadosferaLogger } from 'dadosfera-logs'; import { PermissionsService } from './permissions.service'; const ducClient = new DucClient(); - +const logger = { + info: (...args) => args, + error: (...args) => args, +}; describe('PermissionsController', () => { let controller: PermissionsController; @@ -21,7 +24,13 @@ describe('PermissionsController', () => { ]), ], controllers: [PermissionsController], - providers: [DadosferaLogger, PermissionsService], + providers: [ + { + provide: DadosferaLogger, + useValue: { logger }, + }, + PermissionsService, + ], }).compile(); controller = module.get(PermissionsController); diff --git a/src/modules/roles/roles.controller.spec.ts b/src/modules/roles/roles.controller.spec.ts index cc003fa..38448bc 100644 --- a/src/modules/roles/roles.controller.spec.ts +++ b/src/modules/roles/roles.controller.spec.ts @@ -4,9 +4,14 @@ import { DucClient } from 'src/clients/duc/client.config'; import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; import { DadosferaLogger } from 'dadosfera-logs'; +import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); +const logger = { + info: (...args) => args, + error: (...args) => args, +}; describe('RolesController', () => { let controller: RolesController; @@ -19,9 +24,17 @@ describe('RolesController', () => { ...ducClient.config(), }, ]), + PermissionsModule, ], controllers: [RolesController], - providers: [RolesService, DadosferaLogger], + providers: [ + RolesService, + { + provide: DadosferaLogger, + useValue: { logger }, + }, + ], + exports: [RolesService], }).compile(); controller = module.get(RolesController); diff --git a/src/modules/roles/roles.service.spec.ts b/src/modules/roles/roles.service.spec.ts index 79bffd2..4d8b206 100644 --- a/src/modules/roles/roles.service.spec.ts +++ b/src/modules/roles/roles.service.spec.ts @@ -4,9 +4,14 @@ import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; import { DadosferaLogger } from 'dadosfera-logs'; import { DucClient } from 'src/clients/duc/client.config'; +import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); +const logger = { + info: (...args) => args, + error: (...args) => args, +}; describe('RolesService', () => { let service: RolesService; @@ -19,8 +24,17 @@ describe('RolesService', () => { ...ducClient.config(), }, ]), + PermissionsModule, ], - providers: [RolesService, DadosferaLogger], + controllers: [RolesController], + providers: [ + RolesService, + { + provide: DadosferaLogger, + useValue: { logger }, + }, + ], + exports: [RolesService], }).compile(); service = module.get(RolesService); diff --git a/src/modules/users/users.controller.spec.ts b/src/modules/users/users.controller.spec.ts index 25524cd..610e16e 100644 --- a/src/modules/users/users.controller.spec.ts +++ b/src/modules/users/users.controller.spec.ts @@ -4,9 +4,15 @@ import { DucClient } from 'src/clients/duc/client.config'; import { UsersController } from './users.controller'; import { UsersService } from './users.service'; import { DadosferaLogger } from 'dadosfera-logs'; +import { RolesModule } from '../roles/roles.module'; +import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); +const logger = { + info: (...args) => args, + error: (...args) => args, +}; describe('UsersController', () => { let controller: UsersController; @@ -19,9 +25,17 @@ describe('UsersController', () => { ...ducClient.config(), }, ]), + RolesModule, + PermissionsModule, ], controllers: [UsersController], - providers: [UsersService, DadosferaLogger], + providers: [ + UsersService, + { + provide: DadosferaLogger, + useValue: { logger }, + }, + ], }).compile(); controller = module.get(UsersController); diff --git a/src/modules/users/users.service.spec.ts b/src/modules/users/users.service.spec.ts index e6c05ef..6b665f5 100644 --- a/src/modules/users/users.service.spec.ts +++ b/src/modules/users/users.service.spec.ts @@ -4,9 +4,15 @@ import { UsersController } from './users.controller'; import { UsersService } from './users.service'; import { DadosferaLogger } from 'dadosfera-logs'; import { DucClient } from 'src/clients/duc/client.config'; +import { RolesModule } from '../roles/roles.module'; +import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); +const logger = { + info: (...args) => args, + error: (...args) => args, +}; describe('UsersService', () => { let service: UsersService; @@ -19,9 +25,17 @@ describe('UsersService', () => { ...ducClient.config(), }, ]), + RolesModule, + PermissionsModule, ], controllers: [UsersController], - providers: [UsersService, DadosferaLogger], + providers: [ + UsersService, + { + provide: DadosferaLogger, + useValue: { logger }, + }, + ], }).compile(); service = module.get(UsersService); From c61c37b268cec0c1466acbba7823a242bf7e539d Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Wed, 20 Jul 2022 09:50:58 -0300 Subject: [PATCH 32/47] FIX: new user columns --- package-lock.json | 14 +++++++------- package.json | 2 +- src/modules/users/dtos/entities.ts | 24 +++++++----------------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 888abea..9fbf918 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.2", - "protospack-v2": "3.6.2", + "protospack-v2": "3.6.3", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.6.2", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.2.tgz", - "integrity": "sha512-H1tpfCrj5cAJQFyES3+liZh0OoRUqCjLGGykEBhIOBTUGRPnr0CuU+czCjHdF/jBxO7ToTc3RS+kngX1scXyLg==", + "version": "3.6.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.3.tgz", + "integrity": "sha512-eGkVCzWs35jWdr3thF/V8d04gaDzO8LfiRpIQZTahW+vGNAMSs/zmVnXpxsSOmabkHJHvtbqHMydt30KpE5hGQ==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.6.2", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.2.tgz", - "integrity": "sha512-H1tpfCrj5cAJQFyES3+liZh0OoRUqCjLGGykEBhIOBTUGRPnr0CuU+czCjHdF/jBxO7ToTc3RS+kngX1scXyLg==", + "version": "3.6.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.3.tgz", + "integrity": "sha512-eGkVCzWs35jWdr3thF/V8d04gaDzO8LfiRpIQZTahW+vGNAMSs/zmVnXpxsSOmabkHJHvtbqHMydt30KpE5hGQ==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index ebf5760..801720d 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.2", - "protospack-v2": "3.6.2", + "protospack-v2": "3.6.3", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 65abbc7..2d778bc 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { RoleDto, UserRole } from 'src/modules/roles/dto/entities'; +import { UserRole } from 'src/modules/roles/dto/entities'; export class Hierarchy { @ApiProperty() id: number; @@ -45,27 +45,17 @@ export class User { createdAt: string; @ApiProperty() updatedAt: string; + @ApiProperty() + status: string; + @ApiPropertyOptional() + lastLogin?: string; } export class UserNoRoles extends OmitType(User, ['roles']) {} export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [ 'customer', ]) {} -export class UserByCustomer { - @ApiProperty({ type: [RoleDto] }) - roles: RoleDto[]; - @ApiProperty() - id: string; - @ApiProperty() - name: string; - @ApiProperty() - username: string; - @ApiProperty() - mfaStatus: string; - @ApiProperty() - createdAt: string; - @ApiProperty() - updatedAt: string; -} +export class UserByCustomer extends OmitType(User, ['customer']) {} + export class CreateUserReq { @ApiPropertyOptional() name?: string; From 3e7581e20cd9e8ef9655e2d68ef50fe92582c237 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Wed, 20 Jul 2022 15:17:58 -0300 Subject: [PATCH 33/47] FIX: changing hierarchy strategy --- package-lock.json | 14 +-- package.json | 2 +- src/authentication/permissions.enum.ts | 7 +- .../permissions/permissions.controller.ts | 4 +- .../permissions/permissions.service.ts | 2 +- src/modules/roles/roles.controller.ts | 3 +- src/modules/roles/roles.service.ts | 5 +- src/modules/users/dtos/entities.ts | 7 +- src/modules/users/hierarchies.ts | 79 +++++++++++++++++ src/modules/users/users.controller.ts | 63 ++++++++++++-- src/modules/users/users.service.ts | 86 ++++++++++--------- src/utils/languages.enum.ts | 4 + 12 files changed, 205 insertions(+), 71 deletions(-) create mode 100644 src/modules/users/hierarchies.ts create mode 100644 src/utils/languages.enum.ts diff --git a/package-lock.json b/package-lock.json index 9fbf918..44ae9a9 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.2", - "protospack-v2": "3.6.3", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,10 @@ } }, "node_modules/protospack-v2": { - "version": "3.6.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.3.tgz", - "integrity": "sha512-eGkVCzWs35jWdr3thF/V8d04gaDzO8LfiRpIQZTahW+vGNAMSs/zmVnXpxsSOmabkHJHvtbqHMydt30KpE5hGQ==", + "version": "0.0.0", + "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-DEWNteY3ztkho0UH1UtuMmkDyFxSYktgvU+zD5JIgzBr8alQCJ3KfwHWaO0lwC7j+xsniscfv6QsIu6TE51f9g==", + "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17246,8 @@ } }, "protospack-v2": { - "version": "3.6.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.6.3.tgz", - "integrity": "sha512-eGkVCzWs35jWdr3thF/V8d04gaDzO8LfiRpIQZTahW+vGNAMSs/zmVnXpxsSOmabkHJHvtbqHMydt30KpE5hGQ==", + "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-DEWNteY3ztkho0UH1UtuMmkDyFxSYktgvU+zD5JIgzBr8alQCJ3KfwHWaO0lwC7j+xsniscfv6QsIu6TE51f9g==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 801720d..51f2316 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.2", - "protospack-v2": "3.6.3", + "protospack-v2": "3.7.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 3af7776..cc7d4be 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -1,13 +1,9 @@ import { Logger } from '@nestjs/common'; import assert from 'assert'; +import { LanguageEnum } from 'src/utils/languages.enum'; const logger = new Logger(); -export enum LanguageEnum { - ptbr = 'pt-br', - enus = 'en-us', -} - export enum PermissionUsages { PUBLIC = 'public', INTERNAL = 'internal', @@ -446,7 +442,6 @@ export const PERMISSIONS = { }, }, }; -export type PermissionsObject = typeof PERMISSIONS; // traverses the object searching for duplicate seqids or claims (executes at runtime) let nextAvailableSeqid = 0; diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index 83c71eb..4b32ec0 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -6,11 +6,11 @@ import { RequireAllPermissions, } from 'src/authentication/authentication.decorator'; import { - LanguageEnum, PERMISSIONS, 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'; import { PermissionsService } from './permissions.service'; @@ -39,7 +39,7 @@ export class PermissionsController { @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) getPublicPermissions( @User() user: RequestUser, - @Headers('dadosfera-lang') language: LanguageEnum, + @Headers('dadosfera-lang') language, ) { this.logger.info('getPublicPermissions', { user }); const permissionGroups = this.permissionsService.getPermissionsGrouped( diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index 1344299..ed8f5e6 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -16,10 +16,10 @@ import { PermissionUsages, PermissionsObjectGroup, PermissionsObjectPermissionTranslated, - LanguageEnum, } from '../../authentication/permissions.enum'; import ErrorBuilder from '../../utils/ErrorBuilder'; import { PermissionGroupPermission, PermissionGroup } from './dto/entities'; +import { LanguageEnum } from 'src/utils/languages.enum'; @Injectable() export class PermissionsService diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 651ea0d..a8f6562 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -39,11 +39,12 @@ import { SetRoleUsersReq, } from './dto/entities'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; -import { LanguageEnum, PERMISSIONS } from 'src/authentication/permissions.enum'; +import { PERMISSIONS } from 'src/authentication/permissions.enum'; import { Authenticated, RequireAllPermissions, } from 'src/authentication/authentication.decorator'; +import { LanguageEnum } from 'src/utils/languages.enum'; @ApiTags('Roles') @ApiHeader({ diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 6925715..6d204e7 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -15,8 +15,8 @@ import { DadosferaLogger } from 'dadosfera-logs'; import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; -import { LanguageEnum } from 'src/authentication/permissions.enum'; -import { Role, UserRole } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; +import { UserRole } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; +import { LanguageEnum } from 'src/utils/languages.enum'; @Injectable() export class RolesService { @@ -32,6 +32,7 @@ export class RolesService { this.logger = dadosferaLogger.logger; } setLanguage(lang: LanguageEnum = LanguageEnum.ptbr) { + if (Object.values(LanguageEnum).includes(lang)) this.language = lang; this.language = lang; } diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 2d778bc..2490fa9 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -1,8 +1,9 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; import { UserRole } from 'src/modules/roles/dto/entities'; + export class Hierarchy { @ApiProperty() - id: number; + id: string; @ApiProperty() name: string; } @@ -68,7 +69,7 @@ export class CreateUserReq { @ApiPropertyOptional() department?: string; @ApiPropertyOptional() - hierarchy?: number; + hierarchy?: string; } export class CreateUserRes { @ApiProperty() @@ -93,7 +94,7 @@ export class UpdateUserReq { @ApiPropertyOptional() department?: string; @ApiPropertyOptional() - hierarchy?: number; + hierarchy?: string; @ApiPropertyOptional() roleNames?: string[]; } diff --git a/src/modules/users/hierarchies.ts b/src/modules/users/hierarchies.ts new file mode 100644 index 0000000..9f942dd --- /dev/null +++ b/src/modules/users/hierarchies.ts @@ -0,0 +1,79 @@ +import { LanguageEnum } from 'src/utils/languages.enum'; + +interface InternalHierarchyType { + name: Record; +} +export const HIERARCHIES: Record = { + presidence: { + name: { + 'pt-br': 'Presidência', + 'en-us': 'Presidence', + }, + }, + directory: { + name: { + 'pt-br': 'Diretoria', + 'en-us': 'Directory', + }, + }, + management: { + name: { + 'pt-br': 'Gerência', + 'en-us': 'Management', + }, + }, + specialist: { + name: { + 'pt-br': 'Especialista', + 'en-us': 'Specialist', + }, + }, + supervisor: { + name: { + 'pt-br': 'Coordenador ou Supervisor', + 'en-us': 'Supervisor', + }, + }, + trainee: { + name: { + 'pt-br': 'Trainee', + 'en-us': 'Trainee', + }, + }, + 'senior-analyst': { + name: { + 'pt-br': 'Analista Sênior', + 'en-us': 'Senior Analyst', + }, + }, + 'midlevel-analyst': { + name: { + 'pt-br': 'Analista Pleno', + 'en-us': 'Mid-level Analyst', + }, + }, + 'junior-analyst': { + name: { + 'pt-br': 'Analista Júnior', + 'en-us': 'Junior Analyst', + }, + }, + intern: { + name: { + 'pt-br': 'Estagiário', + 'en-us': 'Intern', + }, + }, + 'youth-apprentice': { + name: { + 'pt-br': 'Jovem aprendiz', + 'en-us': 'Youth Apprentice', + }, + }, + other: { + name: { + 'pt-br': 'Outro', + 'en-us': 'Other', + }, + }, +}; diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 3365fc9..f34a82b 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -3,6 +3,7 @@ import { Controller, Delete, Get, + Headers, Inject, Param, Patch, @@ -11,12 +12,18 @@ import { Req, UseFilters, } from '@nestjs/common'; -import { ApiCreatedResponse, ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { + ApiCreatedResponse, + ApiHeader, + ApiOkResponse, + ApiTags, +} from '@nestjs/swagger'; import { DadosferaLogger } from 'dadosfera-logs'; import { RequireAllPermissions } from 'src/authentication/authentication.decorator'; import { PERMISSIONS } from 'src/authentication/permissions.enum'; import { RequestUser, User } from 'src/authentication/user.decorator'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; +import { LanguageEnum } from 'src/utils/languages.enum'; import { AssignRoleToUserReq, BatchCreateUserReq, @@ -38,6 +45,12 @@ import { UsersService } from './users.service'; // TODO GET de hierarquias e do PATCH em usuário @ApiTags('Users') @Controller('users') +@ApiHeader({ + name: 'dadosfera-lang', + enum: LanguageEnum, + required: false, + description: 'Defaults to pt-br', +}) @UseFilters(GrpcToHttpExceptionFilter) export class UsersController { logger: any; @@ -56,16 +69,24 @@ export class UsersController { type: GetAllUsersByCustomerIdRes, description: 'List of users of a customer', }) - async getAllUsersByCustomerId(@User() user: RequestUser) { + async getAllUsersByCustomerId( + @User() user: RequestUser, + @Headers('dadosfera-lang') language, + ) { this.logger.info('getAllUsersByCustomerId', { user }); + this.userService.setLanguage(language); return await this.userService.findAllUsersByCustomerId(user.customer_id); } @Get('hierarchies') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: GetAllHierarchiesRes }) - async getAllHierarchies(@User() user: RequestUser) { + async getAllHierarchies( + @User() user: RequestUser, + @Headers('dadosfera-lang') language, + ) { this.logger.info('getAllHierarchies', { user }); + this.userService.setLanguage(language); return await this.userService.getAllHierarchies(); } @@ -74,16 +95,26 @@ export class UsersController { @ApiOkResponse({ type: UserByCustomer, }) - async findOneById(@User() user: RequestUser, @Param('id') id: string) { + async findOneById( + @User() user: RequestUser, + @Param('id') id: string, + @Headers('dadosfera-lang') language, + ) { this.logger.info('findOneById', { user }); + this.userService.setLanguage(language); return await this.userService.findOneById(id); } @Post() @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiCreatedResponse({ type: CreateUserRes }) - async createUser(@User() user: RequestUser, @Body() body: CreateUserReq) { + async createUser( + @User() user: RequestUser, + @Body() body: CreateUserReq, + @Headers('dadosfera-lang') language, + ) { this.logger.info('createUser', { user }); + this.userService.setLanguage(language); return await this.userService.createUser(body); } @@ -93,24 +124,36 @@ export class UsersController { async batchCreateUser( @User() user: RequestUser, @Body() body: BatchCreateUserReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('batchCreateUser', { user }); + this.userService.setLanguage(language); return await this.userService.batchCreateUser(body); } @Delete(':id') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: DeleteUserRes }) - async deleteUser(@User() user: RequestUser, @Param('id') id: string) { + async deleteUser( + @User() user: RequestUser, + @Param('id') id: string, + @Headers('dadosfera-lang') language, + ) { this.logger.info('deleteUser', { user }); + this.userService.setLanguage(language); return await this.userService.deleteUser({ id }); } @Patch('roles') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: SetUserRolesRes }) - async setUserRoles(@User() user: RequestUser, @Body() body: SetUserRolesReq) { + async setUserRoles( + @User() user: RequestUser, + @Body() body: SetUserRolesReq, + @Headers('dadosfera-lang') language, + ) { this.logger.info('createUser', { user }); + this.userService.setLanguage(language); return await this.userService.setRoles(body, user.customer_id); } @@ -119,8 +162,10 @@ export class UsersController { async assignRoleToUser( @User() user: RequestUser, @Body() body: AssignRoleToUserReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('assignRoleToUser', { user }); + this.userService.setLanguage(language); return await this.userService.assignRoleToUser(body); } @@ -129,8 +174,10 @@ export class UsersController { async unassignRoleToUser( @User() user: RequestUser, @Req() request: UnassignRoleToUserReq, + @Headers('dadosfera-lang') language, ) { this.logger.info('unassignRoleToUser', { user }); + this.userService.setLanguage(language); return await this.userService.unassignRoleToUser(request); } @@ -141,8 +188,10 @@ export class UsersController { @User() user: RequestUser, @Body() body: UpdateUserReq, @Param('id') id: string, + @Headers('dadosfera-lang') language, ) { this.logger.info('updateUser', { user }); + this.userService.setLanguage(language); return await this.userService.updateUser(body, id, user.customer_id); } } diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index eb8600a..c6f71a3 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -14,14 +14,20 @@ import { lastValueFrom } from 'rxjs'; import { BatchCreateUserReq, CreateUserReq, + Hierarchy, SetUserRolesReq, UpdateUserReq, + User, } from './dtos/entities'; import { RolesService } from '../roles/roles.service'; +import { HIERARCHIES } from './hierarchies'; +import { LanguageEnum } from 'src/utils/languages.enum'; +import { UserByCustomer } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; @Injectable() export class UsersService implements OnModuleInit { logger: any; + language: LanguageEnum = LanguageEnum.ptbr; private usersClientService: UsersProtoService; constructor( @@ -39,14 +45,16 @@ export class UsersService implements OnModuleInit { ); } + setLanguage(l: LanguageEnum = LanguageEnum.ptbr) { + if (Object.values(LanguageEnum).includes(l)) this.language = l; + this.rolesService.setLanguage(l); + } + async findAllUsersByCustomerId(customerId: string) { const { users } = await lastValueFrom( this.usersClientService.UserFindAllByCustomerId({ customerId }), ); - users?.forEach((u) => { - const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); - u.roles = roles; - }); + this.adjustUsersPayload(users); return { users }; } @@ -54,12 +62,7 @@ export class UsersService implements OnModuleInit { const { user } = await lastValueFrom( this.usersClientService.UserFindOneById({ id }), ); - if (user) { - const roles: any[] = this.rolesService.getRolesPermissionsName( - user.roles, - ); - user.roles = roles; - } + this.adjustUsersPayload([user]); return { user }; } @@ -76,12 +79,7 @@ export class UsersService implements OnModuleInit { roleNames, }), ); - if (user) { - const roles: any[] = this.rolesService.getRolesPermissionsName( - user.roles, - ); - user.roles = roles; - } + this.adjustUsersPayload([user]); return { user }; } @@ -100,12 +98,7 @@ export class UsersService implements OnModuleInit { jobTitle, }), ); - if (user) { - const roles: any[] = this.rolesService.getRolesPermissionsName( - user.roles, - ); - user.roles = roles; - } + this.adjustUsersPayload([user]); return { user }; } @@ -121,31 +114,27 @@ export class UsersService implements OnModuleInit { customerId, }), ); - if (user) { - const roles: any[] = this.rolesService.getRolesPermissionsName( - user.roles, - ); - user.roles = roles; - } + this.adjustUsersPayload([user]); return { user }; } async batchCreateUser({ users }: BatchCreateUserReq) { - const usersToCreate: UserCreateRequest[] = users.map((u) => ({ - ...u, - roleIds: [], - roleNames: u.roleNames, - name: u.name || '', - hierarchy: u.hierarchy || null, - })); + const usersToCreate: UserCreateRequest[] = users.map( + ({ roleNames, email, department, hierarchy, jobTitle, name }) => ({ + roleNames, + email, + department, + hierarchy, + jobTitle, + name, + roleIds: [], + }), + ); const { errorUsers, usersCreated } = await lastValueFrom( this.usersClientService.UserBatchCreate({ users: usersToCreate, }), ); - usersCreated?.forEach((u) => { - const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); - u.roles = roles; - }); + this.adjustUsersPayload(usersCreated); return { errorUsers, usersCreated }; } async assignRoleToUser(body: AssignRoleToUserRequest) { @@ -159,7 +148,22 @@ export class UsersService implements OnModuleInit { async deleteUser(id: IdRequest) { return lastValueFrom(this.usersClientService.UserRemove(id)); } - async getAllHierarchies() { - return lastValueFrom(this.usersClientService.UserFindAllHierarchies({})); + + getAllHierarchies(): Hierarchy[] { + return Object.keys(HIERARCHIES).map((key) => ({ + id: key, + name: HIERARCHIES[key]?.name[this.language] || key, + })); + } + + adjustUsersPayload(users: UserByCustomer[]) { + users?.forEach((u) => { + if (!u) return; + const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); + u.roles = roles; + u.hierarchy = + HIERARCHIES[u.hierarchy]?.name[this.language] || u.hierarchy; + }); + return users; } } diff --git a/src/utils/languages.enum.ts b/src/utils/languages.enum.ts new file mode 100644 index 0000000..1fb3bc1 --- /dev/null +++ b/src/utils/languages.enum.ts @@ -0,0 +1,4 @@ +export enum LanguageEnum { + ptbr = 'pt-br', + enus = 'en-us', +} From 04284e1febe876c8ea4ffad03a835f3977728f6a Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Wed, 20 Jul 2022 15:18:14 -0300 Subject: [PATCH 34/47] FIX: changing hierarchy strategy --- src/modules/users/users.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index c6f71a3..e19ba54 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -17,7 +17,6 @@ import { Hierarchy, SetUserRolesReq, UpdateUserReq, - User, } from './dtos/entities'; import { RolesService } from '../roles/roles.service'; import { HIERARCHIES } from './hierarchies'; From 0fa4dcb9335b9fa955dc4bacddea84eea148ed77 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Wed, 20 Jul 2022 15:37:01 -0300 Subject: [PATCH 35/47] new protospack version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44ae9a9..bf8c15f 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.2", - "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "protospack-v2": "3.8.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-DEWNteY3ztkho0UH1UtuMmkDyFxSYktgvU+zD5JIgzBr8alQCJ3KfwHWaO0lwC7j+xsniscfv6QsIu6TE51f9g==", - "license": "ISC", + "version": "3.8.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.0.tgz", + "integrity": "sha512-hQ6OUPOIKvkB4tYU5hzJFuNrtTKAzmcxmCDudGWUNTsdiophDB02Q8x/9g7Rm8QqkFBqoEIVvYkkWadGwIMjNA==", "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-DEWNteY3ztkho0UH1UtuMmkDyFxSYktgvU+zD5JIgzBr8alQCJ3KfwHWaO0lwC7j+xsniscfv6QsIu6TE51f9g==", + "version": "3.8.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.0.tgz", + "integrity": "sha512-hQ6OUPOIKvkB4tYU5hzJFuNrtTKAzmcxmCDudGWUNTsdiophDB02Q8x/9g7Rm8QqkFBqoEIVvYkkWadGwIMjNA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 51f2316..b9f492e 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.2", - "protospack-v2": "3.7.1", + "protospack-v2": "3.8.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", From 67706c5fc3a36da3d7653fc408a19b2ae8afabcb Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Wed, 20 Jul 2022 16:58:53 -0300 Subject: [PATCH 36/47] FIX: returning hierarchies the right way --- src/modules/users/users.controller.ts | 2 +- src/modules/users/users.service.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index f34a82b..d3d541c 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -84,7 +84,7 @@ export class UsersController { async getAllHierarchies( @User() user: RequestUser, @Headers('dadosfera-lang') language, - ) { + ): Promise { this.logger.info('getAllHierarchies', { user }); this.userService.setLanguage(language); return await this.userService.getAllHierarchies(); diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index e19ba54..6b05532 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -148,11 +148,12 @@ export class UsersService implements OnModuleInit { return lastValueFrom(this.usersClientService.UserRemove(id)); } - getAllHierarchies(): Hierarchy[] { - return Object.keys(HIERARCHIES).map((key) => ({ + getAllHierarchies(): { hierarchies: Hierarchy[] } { + const hierarchies = Object.keys(HIERARCHIES).map((key) => ({ id: key, name: HIERARCHIES[key]?.name[this.language] || key, })); + return { hierarchies }; } adjustUsersPayload(users: UserByCustomer[]) { From b04a38bcc01052de22b6ed66085f019a267027bc Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 22 Jul 2022 08:45:58 -0300 Subject: [PATCH 37/47] FIX: get departments and jobTitles --- package-lock.json | 14 +++++++------- package.json | 2 +- src/modules/users/dtos/entities.ts | 18 ++++++++++++----- src/modules/users/users.controller.ts | 28 ++++++++++++++++++++++++++- src/modules/users/users.service.ts | 24 ++++++++++++++++++++++- 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf8c15f..0514492 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.2", - "protospack-v2": "3.8.0", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,10 @@ } }, "node_modules/protospack-v2": { - "version": "3.8.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.0.tgz", - "integrity": "sha512-hQ6OUPOIKvkB4tYU5hzJFuNrtTKAzmcxmCDudGWUNTsdiophDB02Q8x/9g7Rm8QqkFBqoEIVvYkkWadGwIMjNA==", + "version": "0.0.0", + "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-vLg0JzxPz06NxbGAoFu41FfC3Pe8r4UVeybMM4aMvzeUB8QKMbMDLSiAnWXTrbJ9qqGOi3fa7dm9ZWgd+HgCxA==", + "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17246,8 @@ } }, "protospack-v2": { - "version": "3.8.0", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.0.tgz", - "integrity": "sha512-hQ6OUPOIKvkB4tYU5hzJFuNrtTKAzmcxmCDudGWUNTsdiophDB02Q8x/9g7Rm8QqkFBqoEIVvYkkWadGwIMjNA==", + "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "integrity": "sha512-vLg0JzxPz06NxbGAoFu41FfC3Pe8r4UVeybMM4aMvzeUB8QKMbMDLSiAnWXTrbJ9qqGOi3fa7dm9ZWgd+HgCxA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index b9f492e..e20fba2 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.2", - "protospack-v2": "3.8.0", + "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index 2490fa9..e84a09c 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -103,14 +103,13 @@ export class UpdateUserRes { @ApiProperty() user: UserByCustomer; } - -export class GetAllUsersByCustomerIdReq { - @ApiPropertyOptional() - s?: string; -} export class GetAllUsersByCustomerIdRes { @ApiProperty({ type: [UserByCustomer] }) users: UserByCustomer[]; + @ApiProperty() + departments: string[]; + @ApiProperty() + jobTitles: string[]; } export class AssignRoleToUserReq { @@ -153,3 +152,12 @@ export class GetAllHierarchiesRes { @ApiProperty({ type: [Hierarchy] }) hierarchies: Hierarchy[]; } + +export class GetAllJobTitlesRes { + @ApiProperty() + jobTitles: string[]; +} +export class GetAllDepartmentsRes { + @ApiProperty() + departments: string[]; +} diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index d3d541c..e4b512f 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -31,7 +31,9 @@ import { CreateUserReq, CreateUserRes, DeleteUserRes, + GetAllDepartmentsRes, GetAllHierarchiesRes, + GetAllJobTitlesRes, GetAllUsersByCustomerIdRes, SetUserRolesReq, SetUserRolesRes, @@ -72,7 +74,7 @@ export class UsersController { async getAllUsersByCustomerId( @User() user: RequestUser, @Headers('dadosfera-lang') language, - ) { + ): Promise { this.logger.info('getAllUsersByCustomerId', { user }); this.userService.setLanguage(language); return await this.userService.findAllUsersByCustomerId(user.customer_id); @@ -90,6 +92,30 @@ export class UsersController { return await this.userService.getAllHierarchies(); } + @Get('departments') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ type: GetAllDepartmentsRes }) + async getAllDepartments( + @User() user: RequestUser, + @Headers('dadosfera-lang') language, + ): Promise { + this.logger.info('getAllHierarchies', { user }); + this.userService.setLanguage(language); + return await this.userService.getAllDepartments(user.customer_id); + } + + @Get('jobTitles') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @ApiOkResponse({ type: GetAllDepartmentsRes }) + async getAllJobTitles( + @User() user: RequestUser, + @Headers('dadosfera-lang') language, + ): Promise { + this.logger.info('getAllHierarchies', { user }); + this.userService.setLanguage(language); + return await this.userService.getAllJobTitles(user.customer_id); + } + @Get(':id') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 6b05532..7b9cc5d 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -54,7 +54,17 @@ export class UsersService implements OnModuleInit { this.usersClientService.UserFindAllByCustomerId({ customerId }), ); this.adjustUsersPayload(users); - return { users }; + const dintinctDepartments = [...new Set(users.map((u) => u.department))] + .filter((value) => value != null) + .sort(); + const dintinctJobTitles = [...new Set(users.map((u) => u.jobTitle))] + .filter((value) => value != null) + .sort(); + return { + users, + jobTitles: dintinctJobTitles, + departments: dintinctDepartments, + }; } async findOneById(id: string) { @@ -156,6 +166,18 @@ export class UsersService implements OnModuleInit { return { hierarchies }; } + async getAllDepartments(customerId?: string) { + return lastValueFrom( + this.usersClientService.FindDistinctDepartments({ customerId }), + ); + } + + async getAllJobTitles(customerId?: string) { + return lastValueFrom( + this.usersClientService.FindDistinctJobTitles({ customerId }), + ); + } + adjustUsersPayload(users: UserByCustomer[]) { users?.forEach((u) => { if (!u) return; From a24abed9edbff9d0220d97c6d6337304dff1853f Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 22 Jul 2022 08:53:27 -0300 Subject: [PATCH 38/47] updated protospack version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0514492..321e396 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.2", - "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "protospack-v2": "3.8.12", "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-vLg0JzxPz06NxbGAoFu41FfC3Pe8r4UVeybMM4aMvzeUB8QKMbMDLSiAnWXTrbJ9qqGOi3fa7dm9ZWgd+HgCxA==", - "license": "ISC", + "version": "3.8.12", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.12.tgz", + "integrity": "sha512-1RnKwuJ7xs/EA3+ptqbTuOUJZ21S6lVO2u5FIy0pPtOsmaWWIJbD86PcdYprQ10RX5C9mUS2Bethkwj7lWOeWA==", "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-vLg0JzxPz06NxbGAoFu41FfC3Pe8r4UVeybMM4aMvzeUB8QKMbMDLSiAnWXTrbJ9qqGOi3fa7dm9ZWgd+HgCxA==", + "version": "3.8.12", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.12.tgz", + "integrity": "sha512-1RnKwuJ7xs/EA3+ptqbTuOUJZ21S6lVO2u5FIy0pPtOsmaWWIJbD86PcdYprQ10RX5C9mUS2Bethkwj7lWOeWA==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index e20fba2..a6d3da6 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.2", - "protospack-v2": "file:../protospack-v2/protospack-v2-0.0.0.tgz", + "protospack-v2": "3.8.12", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", From 9f900882cb1061ddd6d04d486179e15292514801 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 25 Jul 2022 10:09:18 -0300 Subject: [PATCH 39/47] FIX: sending customerId on updateUser --- src/modules/users/users.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 7b9cc5d..c544891 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -100,7 +100,7 @@ export class UsersService implements OnModuleInit { const { user } = await lastValueFrom( this.usersClientService.UserUpdate({ name, - customerId: undefined, + customerId, id, department, hierarchy, From b0ccb39f2c7918b6763f7c80d5e0d303b11b90d1 Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Wed, 27 Jul 2022 12:46:20 -0300 Subject: [PATCH 40/47] FIX: adding error message on each failed user (BatchCreateUserRes) --- src/modules/users/dtos/entities.ts | 12 ++++++++++-- src/modules/users/users.service.ts | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index e84a09c..d20aa1b 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -79,11 +79,19 @@ export class BatchCreateUserReq { @ApiProperty({ type: [CreateUserReq] }) users: CreateUserReq[]; } + +class ErrorUsers { + @ApiProperty({ type: [CreateUserReq] }) + user: CreateUserReq; + @ApiProperty() + error: string; +} + export class BatchCreateUserRes { @ApiProperty({ type: [User] }) usersCreated: User[]; - @ApiProperty({ type: [CreateUserReq] }) - errorUsers: CreateUserReq[]; + @ApiProperty({ type: [ErrorUsers] }) + errorUsers: ErrorUsers[]; } export class UpdateUserReq { diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index c544891..664e252 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -22,6 +22,7 @@ import { RolesService } from '../roles/roles.service'; import { HIERARCHIES } from './hierarchies'; import { LanguageEnum } from 'src/utils/languages.enum'; import { UserByCustomer } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; +import { EnrichErrorCode } from 'src/utils/ErrorBuilder'; @Injectable() export class UsersService implements OnModuleInit { @@ -144,7 +145,15 @@ export class UsersService implements OnModuleInit { }), ); this.adjustUsersPayload(usersCreated); - return { errorUsers, usersCreated }; + + return { + usersCreated, + // mapping error code to message + errorUsers: errorUsers.map(({ user, error }) => ({ + user, + error: EnrichErrorCode(error).message, + })), + }; } async assignRoleToUser(body: AssignRoleToUserRequest) { return lastValueFrom(this.usersClientService.AssignRoleToUser(body)); From f43c270c3339f5184853d16de15a25e49b29c1bd Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Wed, 27 Jul 2022 12:51:07 -0300 Subject: [PATCH 41/47] CHORE: protospack-v2 pre-release --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 321e396..0200622 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.2", - "protospack-v2": "3.8.12", + "protospack-v2": "3.9.0-beta.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.8.12", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.12.tgz", - "integrity": "sha512-1RnKwuJ7xs/EA3+ptqbTuOUJZ21S6lVO2u5FIy0pPtOsmaWWIJbD86PcdYprQ10RX5C9mUS2Bethkwj7lWOeWA==", + "version": "3.9.0-beta.5", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.5.tgz", + "integrity": "sha512-rCoG+vWL2EF8r7nmvpdMKL3b2h98wDXaeXgBVK+BH0Lh+M3qwUfRpgt7FFQwk8zajfLOaPo6GZu4zOu+TCq0Eg==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.8.12", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.8.12.tgz", - "integrity": "sha512-1RnKwuJ7xs/EA3+ptqbTuOUJZ21S6lVO2u5FIy0pPtOsmaWWIJbD86PcdYprQ10RX5C9mUS2Bethkwj7lWOeWA==", + "version": "3.9.0-beta.5", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.5.tgz", + "integrity": "sha512-rCoG+vWL2EF8r7nmvpdMKL3b2h98wDXaeXgBVK+BH0Lh+M3qwUfRpgt7FFQwk8zajfLOaPo6GZu4zOu+TCq0Eg==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index a6d3da6..fb87c9d 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.2", - "protospack-v2": "3.8.12", + "protospack-v2": "3.9.0-beta.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", From 9c6d2b499a4adb6da298d944cb43fc7c7acbb526 Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Wed, 27 Jul 2022 18:15:07 -0300 Subject: [PATCH 42/47] FEAT: resend invite --- package-lock.json | 14 +++++++------- package.json | 2 +- src/modules/users/users.controller.ts | 15 +++++++++++++++ src/modules/users/users.service.ts | 6 ++++++ 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0200622..741dc3a 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.2", - "protospack-v2": "3.9.0-beta.5", + "protospack-v2": "3.9.0-beta.7", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.9.0-beta.5", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.5.tgz", - "integrity": "sha512-rCoG+vWL2EF8r7nmvpdMKL3b2h98wDXaeXgBVK+BH0Lh+M3qwUfRpgt7FFQwk8zajfLOaPo6GZu4zOu+TCq0Eg==", + "version": "3.9.0-beta.7", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.7.tgz", + "integrity": "sha512-QZqFz0Kc5pgcHOhNs4O6JG2kMZKDvY+7RwEdniRfb75ZSy/7BRJXLJUzB7Kjj1poIUM12n+gUg3kj3n00Gwegg==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.9.0-beta.5", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.5.tgz", - "integrity": "sha512-rCoG+vWL2EF8r7nmvpdMKL3b2h98wDXaeXgBVK+BH0Lh+M3qwUfRpgt7FFQwk8zajfLOaPo6GZu4zOu+TCq0Eg==", + "version": "3.9.0-beta.7", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.7.tgz", + "integrity": "sha512-QZqFz0Kc5pgcHOhNs4O6JG2kMZKDvY+7RwEdniRfb75ZSy/7BRJXLJUzB7Kjj1poIUM12n+gUg3kj3n00Gwegg==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index fb87c9d..0cdcb15 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.2", - "protospack-v2": "3.9.0-beta.5", + "protospack-v2": "3.9.0-beta.7", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index e4b512f..6bf4764 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -4,6 +4,8 @@ import { Delete, Get, Headers, + HttpCode, + HttpStatus, Inject, Param, Patch, @@ -157,6 +159,19 @@ export class UsersController { return await this.userService.batchCreateUser(body); } + @Post(':id') + @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) + @HttpCode(HttpStatus.OK) + async resendInvite( + @User() user: RequestUser, + @Param('id') id: string, + @Headers('dadosfera-lang') language, + ) { + this.logger.info('resendInvite', { user }); + this.userService.setLanguage(language); + return this.userService.resendInvite({ id }); + } + @Delete(':id') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @ApiOkResponse({ type: DeleteUserRes }) diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 664e252..376cd6d 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -127,6 +127,7 @@ export class UsersService implements OnModuleInit { this.adjustUsersPayload([user]); return { user }; } + async batchCreateUser({ users }: BatchCreateUserReq) { const usersToCreate: UserCreateRequest[] = users.map( ({ roleNames, email, department, hierarchy, jobTitle, name }) => ({ @@ -155,6 +156,11 @@ export class UsersService implements OnModuleInit { })), }; } + + async resendInvite(body: IdRequest) { + return lastValueFrom(this.usersClientService.UserResendInvite(body)); + } + async assignRoleToUser(body: AssignRoleToUserRequest) { return lastValueFrom(this.usersClientService.AssignRoleToUser(body)); } From 97b6047cf1e889220467a22cd5d3957362fdfabf Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Wed, 27 Jul 2022 19:20:35 -0300 Subject: [PATCH 43/47] FIX: avoiding to change user object received in adjustUsersPayload, returning modified object instead --- src/modules/users/users.service.ts | 40 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 376cd6d..0ae8852 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -54,15 +54,15 @@ export class UsersService implements OnModuleInit { const { users } = await lastValueFrom( this.usersClientService.UserFindAllByCustomerId({ customerId }), ); - this.adjustUsersPayload(users); - const dintinctDepartments = [...new Set(users.map((u) => u.department))] + const usersAdj = this.adjustUsersPayload(users); + const dintinctDepartments = [...new Set(usersAdj.map((u) => u.department))] .filter((value) => value != null) .sort(); - const dintinctJobTitles = [...new Set(users.map((u) => u.jobTitle))] + const dintinctJobTitles = [...new Set(usersAdj.map((u) => u.jobTitle))] .filter((value) => value != null) .sort(); return { - users, + users: usersAdj, jobTitles: dintinctJobTitles, departments: dintinctDepartments, }; @@ -72,8 +72,7 @@ export class UsersService implements OnModuleInit { const { user } = await lastValueFrom( this.usersClientService.UserFindOneById({ id }), ); - this.adjustUsersPayload([user]); - return { user }; + return { user: this.adjustUsersPayload([user])[0] }; } async createUser(req: CreateUserReq) { @@ -89,8 +88,7 @@ export class UsersService implements OnModuleInit { roleNames, }), ); - this.adjustUsersPayload([user]); - return { user }; + return { user: this.adjustUsersPayload([user])[0] }; } async updateUser(req: UpdateUserReq, id: string, customerId: string) { @@ -108,8 +106,7 @@ export class UsersService implements OnModuleInit { jobTitle, }), ); - this.adjustUsersPayload([user]); - return { user }; + return { user: this.adjustUsersPayload([user])[0] }; } async setRoles(body: SetUserRolesReq, customerId: string) { @@ -124,8 +121,8 @@ export class UsersService implements OnModuleInit { customerId, }), ); - this.adjustUsersPayload([user]); - return { user }; + + return { user: this.adjustUsersPayload([user])[0] }; } async batchCreateUser({ users }: BatchCreateUserReq) { @@ -145,10 +142,9 @@ export class UsersService implements OnModuleInit { users: usersToCreate, }), ); - this.adjustUsersPayload(usersCreated); return { - usersCreated, + usersCreated: this.adjustUsersPayload(usersCreated), // mapping error code to message errorUsers: errorUsers.map(({ user, error }) => ({ user, @@ -193,14 +189,14 @@ export class UsersService implements OnModuleInit { ); } - adjustUsersPayload(users: UserByCustomer[]) { - users?.forEach((u) => { - if (!u) return; - const roles: any[] = this.rolesService.getRolesPermissionsName(u.roles); - u.roles = roles; - u.hierarchy = - HIERARCHIES[u.hierarchy]?.name[this.language] || u.hierarchy; + private adjustUsersPayload(users: UserByCustomer[]) { + return users.map((u) => { + if (!u) return undefined; + return { + ...u, + roles: this.rolesService.getRolesPermissionsName(u.roles), + hierarchy: HIERARCHIES[u.hierarchy]?.name[this.language] || u.hierarchy, + }; }); - return users; } } From e20ae71672c5c0525d148e1a180af5fa6efbb02f Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Wed, 27 Jul 2022 19:28:29 -0300 Subject: [PATCH 44/47] FIX: resend invite endpoint renamed --- src/modules/users/dtos/entities.ts | 2 +- src/modules/users/users.controller.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/users/dtos/entities.ts b/src/modules/users/dtos/entities.ts index d20aa1b..5eda738 100644 --- a/src/modules/users/dtos/entities.ts +++ b/src/modules/users/dtos/entities.ts @@ -81,7 +81,7 @@ export class BatchCreateUserReq { } class ErrorUsers { - @ApiProperty({ type: [CreateUserReq] }) + @ApiProperty() user: CreateUserReq; @ApiProperty() error: string; diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 6bf4764..a6b6e87 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -159,7 +159,7 @@ export class UsersController { return await this.userService.batchCreateUser(body); } - @Post(':id') + @Post(':id/resend-invite') @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN) @HttpCode(HttpStatus.OK) async resendInvite( From 047737eadd93f4256b47e26bd41bbaa882ad743f Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Thu, 28 Jul 2022 19:21:16 -0300 Subject: [PATCH 45/47] FIX: removing log from subscribe.complete method --- src/clients/pipelines/client.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clients/pipelines/client.service.ts b/src/clients/pipelines/client.service.ts index c197ca7..829462b 100644 --- a/src/clients/pipelines/client.service.ts +++ b/src/clients/pipelines/client.service.ts @@ -255,7 +255,7 @@ export class PipelinesClientService implements OnModuleInit { reject(err); }, complete() { - this.logger.info('Done'); + //this.logger.info('Done'); }, }); }) From ebbfe0abff7c4e1ff6c823e2c8dfd0c52026140f Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 1 Aug 2022 09:17:08 -0300 Subject: [PATCH 46/47] FIX: sending access token to role function to evaluate editing permissions --- package-lock.json | 14 +- package.json | 2 +- src/authentication/authentication.guard.ts | 1 + src/authentication/user.decorator.ts | 1 + src/modules/roles/dto/entities.ts | 2 + src/modules/roles/roles.controller.ts | 18 +- src/modules/roles/roles.service.ts | 194 ++++++++++++++------- src/utils/ErrorBuilder.ts | 8 + src/utils/errorCodes.ts | 2 + 9 files changed, 164 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 741dc3a..a63a63d 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.2", - "protospack-v2": "3.9.0-beta.7", + "protospack-v2": "3.9.6", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -9015,9 +9015,9 @@ } }, "node_modules/protospack-v2": { - "version": "3.9.0-beta.7", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.7.tgz", - "integrity": "sha512-QZqFz0Kc5pgcHOhNs4O6JG2kMZKDvY+7RwEdniRfb75ZSy/7BRJXLJUzB7Kjj1poIUM12n+gUg3kj3n00Gwegg==", + "version": "3.9.6", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.6.tgz", + "integrity": "sha512-7aSYhzxlly6GPGmCH2JsNDB3Z6rOPhmY5iK5n1Ich3WLLgsOmGAXJH2zWD9IUfjhKKwBZGvitdewpBVyCvAg0A==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -17245,9 +17245,9 @@ } }, "protospack-v2": { - "version": "3.9.0-beta.7", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.0-beta.7.tgz", - "integrity": "sha512-QZqFz0Kc5pgcHOhNs4O6JG2kMZKDvY+7RwEdniRfb75ZSy/7BRJXLJUzB7Kjj1poIUM12n+gUg3kj3n00Gwegg==", + "version": "3.9.6", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.6.tgz", + "integrity": "sha512-7aSYhzxlly6GPGmCH2JsNDB3Z6rOPhmY5iK5n1Ich3WLLgsOmGAXJH2zWD9IUfjhKKwBZGvitdewpBVyCvAg0A==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 0cdcb15..09ef57f 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.2", - "protospack-v2": "3.9.0-beta.7", + "protospack-v2": "3.9.6", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index 1de43e1..3fca4da 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -121,6 +121,7 @@ export class AuthenticationGuard customer_id: accessTokenPayload.customer_id, customer_name: accessTokenPayload.customer_name, customer_tier: accessTokenPayload.customer_tier, + access_token: accessToken, }; // TODO: for backwards compatibility. remove in the future request.body.info = { diff --git a/src/authentication/user.decorator.ts b/src/authentication/user.decorator.ts index 31041ff..cf7709b 100644 --- a/src/authentication/user.decorator.ts +++ b/src/authentication/user.decorator.ts @@ -10,6 +10,7 @@ export interface RequestUser { customer_id: string; customer_name: string; customer_tier: string; + access_token: string; } export const User: (options?: { required?: boolean }) => ParameterDecorator = diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index 275896e..5652684 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -19,6 +19,8 @@ export class RoleDto { createdAt: string; @ApiProperty() updatedAt: string; + @ApiProperty() + isPublic: boolean; @ApiProperty({ type: () => Customer }) customer?: Customer; } diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index a8f6562..98ecbbe 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -77,7 +77,7 @@ export class RolesController { ) { this.logger.info('searchRoles', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.roleSearch(filters, user.customer_id); + return await this.rolesService.roleSearch(filters, user); } @Post() @@ -90,7 +90,7 @@ export class RolesController { ) { this.logger.info('createRole', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.createRole(body, user.customer_id); + return await this.rolesService.createRole(body, user); } @Put('permissions') @@ -103,7 +103,7 @@ export class RolesController { ) { this.logger.info('grantPermissionsToRole', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.grantPermissionsToRole(body); + return await this.rolesService.grantPermissionsToRole(body, user); } @Delete('permissions') @@ -116,7 +116,7 @@ export class RolesController { ) { this.logger.info('revokePermissionsToRole', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.revokePermissionFromRole(body); + return await this.rolesService.revokePermissionFromRole(body, user); } @Patch('permissions') @@ -129,7 +129,7 @@ export class RolesController { ) { this.logger.info('setRolePermissions', { user }); this.rolesService.setLanguage(language); - return this.rolesService.setRolePermissions(body); + return this.rolesService.setRolePermissions(body, user); } @Patch('users') @@ -142,7 +142,7 @@ export class RolesController { ) { this.logger.info('setRoleUsers', { user }); this.rolesService.setLanguage(language); - return this.rolesService.setRoleUsers(body); + return this.rolesService.setRoleUsers(body, user); } @Get(':id') @@ -155,7 +155,7 @@ export class RolesController { ) { this.logger.info('getRoleById', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.getRolesById(id); + return await this.rolesService.getRolesById(id, user); } @Delete(':id') @@ -167,7 +167,7 @@ export class RolesController { ) { this.logger.info('deleteRole', { user }); this.rolesService.setLanguage(language); - return await this.rolesService.removeRole(id); + return await this.rolesService.removeRole(id, user); } @Patch(':id') @@ -181,6 +181,6 @@ export class RolesController { ) { this.logger.info('updateRole', { user }); this.rolesService.setLanguage(language); - return this.rolesService.updateRole(id, body); + return this.rolesService.updateRole(id, body, user); } } diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 6d204e7..8ed8abc 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -12,12 +12,23 @@ import { UpdateRoleReq, } from './dto/entities'; import { DadosferaLogger } from 'dadosfera-logs'; +import { Metadata } from '@grpc/grpc-js'; import { ClientGrpc } from '@nestjs/microservices'; +import { Permission } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; -import { UserRole } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; import { LanguageEnum } from 'src/utils/languages.enum'; +import { RequestUser } from 'src/authentication/user.decorator'; +interface GetRolesPermissionsName { + id: string; + name: string; + description: string; + permissions: Permission[]; + isPublic?: boolean; + createdAt: string; + updatedAt: string; +} @Injectable() export class RolesService { logger: any; @@ -41,16 +52,28 @@ export class RolesService { ProtoServices.RolesProtoService, ); } - async getRolesById(id: string) { + + async getRolesById(id: string, { access_token }: RequestUser) { + const meta = new Metadata(); + meta.add('access_token', access_token); const role = await lastValueFrom( - this.rolesClientService.RoleFindOneById({ - id, - }), + this.rolesClientService.RoleFindOneById( + { + id, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async roleSearch(filters: GetRolesByCustomerReq, customerId: string) { + + async roleSearch( + filters: GetRolesByCustomerReq, + { customer_id, access_token }: RequestUser, + ) { + const meta = new Metadata(); + meta.add('access_token', access_token); let { permissionId: permissionIds } = filters; if (permissionIds && !Array.isArray(permissionIds)) permissionIds = [permissionIds]; @@ -64,109 +87,154 @@ export class RolesService { return seqId; }) || []; const roles = await lastValueFrom( - this.rolesClientService.RoleSearch({ - customerId, - getUsers: isGetUsers, - permissionIds: [], - permissionSeqIds, - }), + this.rolesClientService.RoleSearch( + { + customerId: customer_id, + getUsers: isGetUsers, + permissionIds: [], + permissionSeqIds, + }, + meta, + ), ); const rolesTreated = this.getRolesPermissionsName(roles.roles); return { roles: rolesTreated }; } - async createRole(data: CreateRoleReq, customerId: string) { + async createRole( + data: CreateRoleReq, + { customer_id, access_token }: RequestUser, + ) { + const meta = new Metadata(); + meta.add('access_token', access_token); const { description, name, permissionIds, userIds } = data; const role = await lastValueFrom( - this.rolesClientService.RoleCreate({ - customerId, - name, - permissionIds: [], - permissionSeqIds: permissionIds, - description, - userIds, - }), + this.rolesClientService.RoleCreate( + { + customerId: customer_id, + name, + permissionIds: [], + permissionSeqIds: permissionIds, + description, + userIds, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async removeRole(id: string) { - return lastValueFrom(this.rolesClientService.RoleRemove({ id })); + async removeRole(id: string, { access_token }: RequestUser) { + const meta = new Metadata(); + meta.add('access_token', access_token); + return lastValueFrom(this.rolesClientService.RoleRemove({ id }, meta)); } - async grantPermissionsToRole({ - roleId, - permissionIds, - }: GrantPermissionsToRoleReq) { + async grantPermissionsToRole( + { roleId, permissionIds }: GrantPermissionsToRoleReq, + { access_token }: RequestUser, + ) { + const meta = new Metadata(); + meta.add('access_token', access_token); const role = await lastValueFrom( - this.rolesClientService.GrantPermissionsToRole({ - permissionIds: [], - roleId, - permissionSeqIds: permissionIds, - }), + this.rolesClientService.GrantPermissionsToRole( + { + permissionIds: [], + roleId, + permissionSeqIds: permissionIds, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async revokePermissionFromRole({ - roleId, - permissionIds, - }: RevokePermissionsFromRoleReq) { + async revokePermissionFromRole( + { roleId, permissionIds }: RevokePermissionsFromRoleReq, + { access_token }: RequestUser, + ) { + const meta = new Metadata(); + meta.add('access_token', access_token); const role = await lastValueFrom( - this.rolesClientService.RevokePermissionsFromRole({ - permissionIds: [], - roleId, - permissionSeqIds: permissionIds, - }), + this.rolesClientService.RevokePermissionsFromRole( + { + permissionIds: [], + roleId, + permissionSeqIds: permissionIds, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async updateRole(id: string, req: UpdateRoleReq) { + async updateRole( + id: string, + req: UpdateRoleReq, + { access_token }: RequestUser, + ) { + const meta = new Metadata(); + meta.add('access_token', access_token); const { description, name } = req; const role = await lastValueFrom( - this.rolesClientService.RoleUpdate({ - id, - description, - name, - }), + this.rolesClientService.RoleUpdate( + { + id, + description, + name, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async setRolePermissions(req: SetRolePermissionsReq) { + async setRolePermissions( + req: SetRolePermissionsReq, + { access_token }: RequestUser, + ) { + const meta = new Metadata(); + meta.add('access_token', access_token); const { roleId: id, permissionIds } = req; const clearPermissions = Array.isArray(permissionIds) && permissionIds.length === 0; const role = await lastValueFrom( - this.rolesClientService.RoleSetPermissions({ - id, - permissionSeqIds: permissionIds, - clearPermissions, - }), + this.rolesClientService.RoleSetPermissions( + { + id, + permissionSeqIds: permissionIds, + clearPermissions, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - async setRoleUsers(req: SetRoleUsersReq) { + async setRoleUsers(req: SetRoleUsersReq, { access_token }: RequestUser) { + const meta = new Metadata(); + meta.add('access_token', access_token); const { roleId: id, userIds } = req; const clearUsers = Array.isArray(userIds) && userIds.length === 0; const role = await lastValueFrom( - this.rolesClientService.RoleSetUsers({ - id, - userIds, - clearUsers, - }), + this.rolesClientService.RoleSetUsers( + { + id, + userIds, + clearUsers, + }, + meta, + ), ); const [roleTreated] = this.getRolesPermissionsName([role.role]); return { role: roleTreated }; } - getRolesPermissionsName(roles: UserRole[]): RoleDto[] { + getRolesPermissionsName(roles: GetRolesPermissionsName[]): RoleDto[] { const newRoles: RoleDto[] = []; for (const role of roles) { const allPermissions = this.permissionsService.getAllPermissions( @@ -180,7 +248,11 @@ export class RolesService { id: p.seqid, }; }); - const newRole: RoleDto = { ...role, permissions: newPermissions }; + const newRole: RoleDto = { + ...role, + permissions: newPermissions, + isPublic: role.isPublic, + }; newRoles.push(newRole); } return newRoles; diff --git a/src/utils/ErrorBuilder.ts b/src/utils/ErrorBuilder.ts index ec353be..e6c0eb8 100644 --- a/src/utils/ErrorBuilder.ts +++ b/src/utils/ErrorBuilder.ts @@ -136,10 +136,18 @@ export function EnrichErrorCode(code: string) { code, }; case ErrorCodes.ROLE.NOT_FOUND: + case ErrorCodes.ROLE.FROM_ANOTHER_CUSTOMER: return { statusCode: HttpStatus.NOT_FOUND, error: 'Grupo não encontrado', message: 'Grupo solicitado não encontrado', + code: ErrorCodes.ROLE.NOT_FOUND, + }; + case ErrorCodes.ROLE.CANNOT_EDIT_PUBLIC_ROLE: + return { + statusCode: HttpStatus.FORBIDDEN, + error: 'Grupo público', + message: 'Você não tem permissão para editar esse grupo', code, }; case ErrorCodes.USER.NOT_FOUND: diff --git a/src/utils/errorCodes.ts b/src/utils/errorCodes.ts index 04a9eb0..b679510 100644 --- a/src/utils/errorCodes.ts +++ b/src/utils/errorCodes.ts @@ -16,6 +16,8 @@ export const AUTH = { export const ROLE = { ALREADY_EXIST: 'ROLE.ALREADY_EXISTS', NOT_FOUND: 'ROLE.NOT_FOUND', + FROM_ANOTHER_CUSTOMER: 'ROLE.FROM_ANOTHER_CUSTOMER', + CANNOT_EDIT_PUBLIC_ROLE: 'ROLE.CANNOT_EDIT_PUBLIC_ROLE', }; export const USER = { From 32ab834834808baf45a835a3bb57923e7aa067b1 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Mon, 1 Aug 2022 13:46:27 -0300 Subject: [PATCH 47/47] FIX: fix user.decorator tests failing because of missing access_token on fakeUserPayload --- src/authentication/user.decorator.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/authentication/user.decorator.spec.ts b/src/authentication/user.decorator.spec.ts index 30d4baa..9af2ebd 100644 --- a/src/authentication/user.decorator.spec.ts +++ b/src/authentication/user.decorator.spec.ts @@ -55,6 +55,7 @@ describe('user.decorator', () => { customer_id: '9d18e8ae-24b9-41a3-9e8f-a25ce57555b11', customer_name: 'dadosfera', customer_tier: 'BASIC', + access_token: '', }; beforeAll(async () => { @@ -176,5 +177,6 @@ describe('user.decorator', () => { UserTest(null); const token = CreateToken(); + fakeUserPayload.access_token = token; UserTest(token); });