From 14081bb9ca9080521cbe66dbac44521d6e7adb0a Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 6 Jan 2023 15:18:49 -0300 Subject: [PATCH] FIX: send language on create users and resend invite --- docsfera.json | 2 +- src/modules/users/users.controller.ts | 26 ++++++++++++++++++-------- src/modules/users/users.service.ts | 6 ++++-- src/utils/ PackTheMetadata.ts | 1 + 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/docsfera.json b/docsfera.json index 0f4a23e..40c7c23 100644 --- a/docsfera.json +++ b/docsfera.json @@ -3339,7 +3339,7 @@ } }, "info": { - "title": "Maestro - feat/update-connection", + "title": "Maestro - main", "description": "Documentation for Maestro gateway", "version": "1.0.0", "contact": {} diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 336d8f0..8a0c17e 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -48,9 +48,9 @@ import { IUserByCustomer, } from './dtos/entities'; import { UsersService } from './users.service'; -import { Metadata } from '@grpc/grpc-js'; import ErrorBuilder from 'src/utils/ErrorBuilder'; import ErrorCodes from 'src/utils/errorCodes'; +import { PackTheMetadata } from 'src/utils/ PackTheMetadata'; @ApiTags('Users') @Controller('users') @@ -149,12 +149,14 @@ export class UsersController { @Body() body: CreateUserReq, @Headers('dadosfera-lang') language, ) { - const meta = new Metadata(); - meta.add('access_token', user.access_token); + const metadata = PackTheMetadata({ + access_token: user.access_token, + language, + }); this.logger.info('createUser', { user }); this.userService.setLanguage(language); - return await this.userService.createUser(body, meta); + return await this.userService.createUser(body, metadata); } @Post('batch') @@ -165,11 +167,15 @@ export class UsersController { @Body() body: BatchCreateUserReq, @Headers('dadosfera-lang') language, ) { - const meta = new Metadata(); - meta.add('access_token', user.access_token); this.logger.info('batchCreateUser', { user }); this.userService.setLanguage(language); - return await this.userService.batchCreateUser(body, meta); + + const metadata = PackTheMetadata({ + access_token: user.access_token, + language, + }); + + return await this.userService.batchCreateUser(body, metadata); } @Post(':id/resend-invite') @@ -182,7 +188,11 @@ export class UsersController { ) { this.logger.info('resendInvite', { user }); this.userService.setLanguage(language); - return this.userService.resendInvite({ id }); + + const metadata = PackTheMetadata({ + language, + }); + return this.userService.resendInvite({ id }, metadata); } @Delete('role') diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index f181de1..e6717fa 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -185,8 +185,10 @@ export class UsersService implements OnModuleInit { }; } - async resendInvite(body: IdRequest) { - return lastValueFrom(this.usersClientService.UserResendInvite(body)); + async resendInvite(body: IdRequest, metadata: Metadata) { + return lastValueFrom( + this.usersClientService.UserResendInvite(body, metadata), + ); } async assignRoleToUser(body: AssignRoleToUserRequest) { diff --git a/src/utils/ PackTheMetadata.ts b/src/utils/ PackTheMetadata.ts index a6aaddc..23556ea 100644 --- a/src/utils/ PackTheMetadata.ts +++ b/src/utils/ PackTheMetadata.ts @@ -10,6 +10,7 @@ interface IMetadata { sensitive?: string; roles?: string[]; is_data_manager?: boolean; + access_token?: string; } export function PackTheMetadata(info: IMetadata): Metadata {