Merge pull request #155 from dadosfera/fix/user-permissions

FIX: permissions array on user findOneById

src/modules/catalog/catalog.service.ts

@@ -407,7 +407,7 @@ class CatalogService implements OnModuleInit {
   }
 
   async createDataDescription(body, metadata) {
-    const response = await lastValueFrom(
+    await lastValueFrom(
       this.catalogWriteService.UpdateDataAsset(
         {
           id: `dataset-${body.table_id}`,

src/modules/oauth/oauth.controller.ts

@@ -5,7 +5,6 @@ import { ConnectionClientService } from '../connection/client.service';
 import jwt from 'jsonwebtoken';
 import DadosferaLogger from '@dadosfera/dadosfera-logs/dist';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
-import { Authenticated } from 'src/authentication/authentication.decorator';
 @ApiTags('oauth')
 @Controller('oauth')
 export class OauthController {

src/modules/users/dtos/entities.ts

@@ -55,7 +55,10 @@ export class UserNoRoles extends OmitType(User, ['roles']) {}
 export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [
   'customer',
 ]) {}
-export class UserByCustomer extends OmitType(User, ['customer']) {}
+export class IUserByCustomer extends OmitType(User, ['customer']) {
+  @ApiPropertyOptional()
+  permissions?: string[];
+}
 
 export class CreateUserReq {
   @ApiPropertyOptional()
@@ -111,11 +114,11 @@ export class UpdateUserReq {
 
 export class UpdateUserRes {
   @ApiProperty()
-  user: UserByCustomer;
+  user: IUserByCustomer;
 }
 export class GetAllUsersByCustomerIdRes {
-  @ApiProperty({ type: [UserByCustomer] })
-  users: UserByCustomer[];
+  @ApiProperty({ type: [IUserByCustomer] })
+  users: IUserByCustomer[];
   @ApiProperty()
   departments: string[];
   @ApiProperty()
@@ -153,7 +156,7 @@ export class SetUserRolesReq {
 
 export class SetUserRolesRes {
   @ApiProperty()
-  user: UserByCustomer;
+  user: IUserByCustomer;
 }
 
 export class SearchUserRes extends GetAllUsersByCustomerIdRes {}

src/modules/users/users.controller.ts

@@ -45,7 +45,7 @@ import {
   UnassignRoleToUserReq,
   UpdateUserReq,
   UpdateUserRes,
-  UserByCustomer,
+  IUserByCustomer,
 } from './dtos/entities';
 import { UsersService } from './users.service';
 import { Metadata } from '@grpc/grpc-js';
@@ -126,7 +126,7 @@ export class UsersController {
 
   @Get(':id')
   @ApiOkResponse({
-    type: UserByCustomer,
+    type: IUserByCustomer,
   })
   async findOneById(
     @User() user: RequestUser,

src/modules/users/users.service.ts

@@ -18,6 +18,7 @@ import {
   BatchCreateUserReq,
   CreateUserReq,
   Hierarchy,
+  IUserByCustomer,
   SetUserRolesReq,
   UpdateUserReq,
 } from './dtos/entities';
@@ -77,11 +78,21 @@ export class UsersService implements OnModuleInit {
     };
   }
 
-  async findOneById(id: string) {
+  async findOneById(id: string): Promise<{ user: IUserByCustomer }> {
     const { user } = await lastValueFrom(
       this.usersClientService.UserFindOneById({ id }),
     );
-    return { user: this.adjustUsersPayload([user])[0] };
+    const res: { user: IUserByCustomer } = {
+      user: this.adjustUsersPayload([user])[0],
+    };
+    if (res.user.roles?.length) {
+      const allPermissions = res.user.roles.flatMap((r) => r.permissions);
+      const distinctPermissions = Array.from(
+        new Set(allPermissions.map((p) => p.claim)),
+      );
+      res.user.permissions = distinctPermissions;
+    }
+    return res;
   }
 
   async createUser(req: CreateUserReq, meta?: Metadata) {