Merge pull request #199 from dadosfera/fix/can-untoggle

FIX: canUntoggle logic

docsfera.json

@@ -1587,6 +1587,17 @@
                 ],
                 "type": "string"
               }
+            },
+            {
+              "name": "canUntoggleLogic",
+              "required": false,
+              "in": "query",
+              "schema": {
+                "enum": [
+                  "data_assets_sharing"
+                ],
+                "type": "string"
+              }
             }
           ],
           "responses": {
@@ -3339,7 +3350,7 @@
       }
     },
     "info": {
-      "title": "Maestro - main",
+      "title": "Maestro - fix/can-untoggle",
       "description": "Documentation for Maestro gateway",
       "version": "1.0.0",
       "contact": {}
@@ -3993,6 +4004,10 @@
             },
             "usage": {
               "type": "string"
+            },
+            "canUntoggle": {
+              "type": "boolean",
+              "description": "Whether this role can be untoggled"
             }
           },
           "required": [
@@ -4470,6 +4485,10 @@
             },
             "usage": {
               "type": "string"
+            },
+            "canUntoggle": {
+              "type": "boolean",
+              "description": "Whether this role can be untoggled"
             }
           },
           "required": [
@@ -4560,6 +4579,10 @@
             },
             "usage": {
               "type": "string"
+            },
+            "canUntoggle": {
+              "type": "boolean",
+              "description": "Whether this role can be untoggled"
             }
           },
           "required": [

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.27.1",
+        "@dadosfera/protospack-v2": "3.27.2",
         "@grpc/grpc-js": "^1.6.7",
         "@grpc/proto-loader": "^0.6.13",
         "@nestjs/common": "^8.4.7",
@@ -1727,9 +1727,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.27.1",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.27.1.tgz",
-      "integrity": "sha512-bAhHSS1cquIJadHiWSO1FFJFfugrJXEIWKFzE7PByeC9XldGru/qlART7KXbxqYHQq8lALKJy1ILyMyG91BsTA==",
+      "version": "3.27.2",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.27.2.tgz",
+      "integrity": "sha512-WDdneA/+AuRMrgbqU84NgaTw9HLp7HYWbVMEqxTEli+JizoiSYpAQ9ZmG6TnXgsTAdjZf7DOOVdY3OKNxRjWig==",
       "dependencies": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",
@@ -12284,9 +12284,9 @@
       }
     },
     "@dadosfera/protospack-v2": {
-      "version": "3.27.1",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.27.1.tgz",
-      "integrity": "sha512-bAhHSS1cquIJadHiWSO1FFJFfugrJXEIWKFzE7PByeC9XldGru/qlART7KXbxqYHQq8lALKJy1ILyMyG91BsTA==",
+      "version": "3.27.2",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.27.2.tgz",
+      "integrity": "sha512-WDdneA/+AuRMrgbqU84NgaTw9HLp7HYWbVMEqxTEli+JizoiSYpAQ9ZmG6TnXgsTAdjZf7DOOVdY3OKNxRjWig==",
       "requires": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",

package.json

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

src/modules/roles/dto/entities.ts

@@ -25,6 +25,8 @@ export class RoleDto {
   customer?: Customer;
   @ApiProperty()
   usage: string;
+  @ApiPropertyOptional({ description: 'Whether this role can be untoggled' })
+  canUntoggle?: boolean;
 }
 
 export class CustomerRole extends OmitType(RoleDto, ['customer']) {}
@@ -34,11 +36,17 @@ export enum TrueOrFalseEnum {
   true = 'true',
   false = 'false',
 }
+
+export enum CanUntoggleLogicEnum {
+  data_assets_sharing = 'data_assets_sharing',
+}
 export class GetRolesByCustomerReq {
   @ApiPropertyOptional()
   permissionId?: string[];
   @ApiPropertyOptional({ enum: TrueOrFalseEnum })
   getUsers?: TrueOrFalseEnum;
+  @ApiPropertyOptional({ enum: CanUntoggleLogicEnum })
+  canUntoggleLogic?: CanUntoggleLogicEnum;
 }
 
 export class GetRolesByCustomerRes {

src/modules/roles/roles.controller.ts

@@ -71,12 +71,12 @@ export class RolesController {
   @ApiOkResponse({ type: GetRolesByCustomerRes })
   async searchRoles(
     @User() user: RequestUser,
-    @Query() filters: GetRolesByCustomerReq,
+    @Query() params: GetRolesByCustomerReq,
     @Headers('dadosfera-lang') language,
   ) {
     this.logger.info('searchRoles', { user });
     this.rolesService.setLanguage(language);
-    return await this.rolesService.roleSearch(filters, user);
+    return await this.rolesService.roleSearch(params, user);
   }
 
   @Post()

src/modules/roles/roles.service.ts

@@ -70,12 +70,7 @@ export class RolesService {
     return { role: roleTreated };
   }
 
-  async roleSearch(
-    filters: GetRolesByCustomerReq,
-    { customer_id, access_token }: any,
-  ) {
-    const meta = new Metadata();
-    meta.add('access_token', access_token);
+  async roleSearch(filters: GetRolesByCustomerReq, { customer_id }) {
     let { permissionId: permissionIds } = filters;
     if (permissionIds && !Array.isArray(permissionIds))
       permissionIds = [permissionIds];
@@ -89,15 +84,13 @@ export class RolesService {
         return seqId;
       }) || [];
     const roles = await lastValueFrom(
-      this.rolesClientService.RoleSearch(
-        {
-          customerId: customer_id,
-          getUsers: isGetUsers,
-          permissionIds: [],
-          permissionSeqIds,
-        },
-        meta,
-      ),
+      this.rolesClientService.RoleSearch({
+        customerId: customer_id,
+        getUsers: isGetUsers,
+        permissionIds: [],
+        permissionSeqIds,
+        canUntoggleLogic: filters.canUntoggleLogic,
+      }),
     );
     const rolesTreated = this.getRolesPermissionsName(roles.roles);
     return { roles: rolesTreated };