Merge pull request #158 from dadosfera/ft/rls-old-catalog

FEAT: Rls first change

package-lock.json

@@ -12,7 +12,7 @@
       "dependencies": {
         "@aws-sdk/client-secrets-manager": "^3.112.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-        "@dadosfera/protospack-v2": "3.18.8",
+        "@dadosfera/protospack-v2": "3.18.11",
         "@grpc/grpc-js": "^1.6.7",
         "@grpc/proto-loader": "^0.6.13",
         "@nestjs/common": "^8.4.7",
@@ -1726,9 +1726,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.18.8",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.8.tgz",
-      "integrity": "sha512-pzvuIzCrIf/ZG//lwMdCxtZ7w/ZhiLFBA3VWyN9uM7AjeqVl7LllHKV08Fw6YjNNGBmQF3DLJQTK8kMCQja4hA==",
+      "version": "3.18.11",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.11.tgz",
+      "integrity": "sha512-8/+RLEM6qheWIQf0hlgE3Rfu9y2vmoze0LvJ/imRkg2tObO+HRxxpZuGKaY+naH8maUawyOX8xO4lpmfotjOEw==",
       "dependencies": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",
@@ -12306,9 +12306,9 @@
       }
     },
     "@dadosfera/protospack-v2": {
-      "version": "3.18.8",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.8.tgz",
-      "integrity": "sha512-pzvuIzCrIf/ZG//lwMdCxtZ7w/ZhiLFBA3VWyN9uM7AjeqVl7LllHKV08Fw6YjNNGBmQF3DLJQTK8kMCQja4hA==",
+      "version": "3.18.11",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.11.tgz",
+      "integrity": "sha512-8/+RLEM6qheWIQf0hlgE3Rfu9y2vmoze0LvJ/imRkg2tObO+HRxxpZuGKaY+naH8maUawyOX8xO4lpmfotjOEw==",
       "requires": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",

package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.112.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-    "@dadosfera/protospack-v2": "3.18.8",
+    "@dadosfera/protospack-v2": "3.18.11",
     "@grpc/grpc-js": "^1.6.7",
     "@grpc/proto-loader": "^0.6.13",
     "@nestjs/common": "^8.4.7",

src/modules/auth/auth.controller.ts

@@ -27,6 +27,7 @@ import { AuthClientService } from './auth.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
 import { RequestUser, User } from 'src/authentication/user.decorator';
+import { Metadata } from '@grpc/grpc-js';
 
 @ApiTags('Auth')
 @UseFilters(new GrpcToHttpExceptionFilter())
@@ -59,20 +60,27 @@ export class AuthController {
 
   @Post('sign-in')
   @HttpCode(HttpStatus.OK)
-  async signIn(@Body() { username, password, totp }: AuthSignInRequest) {
+  async signIn(
+    @Body() { username, password, totp }: AuthSignInRequest,
+    @Headers('Dadosfera-Lang') language: string,
+  ) {
     this.logger.info('/auth - SignIn');
-
-    return this.authClient.signIn({ username, password, totp });
+    const metadata = new Metadata();
+    metadata.add('language', language || 'pt-br');
+    return this.authClient.signIn({ username, password, totp }, metadata);
   }
 
   @Post('refresh-access-token')
   @HttpCode(HttpStatus.OK)
   async refreshAccessToken(
     @Body() { refreshToken }: AuthRefreshAccessTokenRequest,
+    @Headers('Dadosfera-Lang') language: string,
   ) {
     this.logger.info('/auth - RefreshAccessToken');
+    const metadata = new Metadata();
+    metadata.add('language', language || 'pt-br');
 
-    return this.authClient.refreshAccessToken({ refreshToken });
+    return this.authClient.refreshAccessToken({ refreshToken }, metadata);
   }
 
   @Post('change-password')

src/modules/auth/auth.service.ts

@@ -19,6 +19,7 @@ import {
   AuthConfirmResetPasswordRequest,
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { DucClient } from '../duc/client.config';
+import { Metadata } from '@grpc/grpc-js';
 
 @Injectable()
 export class AuthClientService implements OnModuleInit {
@@ -51,19 +52,25 @@ export class AuthClientService implements OnModuleInit {
     return lastValueFrom(this.authService.AuthSnowflakeSignIn(input));
   }
 
-  async signIn({ username, password, totp }: AuthSignInRequest) {
+  async signIn(
+    { username, password, totp }: AuthSignInRequest,
+    metadata: Metadata,
+  ) {
     this.logger.info('SignIn');
 
     return lastValueFrom(
-      this.authService.AuthSignIn({ username, password, totp }),
+      this.authService.AuthSignIn({ username, password, totp }, metadata),
     );
   }
 
-  async refreshAccessToken({ refreshToken }: AuthRefreshAccessTokenRequest) {
+  async refreshAccessToken(
+    { refreshToken }: AuthRefreshAccessTokenRequest,
+    metadata: Metadata,
+  ) {
     this.logger.info('RefreshAccessToken');
 
     return lastValueFrom(
-      this.authService.AuthRefreshAccessToken({ refreshToken }),
+      this.authService.AuthRefreshAccessToken({ refreshToken }, metadata),
     );
   }
 

src/modules/catalog/catalog.controller.ts

@@ -193,12 +193,69 @@ export class CatalogController {
 
     const user_roles = await this.catalogService.getUserRolesIds(user_id);
 
-    const res = await this.catalogService.getOneDashboardMetabase(
+    const res = await this.catalogService.getOneDashboardMetabase({
       id,
       body,
       metadata,
       customer_id,
+      user_id: undefined,
+    });
+
+    const dashboard = res.dashboard;
+
+    if (dashboard.owner === username) has_permission = true;
+
+    for (const role of user_roles) {
+      if (dashboard.p_roles.includes(role)) has_permission = true;
+    }
+
+    if (dashboard.p_users.includes(user_id)) has_permission = true;
+
+    if (is_data_manager || has_permission) {
+      delete dashboard.p_roles;
+      delete dashboard.p_users;
+      return res;
+    }
+
+    throw new HttpException(
+      'You do not have permission to access this data asset.',
+      403,
     );
+  }
+
+  @Get('dashboard-metabase/rls/:id')
+  async getOneDashboardMetabaseRls(
+    @Body() body,
+    @Param() params,
+    @User() user: RequestUser,
+  ) {
+    const { username, user_id, customer_id, customer_name, permissions } = user;
+    const { id } = params;
+    this.logger.info(`/catalog - ON GET ONE DASHBOARD METABASE ROUTE`, {
+      username,
+      customer_name,
+    });
+
+    const is_data_manager = permissions.includes(
+      PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
+    );
+    let has_permission = false;
+    const metadata = PackTheMetadata({
+      username,
+      user_id,
+      customer_id,
+      customer_name,
+    });
+
+    const user_roles = await this.catalogService.getUserRolesIds(user_id);
+
+    const res = await this.catalogService.getOneDashboardMetabase({
+      id,
+      body,
+      metadata,
+      customer_id,
+      user_id,
+    });
 
     const dashboard = res.dashboard;
 

src/modules/catalog/catalog.service.ts

@@ -207,16 +207,36 @@ class CatalogService implements OnModuleInit {
 
       const owner = result !== null ? result.user.username : null;
 
-      Object.assign(asset, { ...asset, owner });
+      const roles = [];
+      const users = [];
+
+      for (const role of customer_roles) {
+        for (const role_id of asset.roles) {
+          if (role.id === role_id) roles.push(role);
+        }
+      }
+
+      for (const user of customer_users) {
+        for (const user_id of asset.users) {
+          if (user.id === user_id) users.push(user);
+        }
+      }
+
+      Object.assign(asset, {
+        ...asset,
+        owner,
+        roles,
+        users,
+      });
     }
 
     return { data_assets };
   }
 
-  async getOneDashboardMetabase(id, body, metadata, customer_id) {
+  async getOneDashboardMetabase({ id, body, metadata, customer_id, user_id }) {
     const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/dashboard-metabase/${id}`,
+      `${nimbusUrl}/api/catalog/dashboard-metabase/${id}?user_id=${user_id}`,
     );
 
     const { data_asset } = await lastValueFrom(
@@ -387,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/connector/client.service.ts

@@ -71,27 +71,174 @@ export class ConnectorClientService implements OnModuleInit {
     );
   }
 
-  async uploadConnectorsFile(uploadFile) {
-    const connectors = JSON.parse(uploadFile.file.buffer.toString('utf8'));
-
-    const body = connectors.map((connector) => {
-      return JSON.stringify(connector);
-    });
-
-    const request = {
-      connectors: body,
-    };
-
-    return lastValueFrom(
-      this.connectorServiceWrite.RegisterMultipleConnectorsWithoutImage(
-        request,
-      ),
+  async uploadConnectorsFile(uploadFile: Express.Multer.File) {
+    const res = await lastValueFrom(
+      this.connectorServiceWrite.RegisterMultipleConnectorsWithoutImage({
+        connectors: uploadFile.buffer,
+      }),
     ).catch((err) => {
       throw new HttpException(
         err.details,
         err.code === 6 ? HttpStatus.CONFLICT : 400,
       );
     });
+    const responseParsed = JSON.parse(res.message);
+    const connectorErrors = responseParsed.items
+      .filter((i) => i.update._index === 'connector' && i.update.error)
+      .map((i) => ({
+        id: i.update._id,
+        reason: i.update.error,
+        status: i.error.status,
+      }));
+    const connectionControlsErrors = responseParsed.items
+      .filter(
+        (i) => i.update._index === 'connection_controls' && i.update.error,
+      )
+      .map((i) => ({
+        id: i.update._id,
+        reason: i.update.error,
+        status: i.error.status,
+      }));
+    const connectionStepsErrors = responseParsed.items
+      .filter((i) => i.update._index === 'connection_steps' && i.update.error)
+      .map((i) => ({
+        id: i.update._id,
+        reason: i.update.error,
+        status: i.error.status,
+      }));
+    const configControlsErrors = responseParsed.items
+      .filter((i) => i.update._index === 'config_controls' && i.update.error)
+      .map((i) => ({
+        id: i.update._id,
+        reason: i.update.error,
+        status: i.error.status,
+      }));
+    const connectorCreated = responseParsed.items
+      .filter(
+        (i) => i.update._index === 'connector' && i.update.result === 'created',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectionControlsCreated = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'connection_controls' &&
+          i.update.result === 'created',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectionStepsCreated = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'connection_steps' &&
+          i.update.result === 'created',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const configControlsCreated = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'config_controls' &&
+          i.update.result === 'created',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectorUpdated = responseParsed.items
+      .filter(
+        (i) => i.update._index === 'connector' && i.update.result === 'updated',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectionControlsUpdated = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'connection_controls' &&
+          i.update.result === 'updated',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectionStepsUpdated = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'connection_steps' &&
+          i.update.result === 'updated',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const configControlsUpdated = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'config_controls' &&
+          i.update.result === 'updated',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectorNoop = responseParsed.items
+      .filter(
+        (i) => i.update._index === 'connector' && i.update.result === 'noop',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectionControlsNoop = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'connection_controls' &&
+          i.update.result === 'noop',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const connectionStepsNoop = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'connection_steps' && i.update.result === 'noop',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    const configControlsNoop = responseParsed.items
+      .filter(
+        (i) =>
+          i.update._index === 'config_controls' && i.update.result === 'noop',
+      )
+      .map((i) => ({
+        id: i.update._id,
+      }));
+    return {
+      errors: {
+        connectors: connectorErrors,
+        connection_controls: connectionControlsErrors,
+        connection_steps: connectionStepsErrors,
+        config_controls: configControlsErrors,
+      },
+      created: {
+        connectors: connectorCreated,
+        connection_controls: connectionControlsCreated,
+        connection_steps: connectionStepsCreated,
+        config_controls: configControlsCreated,
+      },
+      updated: {
+        connectors: connectorUpdated,
+        connection_controls: connectionControlsUpdated,
+        connection_steps: connectionStepsUpdated,
+        config_controls: configControlsUpdated,
+      },
+      noop: {
+        connectors: connectorNoop,
+        connection_controls: connectionControlsNoop,
+        connection_steps: connectionStepsNoop,
+        config_controls: configControlsNoop,
+      },
+    };
   }
 
   async getAllConnectors(body) {
@@ -116,13 +263,13 @@ export class ConnectorClientService implements OnModuleInit {
     });
   }
 
-  async getConnectorDetails(plugin: string, language: string) {
+  async getConnectorDetails(connectorId: string, language: string) {
     const meta = new Metadata();
     meta.add('Language', language);
     return lastValueFrom(
       this.connectorServiceRead.GetConnectorDetails(
         {
-          plugin,
+          plugin: connectorId,
         },
         meta,
       ),

src/modules/connector/connector.controller.ts

@@ -19,7 +19,6 @@ import { ApiBearerAuth, ApiConsumes, ApiTags } from '@nestjs/swagger';
 import { ConnectorClientService } from './client.service';
 import { AddTagDto } from './dtos/add-tag';
 import { CreateConnectorDto } from './dtos/create-connector';
-import { UploadConnectorsFileDto } from './dtos/create-multiple-connector';
 import { DeleteConnectorDto } from './dtos/delete-connector';
 import { GetAllDto } from './dtos/get-all';
 import { RemoveTagDto } from './dtos/remove-tag';
@@ -85,14 +84,10 @@ export class ConnectorController {
   @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.CREATE)
   @ApiConsumes('multipart/form-data')
   @UseInterceptors(FileInterceptor('file'))
-  async uploadConnectorsFile(@UploadedFile() file: UploadConnectorsFileDto) {
+  async uploadConnectorsFile(@UploadedFile() file: Express.Multer.File) {
     this.logger.info(`/upload`, 'Upload Connector Route');
 
-    const response = await this.connectorClientService.uploadConnectorsFile({
-      file,
-    });
-
-    return response;
+    return await this.connectorClientService.uploadConnectorsFile(file);
   }
 
   @Get()

src/modules/oauth/oauth.controller.ts

@@ -5,9 +5,7 @@ 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')
-@Authenticated()
 @Controller('oauth')
 export class OauthController {
   redirectUrl: string;

src/modules/pipelinesV2/pipelines.controller.ts

@@ -61,7 +61,7 @@ export class PipelinesController {
     @User() user: RequestUser,
     @Body() createPipelineDto: ICreatePipelineV2Req,
   ) {
-    this.logger.info(process.env.DEV_URL + `/pipelines ON CREATE ROUTE`);
+    this.logger.info('PipelinesController - create', { user });
     if (!language) language = 'en-us';
     const { customer_id, customer_name, username, user_id } = user;
     const metadata = PackTheMetadata({
@@ -86,10 +86,7 @@ export class PipelinesController {
     @Headers('Dadosfera-Lang') language,
     @Query() data,
   ) {
-    this.logger.info(process.env.DEV_URL + `/pipeline ON Find All ROUTE`, {
-      user: user.user_id,
-      customer: user.customer_name,
-    });
+    this.logger.info('PipelinesController - findAll', { user });
 
     if (!language) language = 'en-us';
 
@@ -103,24 +100,34 @@ export class PipelinesController {
     });
 
     const response = await this.pipelinesClientService.findAll(data, metadata);
-    const oldResponse = await this.oldPipelinesService.findAll({
-      customer_name,
-      user_id,
-      customer_id,
-    });
 
     return {
-      pipelines: [...response.pipelines, ...oldResponse.pipelines],
+      pipelines: [...response.pipelines],
     };
   }
 
+  @Get(':id/config')
+  async getPipelineproperties(
+    @Headers('Dadosfera-Lang') language,
+    @User() user: RequestUser,
+    @Param('id') id,
+  ) {
+    this.logger.info('PipelinesController - getPipelineproperties', { user });
+    const metadata = PackTheMetadata({
+      ...user,
+      language: language || 'pt-br',
+    });
+    return this.pipelinesClientService.findOneProperties(id, metadata);
+  }
+
   @Get('/:id')
   async findOne(
     @Headers('Dadosfera-Lang') language,
     @User() user: RequestUser,
     @Param('id') id,
   ): Promise<Messages.PipelineV2FindOneResponse> {
-    this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON Find One ROUTE`);
+    this.logger.info('PipelinesController - findOne', { user });
+
     if (!language) language = 'en-us';
 
     const { customer_id, customer_name, user_id, username } = user;
@@ -149,24 +156,19 @@ export class PipelinesController {
             : {},
         });
         return res;
-      })
-      .catch(async (err) => {
-        this.logger.error(err);
-        return await this.oldPipelinesService.findOne({
-          id,
-          info: { customer_id, customer: customer_name, user_id },
-        });
       });
     return result;
   }
-
   @Put('/:id')
-  async update(@Body() updatePipelineDto, @Param('id') id) {
+  async update(
+    @Body() updatePipelineDto,
+    @Param('id') id,
+    @User() user: RequestUser,
+  ) {
+    this.logger.info('PipelinesController - findOne', { user });
     const { info } = updatePipelineDto;
     delete updatePipelineDto.info;
 
-    this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON UPDATE ROUTE`);
-
     const response = await this.pipelinesClientService.update({
       ...updatePipelineDto,
       info,
@@ -177,9 +179,9 @@ export class PipelinesController {
   }
 
   @Delete(':id')
-  async delete(@Body() data, @Param() params) {
+  async delete(@Body() data, @Param() params, @User() user: RequestUser) {
     const { id } = params;
-    this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON DELETE ROUTE`);
+    this.logger.info('PipelinesController - findOne', { user });
 
     const response = await this.pipelinesClientService.remove({ id, ...data });
 

src/modules/pipelinesV2/pipelines.module.ts

@@ -8,6 +8,7 @@ import { PipelinesService } from './pipelines.service';
 import { PipelinesClientConfiguration } from './pipelines-client';
 
 import { PipelinesModule as OldPipelineModule } from 'src/modules/pipelines/pipelines.module';
+import { ConnectorModule } from '../connector/connector.module';
 
 const client = new PipelinesClientConfiguration();
 
@@ -15,6 +16,7 @@ const client = new PipelinesClientConfiguration();
   imports: [
     ClientsModule.register([client.providerOptions]),
     OldPipelineModule,
+    ConnectorModule,
   ],
   controllers: [PipelinesController],
   providers: [PipelinesService, DadosferaLogger],

src/modules/pipelinesV2/pipelines.service.ts

@@ -17,6 +17,8 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { PipelinesClientConfiguration } from './pipelines-client';
 import { ICreatePipelineV2Req } from './interfaces';
 import { PipelineV2CreateRequest } from '@dadosfera/protospack-v2/dist/lib/PipelineV2/interfaces/messages';
+import { Metadata } from '@grpc/grpc-js';
+import { ConnectorClientService } from '../connector/client.service';
 
 export class PipelinesService implements OnModuleInit {
   logger: DadosferaLogger;
@@ -27,6 +29,7 @@ export class PipelinesService implements OnModuleInit {
     dadosferaLogger: DadosferaLogger,
     @Inject(PipelinesClientConfiguration.name)
     private readonly grpcClient: ClientGrpc,
+    private readonly connectorService: ConnectorClientService,
   ) {
     this.logger = dadosferaLogger.logger;
   }
@@ -169,4 +172,40 @@ export class PipelinesService implements OnModuleInit {
 
     return removePipelineResponse;
   }
+
+  async findOneProperties(id: string, metadata: Metadata) {
+    this.logger.info('PipelinesClientService - findOneProperties');
+    const { pipeline } = await this.findOne({ id }, metadata);
+
+    const pipelineProperties = JSON.parse(pipeline.properties);
+
+    const connectorId = `${pipeline.connector_plugin}-${pipeline.connector_version}`;
+
+    const res = await this.connectorService.getConnectorDetails(
+      connectorId,
+      metadata.get('language')[0].toString(),
+    );
+    const connector = JSON.parse(res.connector);
+    const config_controls = connector.config_controls || [];
+
+    for (const key in pipelineProperties) {
+      const i = config_controls
+        .map((cc) => cc.name)
+        .indexOf(`properties.${key}`);
+      if (i > -1) {
+        config_controls[i] = {
+          ...config_controls[i],
+          default_value: pipelineProperties[key],
+        };
+      }
+    }
+
+    return {
+      pipeline: {
+        ...pipeline,
+        config_controls,
+        properties: pipelineProperties,
+      },
+    };
+  }
 }

src/modules/termsOfUse/termsOfUse.controller.ts

@@ -17,6 +17,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 
 import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
 import { RequestUser, User } from '../../authentication/user.decorator';
+import { Metadata } from '@grpc/grpc-js';
 
 @ApiTags('TermsOfUse')
 @UseFilters(new GrpcToHttpExceptionFilter())
@@ -33,10 +34,15 @@ export class TermsOfUseController {
   }
 
   @Get('token')
-  async getToken(@User({ required: true }) user: RequestUser) {
+  async getToken(
+    @User({ required: true }) user: RequestUser,
+    @Headers('Dadosfera-Lang') language: string,
+  ) {
     this.logger.info('/terms-of-use - get token');
+    const metadata = new Metadata();
+    metadata.add('language', language || 'pt-br');
 
-    return this.termsOfUseClient.getToken({ userId: user.user_id });
+    return this.termsOfUseClient.getToken({ userId: user.user_id }, metadata);
   }
 
   @Post('accept')

src/modules/termsOfUse/termsOfUse.service.ts

@@ -10,6 +10,7 @@ import {
   TermsOfUseAcceptRequest,
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { DucClient } from '../duc/client.config';
+import { Metadata } from '@grpc/grpc-js';
 
 @Injectable()
 export class TermsOfUseClientService implements OnModuleInit {
@@ -31,8 +32,10 @@ export class TermsOfUseClientService implements OnModuleInit {
       );
   }
 
-  async getToken(data: TermsOfUseGetTokenRequest) {
-    return lastValueFrom(this.termsOfUseService.TermsOfUseGetToken(data));
+  async getToken(data: TermsOfUseGetTokenRequest, metadata: Metadata) {
+    return lastValueFrom(
+      this.termsOfUseService.TermsOfUseGetToken(data, metadata),
+    );
   }
 
   async accept(data: TermsOfUseAcceptRequest) {

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,10 +45,12 @@ import {
   UnassignRoleToUserReq,
   UpdateUserReq,
   UpdateUserRes,
-  UserByCustomer,
+  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';
 
 // TODO GET de hierarquias e do PATCH em usuário
 @ApiTags('Users')
@@ -123,9 +125,8 @@ export class UsersController {
   }
 
   @Get(':id')
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
   @ApiOkResponse({
-    type: UserByCustomer,
+    type: IUserByCustomer,
   })
   async findOneById(
     @User() user: RequestUser,
@@ -134,6 +135,14 @@ export class UsersController {
   ) {
     this.logger.info('findOneById', { user });
     this.userService.setLanguage(language);
+    if (
+      id !== user.user_id &&
+      !user.permissions.includes(
+        PERMISSIONS_GROUPS.USERS.permissions.ADMIN.seqid,
+      )
+    ) {
+      throw new ErrorBuilder(ErrorCodes.AUTH.FORBIDDEN);
+    }
     return await this.userService.findOneById(id);
   }
 

src/modules/users/users.service.ts

@@ -18,6 +18,7 @@ import {
   BatchCreateUserReq,
   CreateUserReq,
   Hierarchy,
+  IUserByCustomer,
   SetUserRolesReq,
   UpdateUserReq,
 } from './dtos/entities';
@@ -77,11 +78,24 @@ 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],
+    };
+    const { permissions } = await lastValueFrom(
+      this.usersClientService.GetUserPermissions({ id }),
+    ).catch((error) => {
+      this.logger.error('UsersService.findOneById - GetUserPermissions', {
+        error,
+      });
+      const permissions: string[] = [];
+      return { permissions };
+    });
+    res.user.permissions = permissions;
+    return res;
   }
 
   async createUser(req: CreateUserReq, meta?: Metadata) {