Merge pull request #153 from dadosfera/fix/user-roles

Fix/user roles

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.10",
         "@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.10",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.10.tgz",
+      "integrity": "sha512-0bRUvo4p7cJJOL+B0hVTiSDaA2MGtirPkFVQW4lUfzsyY5vrsbAkMz6R3iPdPPwFSxGn5LwidHGkP3/l7hlEpA==",
       "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.10",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.10.tgz",
+      "integrity": "sha512-0bRUvo4p7cJJOL+B0hVTiSDaA2MGtirPkFVQW4lUfzsyY5vrsbAkMz6R3iPdPPwFSxGn5LwidHGkP3/l7hlEpA==",
       "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.10",
     "@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.service.ts

@@ -207,7 +207,27 @@ 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 };

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) {

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/pipelinesV2/pipelines.controller.ts

@@ -103,14 +103,9 @@ 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],
     };
   }
 
@@ -149,13 +144,6 @@ 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;
   }

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/users.controller.ts

@@ -49,6 +49,8 @@ import {
 } 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,7 +125,6 @@ export class UsersController {
   }
 
   @Get(':id')
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
   @ApiOkResponse({
     type: UserByCustomer,
   })
@@ -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);
   }