Merge branch 'ft/connection-manager' of github.com:dadosfera/maestro into ft/connection-manager

src/modules/users/users.controller.ts

@@ -11,7 +11,7 @@ import {
   Patch,
   Post,
   Put,
-  Req,
+  Query,
   UseFilters,
 } from '@nestjs/common';
 import {
@@ -172,6 +172,18 @@ export class UsersController {
     return this.userService.resendInvite({ id });
   }
 
+  @Delete('role')
+  @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
+  async unassignRoleToUser(
+    @User() user: RequestUser,
+    @Query() request: UnassignRoleToUserReq,
+    @Headers('dadosfera-lang') language,
+  ) {
+    this.logger.info('unassignRoleToUser', { user });
+    this.userService.setLanguage(language);
+    return await this.userService.unassignRoleFromUser(request);
+  }
+
   @Delete(':id')
   @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
   @ApiOkResponse({ type: DeleteUserRes })
@@ -210,18 +222,6 @@ export class UsersController {
     return await this.userService.assignRoleToUser(body);
   }
 
-  @Delete('role')
-  @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
-  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);
-  }
-
   @Patch(':id')
   @RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
   @ApiOkResponse({ type: UpdateUserRes })

src/modules/users/users.service.ts

@@ -162,7 +162,7 @@ export class UsersService implements OnModuleInit {
     return lastValueFrom(this.usersClientService.AssignRoleToUser(body));
   }
 
-  async unassignRoleToUser(body: UnassignRoleFromUserRequest) {
+  async unassignRoleFromUser(body: UnassignRoleFromUserRequest) {
     return lastValueFrom(this.usersClientService.UnassignRoleFromUser(body));
   }