diff --git a/package-lock.json b/package-lock.json index a998c49..30b02dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@aws-sdk/client-secrets-manager": "^3.414.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/protospack": "2.5.3", - "@dadosfera/protospack-v2": "3.37.0-alpha.17", + "@dadosfera/protospack-v2": "3.37.0-alpha.18", "@grpc/grpc-js": "^1.9.3", "@grpc/proto-loader": "^0.7.9", "@nestjs/cli": "^9.5.0", @@ -1397,9 +1397,9 @@ } }, "node_modules/@dadosfera/protospack-v2": { - "version": "3.37.0-alpha.17", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.17.tgz", - "integrity": "sha512-3vN5PbkmDPhtOyST2oHJaUhGImOZ2OpyoGHCikf7PfKkDiNePkvxkOcNa0KDGYL+Q9N8x2B/8ySfoEbaVBNjcQ==", + "version": "3.37.0-alpha.18", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-alpha.18.tgz", + "integrity": "sha512-hhcskw1DT9jtmJcQXrFwgUnTti6ZALZM04YevJgqQNR6yS+C6040UZf3c/6vcjRm5/9h9OMiJJApzivPTBK46g==", "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.9.3", diff --git a/package.json b/package.json index f01d6d0..ff6b236 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@aws-sdk/client-secrets-manager": "^3.414.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/protospack": "2.5.3", - "@dadosfera/protospack-v2": "3.37.0-alpha.17", + "@dadosfera/protospack-v2": "3.37.0-alpha.18", "@grpc/grpc-js": "^1.9.3", "@grpc/proto-loader": "^0.7.9", "@nestjs/cli": "^9.5.0", diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index c10d865..e327dfa 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -354,11 +354,10 @@ export class AuthController { @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN) @HttpCode(HttpStatus.OK) async blockUsers( - @Body() body: { userIds: string[] }, @Language() language: LanguageEnum, @User() user: RequestUser, ) { - this.logger.info('blockUsers - Starting request', { userIds: body.userIds }); + this.logger.info('blockUsers - Starting request'); try { const metadata = PackTheMetadata({ @@ -367,21 +366,19 @@ export class AuthController { }); this.logger.debug('Calling blockUsers service', { - userIds: body.userIds, metadata: { access_token: metadata.get('access_token'), language: metadata.get('language') } }); - const result = await this.authClient.blockUsers(body.userIds, metadata); + const result = await this.authClient.blockUsers(metadata); this.logger.info('blockUsers - Success', { result }); return result; } catch (error) { this.logger.error('blockUsers - Error', { error: error.message, - stack: error.stack, - userIds: body.userIds + stack: error.stack }); throw error; } @@ -392,7 +389,6 @@ export class AuthController { @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN) @HttpCode(HttpStatus.OK) async unblockUsers( - @Body() body: { userIds: string[] }, @Language() language: LanguageEnum, @User() user: RequestUser, ) { @@ -402,7 +398,7 @@ export class AuthController { language, }); - return this.authClient.unblockUsers(body.userIds, metadata); + return this.authClient.unblockUsers(metadata); } @ApiInternalOnlyEndpoint() @@ -410,7 +406,6 @@ export class AuthController { @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN) @HttpCode(HttpStatus.OK) async resetUsers( - @Body() body: { userIds: string[] }, @Language() language: LanguageEnum, @User() user: RequestUser, ) { @@ -420,7 +415,6 @@ export class AuthController { language, }); - const defaultPassword = 'SenhaPadrão123'; - return this.authClient.resetUsers(body.userIds, metadata, defaultPassword); + return this.authClient.resetUsers( metadata); } } diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts index 878da26..87aed6e 100644 --- a/src/modules/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -170,12 +170,11 @@ export class AuthClientService implements OnModuleInit { ); } - async blockUsers(userIds: string[], metadata: Metadata): Promise { - this.logger.info('blockUsers - Service starting', { userIds }); + async blockUsers(metadata: Metadata): Promise { + this.logger.info('blockUsers - Service starting'); try { this.logger.debug('Calling BlockUser gRPC method', { - request: { users: { userIds } }, metadata: { access_token: metadata.get('access_token'), language: metadata.get('language') @@ -183,7 +182,7 @@ export class AuthClientService implements OnModuleInit { }); const response = await lastValueFrom( - (this.authService as any).BlockUser({ users: { userIds } }, metadata), + this.authService.BlockUser({}, metadata), ); this.logger.info('blockUsers - Service success', { response }); @@ -192,25 +191,23 @@ export class AuthClientService implements OnModuleInit { this.logger.error('blockUsers - Service error', { error: error.message, stack: error.stack, - request: { users: { userIds } } }); throw error; } } - async unblockUsers(userIds: string[], metadata: Metadata): Promise { + async unblockUsers(metadata: Metadata): Promise { this.logger.info('unblockUsers'); return await lastValueFrom( - this.authService.UnblockUser({ users: { userIds } }, metadata), + this.authService.UnblockUser({}, metadata), ); } - async resetUsers(userIds: string[], metadata: Metadata, defaultPassword: string): Promise { + async resetUsers(metadata: Metadata): Promise { this.logger.info('resetUsers'); try { this.logger.debug('Calling ResetUser gRPC method', { - request: { users: { userIds }, defaultPassword }, metadata: { access_token: metadata.get('access_token'), language: metadata.get('language') @@ -218,10 +215,7 @@ export class AuthClientService implements OnModuleInit { }); const response = await lastValueFrom( - (this.authService as any).ResetUser({ - users: { userIds }, - defaultPassword - }, metadata) + this.authService.ResetUser({}, metadata) ); this.logger.info('resetUsers - Success', { response }); @@ -229,8 +223,7 @@ export class AuthClientService implements OnModuleInit { } catch (error) { this.logger.error('resetUsers - Error', { error: error.message, - stack: error.stack, - request: { users: { userIds }, defaultPassword } + stack: error.stack }); throw error; }