Merge pull request #196 from dadosfera/feat/cognito-mailing

FIX: send language on create users and resend invite

.github/workflows/deploy-manually.yml

@@ -10,8 +10,8 @@ on:
         required: true
         type: choice
         options:
-          - dev
           - stg
+          - stg2
           - prd
 
 jobs:
@@ -152,17 +152,17 @@ jobs:
       - name: Extract Docs BlockId and PageId
         env:
           ENV: ${{ needs.extract_environment.outputs.environment }}
-          DEV_DOCS_BLOCK_ID: ${{ secrets.DEV_DOCS_BLOCK_ID }}
-          DEV_DOCS_PAGE_ID: ${{ secrets.DEV_DOCS_PAGE_ID }}
+          STG2_DOCS_BLOCK_ID: ${{ secrets.DEV_DOCS_BLOCK_ID }}
+          STG2_DOCS_PAGE_ID: ${{ secrets.DEV_DOCS_PAGE_ID }}
           STG_DOCS_BLOCK_ID: ${{ secrets.STG_DOCS_BLOCK_ID }}
           STG_DOCS_PAGE_ID: ${{ secrets.STG_DOCS_PAGE_ID }}
           PRD_DOCS_BLOCK_ID: ${{ secrets.PRD_DOCS_BLOCK_ID }}
           PRD_DOCS_PAGE_ID: ${{ secrets.PRD_DOCS_PAGE_ID }}
         shell: bash
         run: |
-          if [ $ENV == "dev" ]; then
-            echo "block_id=$DEV_DOCS_BLOCK_ID" >> $GITHUB_OUTPUT
-            echo "page_id=$DEV_DOCS_PAGE_ID" >> $GITHUB_OUTPUT
+          if [ $ENV == "stg2" ]; then
+            echo "block_id=$STG2_DOCS_BLOCK_ID" >> $GITHUB_OUTPUT
+            echo "page_id=$STG2_DOCS_PAGE_ID" >> $GITHUB_OUTPUT
           elif [ $ENV == "stg" ]; then
             echo "block_id=$STG_DOCS_BLOCK_ID" >> $GITHUB_OUTPUT
             echo "page_id=$STG_DOCS_PAGE_ID" >> $GITHUB_OUTPUT

README.md

@@ -290,7 +290,7 @@ Example: `FIX: ensure Range headers adhere more closely to RFC 2616`
 ### Making a Pull Request
 1. Commit your changes
 2. Open the Pull Request on GitHub
-3. Send Pull Request link in microsfera Google Chat Group for review and possible approval
+3. Send Pull Request link in Microsfera Google Chat Group for review and possible approval
 
 ## 🛠️ Built with
 Some technologies used in this project:

docsfera.json

@@ -79,6 +79,16 @@
               }
             }
           ],
+          "requestBody": {
+            "required": true,
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AuthRefreshAccessTokenReq"
+                }
+              }
+            }
+          },
           "responses": {
             "200": {
               "description": "",
@@ -264,6 +274,20 @@
           ]
         }
       },
+      "/auth/verify-access-token": {
+        "get": {
+          "operationId": "AuthController_verifyAccessToken",
+          "parameters": [],
+          "responses": {
+            "200": {
+              "description": ""
+            }
+          },
+          "tags": [
+            "Auth"
+          ]
+        }
+      },
       "/connectors": {
         "post": {
           "operationId": "ConnectorController_uploadConnector",
@@ -505,18 +529,16 @@
               "schema": {
                 "type": "string"
               }
-            }
-          ],
-          "requestBody": {
-            "required": true,
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DeleteConnectorDto"
-                }
+            },
+            {
+              "name": "version",
+              "required": true,
+              "in": "query",
+              "schema": {
+                "type": "string"
               }
             }
-          },
+          ],
           "responses": {
             "200": {
               "description": ""
@@ -948,7 +970,7 @@
           ],
           "responses": {
             "200": {
-              "description": "List of users of a customer",
+              "description": "",
               "content": {
                 "application/json": {
                   "schema": {
@@ -2298,6 +2320,20 @@
           ]
         }
       },
+      "/pipelinesV2/download-logs": {
+        "get": {
+          "operationId": "PipelinesController_downloadLogs",
+          "parameters": [],
+          "responses": {
+            "200": {
+              "description": ""
+            }
+          },
+          "tags": [
+            "PipelinesV2"
+          ]
+        }
+      },
       "/pipelinesV2/{id}/config": {
         "get": {
           "operationId": "PipelinesController_getPipelineproperties",
@@ -2312,6 +2348,20 @@
           ]
         }
       },
+      "/pipelinesV2/{id}/objects": {
+        "get": {
+          "operationId": "PipelinesController_getPipelineObjects",
+          "parameters": [],
+          "responses": {
+            "200": {
+              "description": ""
+            }
+          },
+          "tags": [
+            "PipelinesV2"
+          ]
+        }
+      },
       "/pipelinesV2/{id}": {
         "get": {
           "operationId": "PipelinesController_findOne",
@@ -2351,6 +2401,25 @@
             "PipelinesV2"
           ]
         },
+        "patch": {
+          "operationId": "PipelinesController_updateByPatch",
+          "parameters": [],
+          "responses": {
+            "200": {
+              "description": "",
+              "content": {
+                "application/json": {
+                  "schema": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          },
+          "tags": [
+            "PipelinesV2"
+          ]
+        },
         "delete": {
           "operationId": "PipelinesController_delete",
           "parameters": [],
@@ -2364,6 +2433,37 @@
           ]
         }
       },
+      "/pipelinesV2/upload": {
+        "post": {
+          "operationId": "PipelinesController_uploadFile",
+          "parameters": [],
+          "requestBody": {
+            "required": true,
+            "content": {
+              "multipart/form-data": {
+                "schema": {
+                  "$ref": "#/components/schemas/IUploadCSVFile"
+                }
+              }
+            }
+          },
+          "responses": {
+            "201": {
+              "description": "",
+              "content": {
+                "application/json": {
+                  "schema": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          },
+          "tags": [
+            "PipelinesV2"
+          ]
+        }
+      },
       "/inputs/available-entities/{plugin}": {
         "get": {
           "operationId": "InputsController_getAvailableEntities",
@@ -2394,88 +2494,6 @@
           ]
         }
       },
-      "/inputs/test-connection": {
-        "post": {
-          "operationId": "InputsController_testConnection",
-          "parameters": [],
-          "requestBody": {
-            "required": true,
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/TestConnectionReq"
-                }
-              }
-            }
-          },
-          "responses": {
-            "200": {
-              "description": "",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "$ref": "#/components/schemas/TestConnectionRes"
-                  }
-                }
-              }
-            },
-            "201": {
-              "description": "",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "type": "object"
-                  }
-                }
-              }
-            }
-          },
-          "tags": [
-            "Inputs"
-          ]
-        }
-      },
-      "/inputs/test-connection/get-columns": {
-        "post": {
-          "operationId": "InputsController_getColumns",
-          "parameters": [],
-          "requestBody": {
-            "required": true,
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/TestConnectionGetColumnsReq"
-                }
-              }
-            }
-          },
-          "responses": {
-            "200": {
-              "description": "",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "$ref": "#/components/schemas/TestConnectionGetColumnsRes"
-                  }
-                }
-              }
-            },
-            "201": {
-              "description": "",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "type": "object"
-                  }
-                }
-              }
-            }
-          },
-          "tags": [
-            "Inputs"
-          ]
-        }
-      },
       "/inputs": {
         "post": {
           "operationId": "InputsController_create",
@@ -2691,7 +2709,7 @@
       },
       "/catalog": {
         "get": {
-          "operationId": "CatalogController_catalogAll",
+          "operationId": "CatalogController_searchCatalog",
           "parameters": [],
           "responses": {
             "200": {
@@ -2732,6 +2750,20 @@
           ]
         }
       },
+      "/catalog/data-asset": {
+        "get": {
+          "operationId": "CatalogController_findByPipelineAndObject",
+          "parameters": [],
+          "responses": {
+            "200": {
+              "description": ""
+            }
+          },
+          "tags": [
+            "Catalog"
+          ]
+        }
+      },
       "/catalog/tags": {
         "get": {
           "operationId": "CatalogController_findAllTags",
@@ -2902,7 +2934,16 @@
         },
         "post": {
           "operationId": "CatalogController_manageDataAssetDocs",
-          "parameters": [],
+          "parameters": [
+            {
+              "name": "id",
+              "required": true,
+              "in": "path",
+              "schema": {
+                "type": "string"
+              }
+            }
+          ],
           "responses": {
             "201": {
               "description": "",
@@ -3298,9 +3339,9 @@
       }
     },
     "info": {
-      "title": "Maestro - fix/modules-permissions",
+      "title": "Maestro - main",
       "description": "Documentation for Maestro gateway",
-      "version": "10.11.2022 - 14:43",
+      "version": "1.0.0",
       "contact": {}
     },
     "tags": [],
@@ -3349,13 +3390,17 @@
             },
             "tier": {
               "type": "string"
+            },
+            "scheduleLimit": {
+              "type": "string"
             }
           },
           "required": [
             "modules",
             "id",
             "name",
-            "tier"
+            "tier",
+            "scheduleLimit"
           ]
         },
         "AuthUser": {
@@ -3484,6 +3529,21 @@
             "mfaStatus"
           ]
         },
+        "AuthRefreshAccessTokenReq": {
+          "type": "object",
+          "properties": {
+            "refreshToken": {
+              "type": "string"
+            },
+            "customerName": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "refreshToken",
+            "customerName"
+          ]
+        },
         "CreateConnectorDto": {
           "type": "object",
           "properties": {
@@ -3568,17 +3628,6 @@
             "tags"
           ]
         },
-        "DeleteConnectorDto": {
-          "type": "object",
-          "properties": {
-            "version": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "version"
-          ]
-        },
         "PermissionGroupPermission": {
           "type": "object",
           "properties": {
@@ -5174,13 +5223,63 @@
             "updated_at"
           ]
         },
+        "IUploadCSVFile": {
+          "type": "object",
+          "properties": {
+            "file": {
+              "type": "string",
+              "format": "binary"
+            },
+            "name": {
+              "type": "string"
+            },
+            "description": {
+              "type": "string"
+            },
+            "encoding": {
+              "type": "string"
+            },
+            "sep": {
+              "type": "string"
+            },
+            "header": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "file",
+            "name",
+            "description",
+            "encoding",
+            "sep",
+            "header"
+          ]
+        },
+        "AvailableEntity": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "replication_methods": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "name",
+            "replication_methods"
+          ]
+        },
         "GetAvailableEntitiesRes": {
           "type": "object",
           "properties": {
             "entities": {
               "type": "array",
               "items": {
-                "type": "string"
+                "$ref": "#/components/schemas/AvailableEntity"
               }
             }
           },
@@ -5188,99 +5287,6 @@
             "entities"
           ]
         },
-        "CredentialsJdbc": {
-          "type": "object",
-          "properties": {
-            "jdbc_user": {
-              "type": "string"
-            },
-            "jdbc_password": {
-              "type": "string"
-            },
-            "database": {
-              "type": "string"
-            },
-            "endpoint": {
-              "type": "string"
-            },
-            "port": {
-              "type": "string"
-            },
-            "engine": {
-              "type": "string"
-            },
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "TestConnectionReq": {
-          "type": "object",
-          "properties": {
-            "plugin": {
-              "type": "string"
-            },
-            "credentials": {
-              "$ref": "#/components/schemas/CredentialsJdbc"
-            },
-            "info": {
-              "type": "object"
-            }
-          },
-          "required": [
-            "plugin",
-            "credentials"
-          ]
-        },
-        "TestConnectionRes": {
-          "type": "object",
-          "properties": {
-            "connection_state": {
-              "type": "boolean"
-            },
-            "total_entities": {
-              "type": "number"
-            },
-            "database_tables": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          "required": [
-            "connection_state",
-            "total_entities",
-            "database_tables"
-          ]
-        },
-        "TestConnectionGetColumnsReq": {
-          "type": "object",
-          "properties": {
-            "plugin": {
-              "type": "string"
-            },
-            "tables": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "credentials": {
-              "$ref": "#/components/schemas/CredentialsJdbc"
-            },
-            "id": {
-              "type": "string"
-            },
-            "info": {
-              "type": "object"
-            }
-          },
-          "required": [
-            "plugin",
-            "tables"
-          ]
-        },
         "TableColumns": {
           "type": "object",
           "properties": {
@@ -5298,203 +5304,16 @@
               "items": {
                 "type": "string"
               }
+            },
+            "type": {
+              "type": "string"
             }
           },
           "required": [
             "name",
             "columns",
-            "references"
-          ]
-        },
-        "TestConnectionGetColumnsRes": {
-          "type": "object",
-          "properties": {
-            "tables": {
-              "type": "array",
-              "items": {
-                "$ref": "#/components/schemas/TableColumns"
-              }
-            }
-          },
-          "required": [
-            "tables"
-          ]
-        },
-        "FileFormatParams": {
-          "type": "object",
-          "properties": {
-            "sep": {
-              "type": "string"
-            },
-            "header": {
-              "type": "boolean"
-            },
-            "encoding": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "sep",
-            "header",
-            "encoding"
-          ]
-        },
-        "GoogleAnalyticsClientSecrets": {
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string"
-            },
-            "project_id": {
-              "type": "string"
-            },
-            "private_key_id": {
-              "type": "string"
-            },
-            "private_key": {
-              "type": "string"
-            },
-            "client_email": {
-              "type": "string"
-            },
-            "client_id": {
-              "type": "string"
-            },
-            "auth_uri": {
-              "type": "string"
-            },
-            "token_uri": {
-              "type": "string"
-            },
-            "auth_provider_x509_cert_url": {
-              "type": "string"
-            },
-            "client_x509_cert_url": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "project_id",
-            "private_key_id",
-            "private_key",
-            "client_email",
-            "client_id",
-            "auth_uri",
-            "token_uri",
-            "auth_provider_x509_cert_url",
-            "client_x509_cert_url"
-          ]
-        },
-        "Credentials": {
-          "type": "object",
-          "properties": {
-            "jdbc_user": {
-              "type": "string"
-            },
-            "jdbc_password": {
-              "type": "string"
-            },
-            "database": {
-              "type": "string"
-            },
-            "endpoint": {
-              "type": "string"
-            },
-            "port": {
-              "type": "string"
-            },
-            "engine": {
-              "type": "string"
-            },
-            "schema": {
-              "type": "string"
-            },
-            "connection_type": {
-              "type": "string"
-            },
-            "client_aws_access_key_id": {
-              "type": "string"
-            },
-            "client_aws_secret_access_key": {
-              "type": "string"
-            },
-            "client_bucket": {
-              "type": "string"
-            },
-            "file_to_extract": {
-              "type": "string"
-            },
-            "file_format_params": {
-              "$ref": "#/components/schemas/FileFormatParams"
-            },
-            "view_id": {
-              "type": "string"
-            },
-            "client_secrets": {
-              "$ref": "#/components/schemas/GoogleAnalyticsClientSecrets"
-            },
-            "start_date": {
-              "type": "string"
-            },
-            "end_date": {
-              "type": "string"
-            },
-            "oauth_code": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "connection_type"
-          ]
-        },
-        "OauthObject": {
-          "type": "object",
-          "properties": {
-            "get_tokens_url": {
-              "type": "string"
-            },
-            "get_tokens_url_params": {
-              "type": "string"
-            },
-            "get_tokens_set_response": {
-              "type": "object"
-            },
-            "content_type": {
-              "type": "string"
-            }
-          }
-        },
-        "InputOptions": {
-          "type": "object",
-          "properties": {
-            "oauth": {
-              "$ref": "#/components/schemas/OauthObject"
-            },
-            "skip_select_columns": {
-              "type": "boolean"
-            },
-            "skip_select_entities": {
-              "type": "boolean"
-            },
-            "skip_transformation": {
-              "type": "boolean"
-            }
-          }
-        },
-        "AuthParameters": {
-          "type": "object",
-          "properties": {
-            "aws_access_key_id": {
-              "type": "string"
-            },
-            "aws_secret_access_key": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "aws_access_key_id",
-            "aws_secret_access_key"
+            "references",
+            "type"
           ]
         },
         "CreateInputReq": {
@@ -5517,58 +5336,6 @@
             },
             "type": {
               "type": "string"
-            },
-            "category": {
-              "type": "string",
-              "deprecated": true
-            },
-            "credentials": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/Credentials"
-                }
-              ]
-            },
-            "options": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/InputOptions"
-                }
-              ]
-            },
-            "info": {
-              "type": "object",
-              "deprecated": true
-            },
-            "cron": {
-              "type": "string",
-              "deprecated": true
-            },
-            "source_bucket": {
-              "type": "string",
-              "deprecated": true
-            },
-            "source_prefix": {
-              "type": "string",
-              "deprecated": true
-            },
-            "auth_parameters": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/AuthParameters"
-                }
-              ]
-            },
-            "file_format_params": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/FileFormatParams"
-                }
-              ]
             }
           },
           "required": [
@@ -5607,58 +5374,6 @@
             },
             "updated_at": {
               "type": "string"
-            },
-            "category": {
-              "type": "string",
-              "deprecated": true
-            },
-            "credentials": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/Credentials"
-                }
-              ]
-            },
-            "options": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/InputOptions"
-                }
-              ]
-            },
-            "info": {
-              "type": "object",
-              "deprecated": true
-            },
-            "cron": {
-              "type": "string",
-              "deprecated": true
-            },
-            "source_bucket": {
-              "type": "string",
-              "deprecated": true
-            },
-            "source_prefix": {
-              "type": "string",
-              "deprecated": true
-            },
-            "auth_parameters": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/AuthParameters"
-                }
-              ]
-            },
-            "file_format_params": {
-              "deprecated": true,
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/FileFormatParams"
-                }
-              ]
             }
           },
           "required": [
@@ -5724,6 +5439,17 @@
             "username"
           ]
         },
+        "EmbedObject": {
+          "type": "object",
+          "properties": {
+            "url": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "url"
+          ]
+        },
         "IDataAsset": {
           "type": "object",
           "properties": {
@@ -5822,10 +5548,14 @@
               "items": {
                 "$ref": "#/components/schemas/IComment"
               }
+            },
+            "embed": {
+              "$ref": "#/components/schemas/EmbedObject"
             }
           },
           "required": [
             "id",
+            "display_name",
             "pipeline_id",
             "user_id",
             "description",
@@ -5834,6 +5564,7 @@
             "owner",
             "roles",
             "users",
+            "created_at",
             "comments"
           ]
         },
@@ -6063,6 +5794,9 @@
               "items": {
                 "type": "string"
               }
+            },
+            "embed": {
+              "$ref": "#/components/schemas/EmbedObject"
             }
           },
           "required": [
@@ -6099,6 +5833,9 @@
             },
             "location": {
               "type": "string"
+            },
+            "embed": {
+              "$ref": "#/components/schemas/EmbedObject"
             }
           },
           "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.19.4",
+        "@dadosfera/protospack-v2": "3.27.1",
         "@grpc/grpc-js": "^1.6.7",
         "@grpc/proto-loader": "^0.6.13",
         "@nestjs/common": "^8.4.7",
@@ -31,12 +31,12 @@
         "dotenv": "^14.3.2",
         "elastic-apm-node": "^3.36.0",
         "helmet": "^5.1.0",
-        "jsonwebtoken": "^8.5.1",
+        "jsonwebtoken": "^9.0.0",
         "jwk-to-pem": "^2.0.5",
         "mixpanel": "^0.17.0",
         "passport": "^0.6.0",
         "passport-facebook": "^3.0.0",
-        "passport-forcedotcom": "^0.1.5",
+        "passport-forcedotcom": "^0.2.0",
         "passport-google-oauth20": "^2.0.0",
         "passport-hubspot-oauth2": "^1.0.3",
         "passport-mailchimp": "^1.1.0",
@@ -1727,9 +1727,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.19.4",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4.tgz",
-      "integrity": "sha512-Vb6bdFgQKYHf0kDK9kuMtN+nt3nkaMhJZ3wNVaUmQNxsnpGyARWBL29R2n+YnxS8g23tRwuj331sjg+DY0Fnhg==",
+      "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==",
       "dependencies": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",
@@ -3699,8 +3699,9 @@
     },
     "node_modules/asap": {
       "version": "2.0.6",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "dev": true
     },
     "node_modules/asn1.js": {
       "version": "5.4.1",
@@ -4705,9 +4706,10 @@
       }
     },
     "node_modules/dezalgo": {
-      "version": "1.0.3",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -5902,23 +5904,28 @@
       }
     },
     "node_modules/formidable": {
-      "version": "2.0.1",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.1.tgz",
+      "integrity": "sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "dezalgo": "1.0.3",
-        "hexoid": "1.0.0",
-        "once": "1.4.0",
-        "qs": "6.9.3"
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0",
+        "qs": "^6.11.0"
       },
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
     "node_modules/formidable/node_modules/qs": {
-      "version": "6.9.3",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -7779,30 +7786,18 @@
       }
     },
     "node_modules/jsonwebtoken": {
-      "version": "8.5.1",
-      "license": "MIT",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "dependencies": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "engines": {
-        "node": ">=4",
-        "npm": ">=1.4.28"
-      }
-    },
-    "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "5.7.1",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+        "node": ">=12",
+        "npm": ">=6"
       }
     },
     "node_modules/jwa": {
@@ -7901,30 +7896,6 @@
       "version": "4.3.0",
       "license": "MIT"
     },
-    "node_modules/lodash.includes": {
-      "version": "4.3.0",
-      "license": "MIT"
-    },
-    "node_modules/lodash.isboolean": {
-      "version": "3.0.3",
-      "license": "MIT"
-    },
-    "node_modules/lodash.isinteger": {
-      "version": "4.0.4",
-      "license": "MIT"
-    },
-    "node_modules/lodash.isnumber": {
-      "version": "3.0.3",
-      "license": "MIT"
-    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "license": "MIT"
-    },
-    "node_modules/lodash.isstring": {
-      "version": "4.0.1",
-      "license": "MIT"
-    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "dev": true,
@@ -7935,10 +7906,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.once": {
-      "version": "4.1.1",
-      "license": "MIT"
-    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -8713,24 +8680,11 @@
       }
     },
     "node_modules/passport-forcedotcom": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/passport-forcedotcom/-/passport-forcedotcom-0.1.5.tgz",
-      "integrity": "sha512-raDRQqBJtTEHDxLkxLG+9sYE0xpPy9PqriMPbMy9jmpIcU2+mOq9PgczvUPrU8UjfcZp3gqkDHqujcUWiGOVNQ==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/passport-forcedotcom/-/passport-forcedotcom-0.2.0.tgz",
+      "integrity": "sha512-gRI5+zQK9iVAZ1hJgt3TkWLeDw8SYrNWUsmVk0d0RyvUviQ4mT52x3JbYRiyZefoeID8afmLsJH8VOHjWdPf3Q==",
       "dependencies": {
-        "passport-oauth2": "1.3.x"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/passport-forcedotcom/node_modules/passport-oauth2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz",
-      "integrity": "sha512-AisRXcC7Vx8WSx5C9O8UNib/Y91/IOphs5tImlOMs7T+QTEJdmS+OxgXSskbnDdGQT/8mU5T3yMT6136rBjYXg==",
-      "dependencies": {
-        "oauth": "0.9.x",
-        "passport-strategy": "1.x.x",
-        "uid2": "0.0.x"
+        "passport-oauth2": "^1.6.1"
       },
       "engines": {
         "node": ">= 0.4.0"
@@ -9490,9 +9444,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "dev": true,
-      "license": "ISC",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -12330,9 +12284,9 @@
       }
     },
     "@dadosfera/protospack-v2": {
-      "version": "3.19.4",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.4.tgz",
-      "integrity": "sha512-Vb6bdFgQKYHf0kDK9kuMtN+nt3nkaMhJZ3wNVaUmQNxsnpGyARWBL29R2n+YnxS8g23tRwuj331sjg+DY0Fnhg==",
+      "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==",
       "requires": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",
@@ -13675,6 +13629,8 @@
     },
     "asap": {
       "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
     "asn1.js": {
@@ -14372,7 +14328,9 @@
       "dev": true
     },
     "dezalgo": {
-      "version": "1.0.3",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
       "requires": {
         "asap": "^2.0.0",
@@ -15214,18 +15172,25 @@
       }
     },
     "formidable": {
-      "version": "2.0.1",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.1.tgz",
+      "integrity": "sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==",
       "dev": true,
       "requires": {
-        "dezalgo": "1.0.3",
-        "hexoid": "1.0.0",
-        "once": "1.4.0",
-        "qs": "6.9.3"
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0",
+        "qs": "^6.11.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.9.3",
-          "dev": true
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
         }
       }
     },
@@ -16450,23 +16415,14 @@
       }
     },
     "jsonwebtoken": {
-      "version": "8.5.1",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "requires": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1"
-        }
+        "semver": "^7.3.8"
       }
     },
     "jwa": {
@@ -16539,24 +16495,6 @@
     "lodash.camelcase": {
       "version": "4.3.0"
     },
-    "lodash.includes": {
-      "version": "4.3.0"
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3"
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4"
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3"
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6"
-    },
-    "lodash.isstring": {
-      "version": "4.0.1"
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "dev": true
@@ -16565,9 +16503,6 @@
       "version": "4.6.2",
       "dev": true
     },
-    "lodash.once": {
-      "version": "4.1.1"
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -17093,23 +17028,11 @@
       }
     },
     "passport-forcedotcom": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/passport-forcedotcom/-/passport-forcedotcom-0.1.5.tgz",
-      "integrity": "sha512-raDRQqBJtTEHDxLkxLG+9sYE0xpPy9PqriMPbMy9jmpIcU2+mOq9PgczvUPrU8UjfcZp3gqkDHqujcUWiGOVNQ==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/passport-forcedotcom/-/passport-forcedotcom-0.2.0.tgz",
+      "integrity": "sha512-gRI5+zQK9iVAZ1hJgt3TkWLeDw8SYrNWUsmVk0d0RyvUviQ4mT52x3JbYRiyZefoeID8afmLsJH8VOHjWdPf3Q==",
       "requires": {
-        "passport-oauth2": "1.3.x"
-      },
-      "dependencies": {
-        "passport-oauth2": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz",
-          "integrity": "sha512-AisRXcC7Vx8WSx5C9O8UNib/Y91/IOphs5tImlOMs7T+QTEJdmS+OxgXSskbnDdGQT/8mU5T3yMT6136rBjYXg==",
-          "requires": {
-            "oauth": "0.9.x",
-            "passport-strategy": "1.x.x",
-            "uid2": "0.0.x"
-          }
-        }
+        "passport-oauth2": "^1.6.1"
       }
     },
     "passport-google-oauth20": {
@@ -17591,8 +17514,9 @@
       }
     },
     "semver": {
-      "version": "7.3.7",
-      "dev": true,
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }

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.19.4",
+    "@dadosfera/protospack-v2": "3.27.1",
     "@grpc/grpc-js": "^1.6.7",
     "@grpc/proto-loader": "^0.6.13",
     "@nestjs/common": "^8.4.7",
@@ -47,12 +47,12 @@
     "dotenv": "^14.3.2",
     "elastic-apm-node": "^3.36.0",
     "helmet": "^5.1.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "jwk-to-pem": "^2.0.5",
     "mixpanel": "^0.17.0",
     "passport": "^0.6.0",
     "passport-facebook": "^3.0.0",
-    "passport-forcedotcom": "^0.1.5",
+    "passport-forcedotcom": "^0.2.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-hubspot-oauth2": "^1.0.3",
     "passport-mailchimp": "^1.1.0",

src/authentication/authentication.guard.spec.ts

@@ -44,7 +44,7 @@ class NoClassAuthController {
   @Get('has-all-permissions')
   @RequireAllPermissions(
     PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN,
-    PERMISSIONS_GROUPS.METABASE.permissions.OPEN,
+    PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE,
   )
   async hasAllPermissions(@Body() body) {
     return { body };
@@ -53,7 +53,7 @@ class NoClassAuthController {
   @Get('has-some-permission')
   @RequireSomePermission(
     PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN,
-    PERMISSIONS_GROUPS.METABASE.permissions.OPEN,
+    PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE,
   )
   async hasSomePermission(@Body() body) {
     return { body };
@@ -62,7 +62,7 @@ class NoClassAuthController {
 
 @Controller('class-auth-condition')
 @AuthenticateCondition((req) => req.get('x-on-class') === 'ok')
-@RequireSomePermission(PERMISSIONS_GROUPS.METABASE.permissions.OPEN)
+@RequireSomePermission(PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE)
 class ClassAuthConditionController {
   @Get('body')
   async getBody(@Body() body) {
@@ -444,13 +444,13 @@ describe('authentication.guard', () => {
   NoClassAuthTest(tokenZ, ['zendesk']);
   ClassAuthConditionTest(tokenZ, ['zendesk']);
 
-  const tokenM = CreateToken([PERMISSIONS_GROUPS.METABASE.permissions.OPEN]);
+  const tokenM = CreateToken([PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE]);
   NoClassAuthTest(tokenM, ['metabase']);
   ClassAuthConditionTest(tokenM, ['metabase']);
 
   const tokenZM = CreateToken([
     PERMISSIONS_GROUPS.ZENDESK.permissions.OPEN,
-    PERMISSIONS_GROUPS.METABASE.permissions.OPEN,
+    PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE,
   ]);
   NoClassAuthTest(tokenZM, ['zendesk', 'metabase']);
   ClassAuthConditionTest(tokenZM, ['zendesk', 'metabase']);

src/authentication/permissions.enum.ts

@@ -297,12 +297,12 @@ export const PERMISSIONS_GROUPS = {
       },
       CREATE: {
         seqid: 19,
-        claim: 'POST /catalog',
-        usage: PermissionUsages.INTERNAL,
+        claim: 'catalog:create',
+        usage: PermissionUsages.PUBLIC,
         name: {
-          'pt-br': 'Criar atributos no catálogo',
-          'en-us': 'Create attributes',
-          'es-es': 'Crear atributos',
+          'pt-br': 'Criar Ativos',
+          'en-us': 'Create Assets',
+          'es-es': 'Crear Activos',
         },
       },
       UPDATE: {
@@ -429,14 +429,14 @@ export const PERMISSIONS_GROUPS = {
     },
   },
 
-  METABASE: {
+  ANALYZE: {
     title: {
       'pt-br': 'Analisar | Visualização',
       'en-us': 'Analyze | Visualization',
       'es-es': 'Analizar | Visualización',
     },
     permissions: {
-      OPEN: {
+      METABASE: {
         seqid: 11,
         claim: 'GET /metabase',
         usage: PermissionUsages.PUBLIC,
@@ -446,6 +446,16 @@ export const PERMISSIONS_GROUPS = {
           'es-es': 'Acceso Metabase',
         },
       },
+      INTELLIGENCE: {
+        seqid: 31,
+        claim: 'intelligence:open',
+        usage: PermissionUsages.PUBLIC,
+        name: {
+          'pt-br': 'Acessar Módulo de Inteligência',
+          'en-us': 'Access Intelligence Module',
+          'es-s': 'Acceder Módulo de Inteligencia',
+        },
+      },
     },
   },
 
@@ -456,16 +466,6 @@ export const PERMISSIONS_GROUPS = {
       'es-es': 'Módulos de la Dadosfera',
     },
     permissions: {
-      INTELLIGENCE: {
-        seqid: 31,
-        claim: 'intelligence:open',
-        usage: PermissionUsages.INTERNAL,
-        name: {
-          'pt-br': 'Acessar Módulo de Inteligência',
-          'en-us': 'Access Intelligence Module',
-          'es-s': 'Acceder Módulo de Inteligencia',
-        },
-      },
       APP_BUILDER: {
         seqid: 32,
         claim: 'app-builder:open',
@@ -486,16 +486,6 @@ export const PERMISSIONS_GROUPS = {
           'es-es': 'Acceder Machine Learning',
         },
       },
-      PROCESS: {
-        seqid: 43,
-        claim: 'process:open',
-        usage: PermissionUsages.INTERNAL,
-        name: {
-          'pt-br': 'Acessar Módulo de Processamento',
-          'en-us': 'Access Processing Module',
-          'es-es': 'Acceder Módulo de Tramitación',
-        },
-      },
     },
   },
   USERS: {
@@ -517,6 +507,25 @@ export const PERMISSIONS_GROUPS = {
       },
     },
   },
+  PROCESS: {
+    title: {
+      'pt-br': 'Processar',
+      'en-us': 'Process',
+      'es-es': 'Procesar',
+    },
+    permissions: {
+      TRANSFORMATION: {
+        seqid: 43,
+        claim: 'process:open',
+        usage: PermissionUsages.PUBLIC,
+        name: {
+          'pt-br': 'Acessar Módulo de Transformação',
+          'en-us': 'Access Transformation Module',
+          'es-es': 'Acceder Módulo de transformación',
+        },
+      },
+    },
+  },
   DADOSFERA: {
     title: {
       'pt-br': 'Usuários',

src/authentication/user.decorator.spec.ts

@@ -49,7 +49,7 @@ describe('user.decorator', () => {
   const fakeUserPayload = {
     user_id: 'd50d33c7-6c2b-463c-861f-e21667e7c125',
     username: 'super.admin',
-    permissions: [PERMISSIONS_GROUPS.METABASE.permissions.OPEN].map(
+    permissions: [PERMISSIONS_GROUPS.ANALYZE.permissions.METABASE].map(
       ({ seqid }) => seqid,
     ),
     customer_id: '9d18e8ae-24b9-41a3-9e8f-a25ce57555b11',

src/main.ts

@@ -30,12 +30,8 @@ async function bootstrap() {
 
   await app.listen(3333);
 }
-function configureSwagger(app: INestApplication) {
-  const date = new Date();
-  const swaggerVersion = `${date.getDate()}.${
-    date.getMonth() + 1
-  }.${date.getFullYear()} - ${date.getHours()}:${date.getMinutes()}`;
 
+function configureSwagger(app: INestApplication) {
   let branchName = '';
   try {
     branchName = execSync('git rev-parse --abbrev-ref HEAD')
@@ -50,7 +46,6 @@ function configureSwagger(app: INestApplication) {
   const config = new DocumentBuilder()
     .setTitle(swaggerTitle)
     .setDescription('Documentation for Maestro gateway')
-    .setVersion(swaggerVersion)
     .addBearerAuth(
       { type: 'http', scheme: 'bearer', bearerFormat: 'JWT' },
       'Authorization',
@@ -60,7 +55,6 @@ function configureSwagger(app: INestApplication) {
   const document = SwaggerModule.createDocument(app, config);
 
   if (process.env.ENV === 'local') SwaggerModule.setup('api', app, document);
-
   writeFileSync(
     'docsfera.json',
     JSON.stringify(

src/modules/auth/auth.controller.ts

@@ -7,10 +7,10 @@ import {
   HttpStatus,
   Inject,
   UseFilters,
+  Get,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import {
-  AuthRefreshAccessTokenRequest,
   AuthChangePasswordRequest,
   AuthResetPasswordRequest,
   AuthVerifyResetPasswordCodeRequest,
@@ -21,13 +21,21 @@ import {
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 
 import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
-import { RequireAllPermissions } from 'src/authentication/authentication.decorator';
+import {
+  Authenticated,
+  RequireAllPermissions,
+} from 'src/authentication/authentication.decorator';
 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';
-import { AuthSignInReq, AuthSignInRes } from './dtos/login';
+import {
+  AuthRefreshAccessTokenReq,
+  AuthSignInReq,
+  AuthSignInRes,
+} from './dtos/login';
+import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
 @ApiTags('Auth')
 @UseFilters(new GrpcToHttpExceptionFilter())
@@ -73,12 +81,16 @@ export class AuthController {
   @Post('refresh-access-token')
   @HttpCode(HttpStatus.OK)
   async refreshAccessToken(
-    @Body() { refreshToken }: AuthRefreshAccessTokenRequest,
+    @Body()
+    { refreshToken, customerName: customer_name }: AuthRefreshAccessTokenReq,
     @Headers('Dadosfera-Lang') language: string,
   ) {
     this.logger.info('/auth - RefreshAccessToken');
-    const metadata = new Metadata();
-    metadata.add('language', language || 'pt-br');
+
+    const metadata = PackTheMetadata({
+      customer_name,
+      language,
+    });
 
     return this.authClient.refreshAccessToken({ refreshToken }, metadata);
   }
@@ -185,4 +197,11 @@ export class AuthController {
 
     return this.authClient.verifyTotp({ accessToken, totp });
   }
+
+  @Authenticated()
+  @Get('verify-access-token')
+  @HttpCode(HttpStatus.OK)
+  verifyAccessToken() {
+    return { access_token_status: 'valid' };
+  }
 }

src/modules/auth/dtos/login.ts

@@ -72,6 +72,8 @@ export class AuthCustomer {
   name: string;
   @ApiProperty()
   tier: string;
+  @ApiProperty()
+  scheduleLimit: string;
 }
 
 export class AuthSignInReq implements AuthSignInRequest {
@@ -97,3 +99,10 @@ export class AuthSignInRes implements AuthSignInResponse {
   @ApiPropertyOptional()
   termsOfUse?: TermsOfUseStatus;
 }
+
+export class AuthRefreshAccessTokenReq {
+  @ApiProperty()
+  refreshToken: string;
+  @ApiProperty()
+  customerName: string;
+}

src/modules/catalog/catalog.controller.ts

@@ -10,12 +10,12 @@ import {
   Post,
   Put,
   Query,
-  UnsupportedMediaTypeException,
+  UseFilters,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import {
-  AuthenticateCondition,
   Authenticated,
+  RequireSomePermission,
 } from '../../authentication/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { CatalogService } from './catalog.service';
@@ -33,37 +33,12 @@ import {
   IPreviewResponse,
   IUpdateDataRequest,
 } from './dtos';
+import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
 
-const catalogPermissions = PERMISSIONS_GROUPS.CATALOG.permissions;
 @ApiTags('Catalog')
 @Controller('catalog')
+@UseFilters(new GrpcToHttpExceptionFilter())
 @Authenticated()
-@AuthenticateCondition((req, user: RequestUser) => {
-  if (user.permissions.includes(catalogPermissions.DATA_MANAGER.seqid))
-    return true;
-
-  if (req.path.includes('/manage-permissions')) return true;
-  let action: keyof typeof catalogPermissions;
-
-  switch (req.method) {
-    case 'POST':
-    case 'PUT':
-      action = 'UPDATE';
-      break;
-
-    case 'DELETE':
-      if (req.path.includes('/comment')) action = 'UPDATE';
-      else action = req.method;
-      break;
-
-    default:
-      action = req.method as 'GET';
-  }
-
-  return user.permissions.includes(
-    PERMISSIONS_GROUPS.CATALOG.permissions[action].seqid,
-  );
-})
 export class CatalogController {
   logger: DadosferaLogger;
   constructor(
@@ -75,12 +50,16 @@ export class CatalogController {
   }
 
   @Get()
-  async catalogAll(
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
+  async searchCatalog(
     @User() user: RequestUser,
     @Query() query,
   ): Promise<ICatalogAllResponse> {
     const { user_id, customer_name, customer_id, username, permissions } = user;
-    this.logger.info(`/catalog - Catalog all data assets`, {
+    this.logger.info(`/catalog - searchCatalog`, {
       user_id,
       customer_name,
     });
@@ -100,16 +79,74 @@ export class CatalogController {
       is_data_manager,
     });
 
-    const res = await this.catalogService.getAllOpenSearchDataAssets(
+    const res = await this.catalogService.searchDataAssets(
       query,
       metadata,
       customer_id,
     );
 
-    return { ...res };
+    return res;
+  }
+
+  @Get('data-asset')
+  async findByPipelineAndObject(@User() user: RequestUser, @Query() query) {
+    const { username, user_id, customer_id, customer_name, permissions } = user;
+    const { pipeline, object } = query;
+    this.logger.info(`/catalog - ON GET DATA ASSET BY PIPELINE AND OBJECT`, {
+      username,
+      customer_name,
+    });
+
+    if (!pipeline || !object) {
+      throw new HttpException('Query params not provided', 400);
+    }
+
+    const is_data_manager = permissions.includes(
+      PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
+    );
+    let has_permission = false;
+    const metadata = PackTheMetadata({
+      username,
+      user_id: undefined,
+      customer_id,
+      customer_name,
+    });
+
+    const user_roles = await this.catalogService.getUserRolesIds(user_id);
+
+    const { data_asset } =
+      await this.catalogService.getOneDataAssetByPipelineAndObject({
+        pipeline: query.pipeline,
+        object: query.object,
+        customer_id,
+        metadata,
+      });
+
+    if (data_asset?.owner === username) has_permission = true;
+
+    for (const role of user_roles) {
+      if (data_asset.p_roles.includes(role)) has_permission = true;
+    }
+
+    if (data_asset.p_users.includes(user_id)) has_permission = true;
+
+    if (is_data_manager || has_permission) {
+      delete data_asset.p_roles;
+      delete data_asset.p_users;
+      return { data_asset };
+    }
+
+    throw new HttpException(
+      'You do not have permission to access this data asset.',
+      403,
+    );
   }
 
   @Get('tags')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async findAllTags(@Body() body) {
     this.logger.info(`/catalog - ON FIND ALL TAGS ROUTE`, {
       user: body.info.user_id,
@@ -129,13 +166,16 @@ export class CatalogController {
   }
 
   @Get('data-asset/:id')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async getDataAsset(
     @User() user: RequestUser,
     @Headers() headers,
     @Param('id') id,
   ) {
     const { username, user_id, customer_id, customer_name, permissions } = user;
-    const [data_asset_type, data_asset_id] = id.split('-');
 
     this.logger.info(`/catalog - ON GET ONE DASHBOARD METABASE ROUTE`, {
       username,
@@ -157,8 +197,7 @@ export class CatalogController {
 
     const { data_asset } = await this.catalogService.getOneDataAsset({
       customer_id,
-      data_asset_id,
-      data_asset_type,
+      id,
       metadata,
     });
 
@@ -183,13 +222,16 @@ export class CatalogController {
   }
 
   @Get('data-asset/rls/:id')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async getDataAssetRls(
     @User() user: RequestUser,
     @Headers() headers,
     @Param('id') id,
   ) {
     const { username, user_id, customer_id, customer_name, permissions } = user;
-    const [data_asset_type, data_asset_id] = id.split('-');
 
     this.logger.info(`/catalog - ON GET ONE DASHBOARD METABASE ROUTE`, {
       username,
@@ -211,8 +253,7 @@ export class CatalogController {
 
     const { data_asset } = await this.catalogService.getOneDataAsset({
       customer_id,
-      data_asset_id,
-      data_asset_type,
+      id,
       metadata,
     });
 
@@ -237,23 +278,18 @@ export class CatalogController {
   }
 
   @Get('data-asset/:id/columns-metadata')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async getDataAssetColumnsMetadata(
     @User() user: RequestUser,
     @Headers('Dadosfera-Lang') language,
     @Param('id') id,
   ): Promise<IColumnsMetadataResponse> {
     const { customer_name, customer_id, user_id, username } = user;
-    const data_asset_type = id.split('-')[0];
 
-    const supported_data_assets = ['dataset'];
-
-    if (!supported_data_assets.includes(data_asset_type)) {
-      throw new UnsupportedMediaTypeException(
-        `${data_asset_type} does not have a preview function for the time being.`,
-      );
-    }
-
-    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
+    this.logger.info(`/catalog - columns-metadata`, {
       user_id,
       customer_name,
     });
@@ -273,21 +309,16 @@ export class CatalogController {
   }
 
   @Get('data-asset/:id/preview')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async getDataAssetPreview(
     @User() user: RequestUser,
     @Headers('Dadosfera-lang') language,
     @Param('id') id,
   ): Promise<IPreviewResponse> {
     const { customer_name, customer_id, user_id, username } = user;
-    const data_asset_type = id.split('-')[0];
-
-    const supported_data_assets = ['dataset'];
-
-    if (!supported_data_assets.includes(data_asset_type)) {
-      throw new UnsupportedMediaTypeException(
-        `${data_asset_type} does not have a preview function for the time being.`,
-      );
-    }
 
     this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
       user_id,
@@ -308,21 +339,16 @@ export class CatalogController {
   }
 
   @Get('data-asset/:id/docs')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.GET,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async getDataAssetDocs(
     @User() user: RequestUser,
     @Headers('Dadosfera-Lang') language,
     @Param('id') id,
   ): Promise<IDocsResponse> {
     const { customer_name, customer_id, user_id, username } = user;
-    const data_asset_type = id.split('-')[0];
-
-    const supported_data_assets = ['dataset'];
-
-    if (!supported_data_assets.includes(data_asset_type)) {
-      throw new UnsupportedMediaTypeException(
-        `${data_asset_type} does not have a documentation function for the time being.`,
-      );
-    }
 
     this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
       user_id,
@@ -343,6 +369,10 @@ export class CatalogController {
   }
 
   @Put('data-asset/:id')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async updateDataAsset(
     @User() user: RequestUser,
     @Headers('Dadosfera-Lang') language,
@@ -372,14 +402,17 @@ export class CatalogController {
   }
 
   @Post('data-asset/:id/docs')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async manageDataAssetDocs(
     @User() user: RequestUser,
     @Headers() headers,
-    @Param('id') data_asset_id,
+    @Param('id') table_id: string,
     @Body('docs') docs: string,
   ) {
     const { user_id, customer_name } = user;
-    const [, id] = data_asset_id.split('-');
 
     this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
       user_id,
@@ -387,7 +420,7 @@ export class CatalogController {
     });
 
     const res = await this.catalogService.createDataDocs({
-      table_id: id,
+      table_id,
       docs,
       info: {
         customer: customer_name,
@@ -440,6 +473,10 @@ export class CatalogController {
   }
 
   @Post()
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.CREATE,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async createDataAsset(
     @User() user: RequestUser,
     @Body() body: ICreateDataAsset,
@@ -460,6 +497,10 @@ export class CatalogController {
   }
 
   @Post('data-asset/:id/comment')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async commentOnDataAsset(
     @Param('id') id: string,
     @User() user: RequestUser,
@@ -482,10 +523,11 @@ export class CatalogController {
   }
 
   @Delete('data-asset/:id')
-  async deleteDataAsset(
-    @Param('id') data_asset_id: string,
-    @User() user: RequestUser,
-  ) {
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.DELETE,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
+  async deleteDataAsset(@Param('id') id: string, @User() user: RequestUser) {
     const { customer_id, customer_name, user_id, username } = user;
     const metadata = PackTheMetadata({
       customer_id,
@@ -493,10 +535,8 @@ export class CatalogController {
       user_id,
       username,
     });
-
-    const [type, id] = data_asset_id.split('-');
     const response = await this.catalogService.deleteDataAsset(
-      { id, type },
+      { id, type: undefined },
       metadata,
     );
 
@@ -504,6 +544,10 @@ export class CatalogController {
   }
 
   @Delete('data-asset/:id/comment')
+  @RequireSomePermission(
+    PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
+    PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
+  )
   async deleteComment(
     @Param('id') id: string,
     @User() user: RequestUser,

src/modules/catalog/catalog.service.ts

@@ -18,6 +18,7 @@ import { CatalogClientConfiguration } from './catalog-client';
 import { UsersService } from '../users/users.service';
 import { RolesService } from '../roles/roles.service';
 import { Metadata } from '@grpc/grpc-js';
+import { IUpdateDataRequest } from './dtos';
 
 class CatalogService implements OnModuleInit {
   catalogReadService: ReadService.CatalogReadServices;
@@ -60,15 +61,11 @@ class CatalogService implements OnModuleInit {
 
   async createDataAsset(data: Messages.CreateDataAssetRequest, metadata) {
     this.logger.info('CatalogService - Manage Data assets permissions');
+    if (!data.embed) data.embed = undefined;
 
     return lastValueFrom(
       this.catalogWriteService.CreateDataAsset(data, metadata),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 404,
-      );
-    });
+    );
   }
 
   async managePermissions(data: Messages.ManagePermissionRequest, metadata) {
@@ -144,34 +141,12 @@ class CatalogService implements OnModuleInit {
     return roles_ids;
   }
 
-  async getUsernamesAndRolesByCustomerId(customerId: string) {
-    const resultUsers = await this.userService.findAllUsersByCustomerId(
-      customerId,
-    );
-    const resultRoles = await this.roleService.roleSearch(
-      {},
-      { customer_id: customerId },
-    );
-
-    const customer_users = resultUsers.users.map((user) => {
-      return {
-        id: user.id,
-        username: user.username,
-      };
-    });
-
-    const customer_roles = resultRoles.roles.map((role) => {
-      return {
-        id: role.id,
-        name: role.name,
-      };
-    });
-
-    return [customer_users, customer_roles];
-  }
-
-  async getAllOpenSearchDataAssets(query, metadata, customer_id) {
-    this.logger.info('CatalogService - getAllOpenSearchDashboard');
+  async searchDataAssets(
+    query: Record<string, any>,
+    metadata: Metadata,
+    customer_id: string,
+  ) {
+    this.logger.info('CatalogService - searchDataAssets');
 
     const { search, page, size, sort_by, order, ...filters } = query;
 
@@ -187,171 +162,103 @@ class CatalogService implements OnModuleInit {
         },
         metadata,
       ),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 404,
-      );
-    });
+    );
 
     const result = JSON.parse(data_assets);
 
-    const [customer_users, customer_roles] =
-      await this.getUsernamesAndRolesByCustomerId(customer_id);
+    const response = await this.getAssetsUsersAndRoles(
+      result.data_assets,
+      customer_id,
+    );
 
-    for (const asset of result.data_assets) {
-      const condition =
-        asset.owner && !asset.owner.includes('@') ? true : false;
-      const result = condition
-        ? await this.userService.findOneById(asset.owner).catch(() => null)
-        : null;
-
-      const owner = result !== null ? result.user.username : null;
-
-      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: result.data_assets, total };
+    return { data_assets: response, total };
   }
 
-  async getOneDataAsset({
-    data_asset_id,
-    data_asset_type,
-    customer_id,
-    metadata,
+  async getOneDataAsset(data: {
+    id: string;
+    customer_id: string;
+    metadata: Metadata;
   }) {
+    const { customer_id, id, metadata } = data;
     const { data_asset } = await lastValueFrom(
       this.catalogReadService.GetOneDataAsset(
-        { id: data_asset_id, type: data_asset_type },
+        { id, type: undefined },
         metadata,
       ),
     );
-    const opensearchTable = JSON.parse(data_asset);
+    let asset = JSON.parse(data_asset);
+    asset = {
+      ...asset,
+      p_roles: asset.roles,
+      p_users: asset.users,
+    };
+    asset = await this.getAssetsUsersAndRoles([asset], customer_id);
 
-    const result = opensearchTable.owner
-      ? await this.userService
-          .findOneById(opensearchTable.owner)
-          .catch(() => null)
-      : null;
-
-    const owner = result !== null ? result.user.username : null;
-
-    const [customer_users, customer_roles] =
-      await this.getUsernamesAndRolesByCustomerId(customer_id);
-
-    const users = [];
-    const roles = [];
-
-    for (const role of customer_roles) {
-      for (const role_id of opensearchTable.roles) {
-        if (role.id === role_id) roles.push(role);
-      }
-    }
-
-    for (const user of customer_users) {
-      for (const user_id of opensearchTable.users) {
-        if (user.id === user_id) users.push(user);
-      }
-    }
-
-    Object.assign(opensearchTable, {
-      p_roles: opensearchTable.roles,
-      p_users: opensearchTable.users,
-      roles,
-      users,
-      owner,
-    });
-
-    return { data_asset: opensearchTable };
+    return { data_asset: asset[0] };
   }
 
-  async updateOneDataAsset({ data_asset_id, customer_id, body, metadata }) {
+  async getOneDataAssetByPipelineAndObject(data: {
+    customer_id: string;
+    pipeline: string;
+    object: string;
+    metadata: Metadata;
+  }) {
+    const { customer_id, metadata, pipeline, object } = data;
+    const { data_asset } = await lastValueFrom(
+      this.catalogReadService.GetOneDataAssetByPipelineAndObject(
+        { pipeline, object },
+        metadata,
+      ),
+    );
+    let asset = JSON.parse(data_asset);
+    asset = {
+      ...asset,
+      p_roles: asset.roles,
+      p_users: asset.users,
+    };
+    asset = await this.getAssetsUsersAndRoles([asset], customer_id);
+
+    return { data_asset: asset[0] };
+  }
+
+  async updateOneDataAsset(data: {
+    data_asset_id: string;
+    customer_id: string;
+    body: IUpdateDataRequest;
+    metadata: Metadata;
+  }) {
+    const { body, customer_id, data_asset_id, metadata } = data;
+
     const { data_asset } = await lastValueFrom(
       this.catalogWriteService.UpdateDataAsset(
         { id: data_asset_id, changes: JSON.stringify(body) },
         metadata,
       ),
     );
+    let asset = JSON.parse(data_asset);
+    asset = {
+      ...asset,
+      p_roles: asset.roles,
+      p_users: asset.users,
+    };
+    asset = await this.getAssetsUsersAndRoles([asset], customer_id);
 
-    const opensearchTable = JSON.parse(data_asset);
-
-    const result = opensearchTable.owner
-      ? await this.userService
-          .findOneById(opensearchTable.owner)
-          .catch(() => null)
-      : null;
-
-    const owner = result !== null ? result.user.username : null;
-
-    const [customer_users, customer_roles] =
-      await this.getUsernamesAndRolesByCustomerId(customer_id);
-
-    const users = [];
-    const roles = [];
-
-    for (const role of customer_roles) {
-      for (const role_id of opensearchTable.roles) {
-        if (role.id === role_id) roles.push(role);
-      }
-    }
-
-    for (const user of customer_users) {
-      for (const user_id of opensearchTable.users) {
-        if (user.id === user_id) users.push(user);
-      }
-    }
-
-    Object.assign(opensearchTable, {
-      p_roles: opensearchTable.roles,
-      p_users: opensearchTable.users,
-      roles,
-      users,
-      owner,
-    });
-
-    return { data_asset: opensearchTable };
+    return { data_asset: asset[0] };
   }
 
-  async getDataDocs(data_asset_id: string, metadata: Metadata) {
-    const [data_asset_type, id] = data_asset_id.split('-');
-
+  async getDataDocs(id: string, metadata: Metadata) {
     const { documentation } = await lastValueFrom(
-      this.catalogReadService.GetDatasetDoc(
-        { id, type: data_asset_type },
-        metadata,
-      ),
+      this.catalogReadService.GetDatasetDoc({ id, type: undefined }, metadata),
     );
     console.log(documentation);
     const docs = JSON.parse(documentation);
     return docs;
   }
 
-  async getDatasetPreview(data_asset_id: string, metadata: Metadata) {
-    const [data_asset_type, id] = data_asset_id.split('-');
-
+  async getDatasetPreview(id: string, metadata: Metadata) {
     const { preview } = await lastValueFrom(
       this.catalogReadService.GetDatasetPreview(
-        { id, type: data_asset_type },
+        { id, type: undefined },
         metadata,
       ),
     );
@@ -359,12 +266,10 @@ class CatalogService implements OnModuleInit {
     return result;
   }
 
-  async getDatasetColumnsMetadata(data_asset_id: string, metadata: Metadata) {
-    const [data_asset_type, id] = data_asset_id.split('-');
-
+  async getDatasetColumnsMetadata(id: string, metadata: Metadata) {
     const { columns_metadata } = await lastValueFrom(
       this.catalogReadService.GetDatasetColumnsMetadata(
-        { id, type: data_asset_type },
+        { id, type: undefined },
         metadata,
       ),
     );
@@ -398,6 +303,36 @@ class CatalogService implements OnModuleInit {
 
     return response;
   }
+  async getAssetsUsersAndRoles(data_assets: Array<any>, customer_id: string) {
+    const { users: customer_users } =
+      await this.userService.findAllUsersByCustomerId(customer_id);
+    const { roles: customer_roles } = await this.roleService.roleSearch(
+      {},
+      { customer_id },
+    );
+    return data_assets.map((data_asset) => {
+      const owner = customer_users.find(
+        (u) => u.id === data_asset.owner,
+      )?.username;
+
+      const roles = [];
+      const users = [];
+      for (const role_id of data_asset.roles) {
+        const role = customer_roles.find((r) => r.id === role_id);
+        if (role) roles.push({ id: role.id, name: role.name });
+      }
+      for (const user_id of data_asset.users) {
+        const user = customer_users.find((r) => r.id === user_id);
+        if (user) users.push({ id: user.id, username: user.username });
+      }
+      return {
+        ...data_asset,
+        roles,
+        users,
+        owner,
+      } as typeof data_asset;
+    });
+  }
 }
 
 export { CatalogService };

src/modules/catalog/dtos/index.ts

@@ -1,6 +1,10 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { CreateDataAssetRequest } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages';
 
+export class EmbedObject {
+  @ApiProperty()
+  url: string;
+}
 export class IRole {
   @ApiProperty()
   name: string;
@@ -49,8 +53,8 @@ export class IDataAsset {
   data_encrypted?: string;
   @ApiPropertyOptional()
   num_rows?: number;
-  @ApiPropertyOptional()
-  display_name?: string;
+  @ApiProperty()
+  display_name: string;
   @ApiProperty()
   pipeline_id: string;
   @ApiProperty()
@@ -75,12 +79,14 @@ export class IDataAsset {
   parameters?: string[];
   @ApiPropertyOptional()
   embedding_params?: object;
-  @ApiPropertyOptional()
-  created_at?: string;
+  @ApiProperty()
+  created_at: string;
   @ApiPropertyOptional()
   updated_at?: string;
   @ApiProperty({ type: [IComment] })
   comments: IComment[];
+  @ApiPropertyOptional()
+  embed?: EmbedObject;
 }
 
 export class IOneDataAsset {
@@ -127,8 +133,9 @@ export class IUpdateDataRequest {
   description: string;
   @ApiProperty()
   tags: string[];
+  @ApiPropertyOptional()
+  embed: EmbedObject;
 }
-
 export class ICreateDataAsset implements CreateDataAssetRequest {
   @ApiProperty()
   display_name: string;
@@ -140,6 +147,8 @@ export class ICreateDataAsset implements CreateDataAssetRequest {
   external_url: string;
   @ApiProperty()
   location: string;
+  @ApiPropertyOptional()
+  embed: EmbedObject;
 }
 
 export class IPreview {

src/modules/connection/client.service.ts

@@ -1,9 +1,4 @@
-import {
-  OnModuleInit,
-  Inject,
-  HttpException,
-  HttpStatus,
-} from '@nestjs/common';
+import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 import { ConnectionManager } from '@dadosfera/protospack-v2';
 import { lastValueFrom } from 'rxjs';
@@ -86,12 +81,7 @@ export class ConnectionClientService implements OnModuleInit {
         },
         metadata,
       ),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 400,
-      );
-    });
+    );
   }
 
   async updateConnection(
@@ -112,12 +102,7 @@ export class ConnectionClientService implements OnModuleInit {
         },
         metadata,
       ),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 400,
-      );
-    });
+    );
   }
 
   async deleteConnection({ body, metadata }): Promise<ConnectionRes> {
@@ -130,12 +115,7 @@ export class ConnectionClientService implements OnModuleInit {
         },
         metadata,
       ),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 400,
-      );
-    });
+    );
   }
 
   async getAllConnections({ body, metadata }): Promise<ConnectionsRes> {
@@ -146,12 +126,7 @@ export class ConnectionClientService implements OnModuleInit {
         { search, filters: JSON.stringify(filters), size, page },
         metadata,
       ),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 400,
-      );
-    });
+    );
   }
 
   async getConnectionDetails({
@@ -162,12 +137,7 @@ export class ConnectionClientService implements OnModuleInit {
 
     return lastValueFrom(
       this.connectionServiceRead.GetConnectionDetails({ id }, metadata),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 400,
-      );
-    });
+    );
   }
 
   async INTERNAL_getAllConnections({

src/modules/connection/connection.controller.ts

@@ -9,6 +9,7 @@ import {
   Get,
   Headers,
   Query,
+  UseFilters,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { ConnectionClientService } from './client.service';
@@ -28,8 +29,10 @@ import {
 } from './dtos/connection';
 import { CreateConnectionDto } from './dtos/connection';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
+import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
 
 const connectionPermissions = PERMISSIONS_GROUPS.CONNECTION.permissions;
+@UseFilters(new GrpcToHttpExceptionFilter())
 @ApiTags('connections')
 @ApiBearerAuth()
 @Authenticated()
@@ -161,11 +164,15 @@ export class ConnectionController {
     @Headers('Dadosfera-Lang') language,
     @User() user: RequestUser,
     @Param('id') id,
-    @Query('details') details,
+    @Query() queries,
   ): Promise<ConnectionDetailsRes> {
     this.logger.info('/connections - Get Connection Details');
     if (!language) language = 'en-us';
 
+    console.log(queries);
+
+    const { details, sensitive } = queries;
+
     const { user_id, customer_id, customer_name, username } = user;
     const metadata = PackTheMetadata({
       user_id,
@@ -174,6 +181,7 @@ export class ConnectionController {
       username,
       details,
       language,
+      sensitive,
     });
 
     const response: any = await this.clientService.getConnectionDetails({

src/modules/connector/client.service.ts

@@ -83,163 +83,30 @@ export class ConnectorClientService implements OnModuleInit {
       );
     });
     const responseParsed = JSON.parse(res.message);
-    const connectorErrors = responseParsed.items
-      .filter((i) => i.update._index === 'connectors' && i.update.error)
+    const connectorsResponse = responseParsed.items.filter(
+      (i) => i.update._index === process.env.CONNECTORS_INDEX,
+    );
+    const connectorErrors = connectorsResponse
+      .filter((i) => 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 === 'connectors' && 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 === 'connectors' && 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 === 'connectors' && 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,
+        id: i.update?._id,
+        reason: i.update?.error,
+        status: i.error?.status,
       }));
+    const connectorCreated = connectorsResponse
+      .filter((i) => i.update.result === 'created')
+      .map((i) => i.update._id);
+    const connectorUpdated = connectorsResponse
+      .filter((i) => i.update.result === 'updated')
+      .map((i) => i.update._id);
+    const connectorNoop = connectorsResponse
+      .filter((i) => i.update.result === 'noop')
+      .map((i) => 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,
-      },
+      errors: connectorErrors,
+      created: connectorCreated,
+      updated: connectorUpdated,
+      noop: connectorNoop,
     };
   }
 
@@ -318,12 +185,7 @@ export class ConnectorClientService implements OnModuleInit {
         version,
         plugin,
       }),
-    ).catch((err) => {
-      throw new HttpException(
-        err.details,
-        err.code === 6 ? HttpStatus.CONFLICT : 400,
-      );
-    });
+    );
   }
 
   async updateConnector({ plugin, changes }) {

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 { DeleteConnectorDto } from './dtos/delete-connector';
 import { GetAllDto } from './dtos/get-all';
 import { RemoveTagDto } from './dtos/remove-tag';
 import { UpdateDto } from './dtos/update';
@@ -274,7 +273,7 @@ export class ConnectorController {
   @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE)
   async deleteConnector(
     @Param('plugin') plugin: string,
-    @Body() { version }: DeleteConnectorDto,
+    @Query('version') version: string,
   ) {
     this.logger.info('/upload - Upload Connector Route');
 

src/modules/inputs/dtos/input.model.ts

@@ -1,106 +1,5 @@
 import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
-import { Info } from 'protospack/dist/lib/interfaces';
 
-export class GoogleAnalyticsClientSecrets {
-  @ApiProperty()
-  type: string;
-  @ApiProperty()
-  project_id: string;
-  @ApiProperty()
-  private_key_id: string;
-  @ApiProperty()
-  private_key: string;
-  @ApiProperty()
-  client_email: string;
-  @ApiProperty()
-  client_id: string;
-  @ApiProperty()
-  auth_uri: string;
-  @ApiProperty()
-  token_uri: string;
-  @ApiProperty()
-  auth_provider_x509_cert_url: string;
-  @ApiProperty()
-  client_x509_cert_url: string;
-}
-export class OauthObject {
-  @ApiPropertyOptional()
-  get_tokens_url: string;
-  @ApiPropertyOptional()
-  get_tokens_url_params: string;
-  @ApiPropertyOptional()
-  get_tokens_set_response: Record<string, any>;
-  @ApiPropertyOptional()
-  content_type: string;
-}
-export class InputOptions {
-  @ApiPropertyOptional()
-  oauth: OauthObject;
-  @ApiPropertyOptional()
-  skip_select_columns: true;
-  @ApiPropertyOptional()
-  skip_select_entities: false;
-  @ApiPropertyOptional()
-  skip_transformation: true;
-}
-export class FileFormatParams {
-  @ApiProperty()
-  sep: string;
-  @ApiProperty()
-  header: boolean;
-  @ApiProperty()
-  encoding: string;
-}
-
-export class AuthParameters {
-  @ApiProperty()
-  aws_access_key_id: string;
-  @ApiProperty()
-  aws_secret_access_key: string;
-}
-export class CredentialsJdbc {
-  @ApiPropertyOptional()
-  jdbc_user: string;
-  @ApiPropertyOptional()
-  jdbc_password: string;
-  @ApiPropertyOptional()
-  database: string;
-  @ApiPropertyOptional()
-  endpoint: string;
-  @ApiPropertyOptional()
-  port: string;
-  @ApiPropertyOptional()
-  engine: string;
-  @ApiPropertyOptional()
-  schema: string;
-}
-export class Credentials extends CredentialsJdbc {
-  @ApiProperty()
-  connection_type: string;
-
-  @ApiPropertyOptional()
-  client_aws_access_key_id: string;
-  @ApiPropertyOptional()
-  client_aws_secret_access_key: string;
-  @ApiPropertyOptional()
-  client_bucket: string;
-  @ApiPropertyOptional()
-  file_to_extract: string;
-  @ApiPropertyOptional()
-  file_format_params: FileFormatParams;
-
-  @ApiPropertyOptional()
-  view_id: string;
-  @ApiPropertyOptional()
-  client_secrets: GoogleAnalyticsClientSecrets;
-  @ApiPropertyOptional()
-  start_date: string;
-  @ApiPropertyOptional()
-  end_date: string;
-
-  @ApiPropertyOptional()
-  oauth_code: string;
-}
 export class Column {
   @ApiProperty()
   name: string;
@@ -114,6 +13,14 @@ export class TableColumns {
   columns: string[];
   @ApiProperty()
   references: Column[];
+  @ApiProperty()
+  type: string;
+}
+export class AvailableEntity {
+  @ApiProperty()
+  name: string;
+  @ApiProperty()
+  replication_methods: string[];
 }
 
 export class Input {
@@ -133,26 +40,6 @@ export class Input {
   created_at: string;
   @ApiProperty()
   updated_at: string;
-
-  //deprecated attributes (for retro compatibility)
-  @ApiPropertyOptional({ deprecated: true })
-  category: string;
-  @ApiPropertyOptional({ deprecated: true })
-  credentials: Credentials;
-  @ApiPropertyOptional({ deprecated: true })
-  options: InputOptions;
-  @ApiPropertyOptional({ deprecated: true })
-  info: Info;
-  @ApiPropertyOptional({ deprecated: true })
-  cron: string;
-  @ApiPropertyOptional({ deprecated: true })
-  source_bucket: string;
-  @ApiPropertyOptional({ deprecated: true })
-  source_prefix: string;
-  @ApiPropertyOptional({ deprecated: true })
-  auth_parameters: AuthParameters;
-  @ApiPropertyOptional({ deprecated: true })
-  file_format_params: FileFormatParams;
 }
 export class GetAvailableEntitiesReq {
   @ApiProperty()
@@ -160,43 +47,10 @@ export class GetAvailableEntitiesReq {
 }
 
 export class GetAvailableEntitiesRes {
-  @ApiProperty()
-  entities: string[];
+  @ApiProperty({ type: [AvailableEntity] })
+  entities: AvailableEntity[];
 }
 
-export class TestConnectionGetColumnsReq {
-  @ApiProperty()
-  plugin: string;
-  @ApiProperty()
-  tables: string[];
-  @ApiPropertyOptional()
-  credentials: CredentialsJdbc;
-  @ApiPropertyOptional()
-  id: string;
-  @ApiPropertyOptional()
-  info: Info;
-}
-export class TestConnectionGetColumnsRes {
-  @ApiProperty({ type: [TableColumns] })
-  tables: TableColumns[];
-}
-
-export class TestConnectionReq {
-  @ApiProperty()
-  plugin: string;
-  @ApiProperty()
-  credentials: CredentialsJdbc;
-  @ApiPropertyOptional()
-  info: Info;
-}
-export class TestConnectionRes {
-  @ApiProperty()
-  connection_state: boolean;
-  @ApiProperty()
-  total_entities: number;
-  @ApiProperty()
-  database_tables: string[];
-}
 export class CreateInputReq extends OmitType(Input, [
   'id',
   'created_at',

src/modules/inputs/inputs.controller.ts

@@ -19,16 +19,10 @@ import {
   GetAvailableEntitiesReq,
   GetAvailableEntitiesRes,
   Input,
-  TestConnectionGetColumnsReq,
-  TestConnectionGetColumnsRes,
-  TestConnectionReq,
-  TestConnectionRes,
 } from './dtos/input.model';
 import { UpdateInputRequest } from './dtos/old_interfaces';
 import { RequestUser, User } from 'src/authentication/user.decorator';
 import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
-import ErrorBuilder from 'src/utils/ErrorBuilder';
-import ErrorCodes from 'src/utils/errorCodes';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
 
 @ApiTags('Inputs')
@@ -75,42 +69,19 @@ export class InputsController {
   @Get('available-entities/:plugin')
   @ApiOkResponse({ type: GetAvailableEntitiesRes })
   async getAvailableEntities(
-    @Body() body,
     @Param() params: GetAvailableEntitiesReq,
+    @User() user: RequestUser,
   ) {
-    const { info } = body;
     const { plugin } = params;
-    return await this.inputService.getAvailableEntities({ info, plugin });
-  }
-
-  @Post('/test-connection')
-  @ApiOkResponse({ type: TestConnectionRes })
-  async testConnection(@Body() data: TestConnectionReq) {
-    this.logger.info(`/test-connection - ON TEST CONNECTION ROUTE`, {
-      user: data.info.user_id,
-      customer: data.info.customer,
-    });
-
-    const response = await this.inputService.testConnection(data);
-
-    return response;
-  }
-
-  @Post('/test-connection/get-columns')
-  @ApiOkResponse({ type: TestConnectionGetColumnsRes })
-  async getColumns(@Body() data: TestConnectionGetColumnsReq) {
-    throw new ErrorBuilder(ErrorCodes.NOT_IMPLEMENTED);
-    this.logger.info(
-      `/test-connection/get-columns - ON TEST CONNECTION GET COLUMNS ROUTE`,
-      {
-        user: data.info.user_id,
-        customer: data.info.customer,
+    const availableEntities = await this.inputService.getAvailableEntities({
+      info: {
+        customer: user.customer_name,
+        customer_id: user.customer_id,
+        user_id: user.user_id,
       },
-    );
-
-    const response = await this.inputService.getColumns(data);
-
-    return response;
+      plugin,
+    });
+    return availableEntities;
   }
 
   @Post()

src/modules/inputs/inputs.service.ts

@@ -14,10 +14,10 @@ import { objectCamelToSnake } from 'src/utils/CaseConverter';
 import { IIdRequest, UpdateInputRequest } from './dtos/old_interfaces';
 import { Input } from '@dadosfera/protospack-v2';
 import {
+  GetAvailableEntitiesRequest,
   InputCreateGenericRequest,
   InputCreateS3Request,
   InputNewCreateRequest,
-  TestConnectionGetColumnsRequest,
   TestConnectionRequest,
 } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/messages';
 import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
@@ -88,32 +88,6 @@ export class InputsService {
 
       return testConnectionResponse;
     },
-    getColumns: async (data: TestConnectionGetColumnsRequest) => {
-      this.logger.info('InputClientService - TestConnection/Get-Columns');
-      const getColumnsResponse = await new Promise((resolve, reject) => {
-        this.inputReadService.GetColumns(data).subscribe({
-          next(x) {
-            resolve(objectCamelToSnake(x));
-          },
-          error(err) {
-            reject(err);
-          },
-          complete() {
-            // console.log('done');
-          },
-        });
-      })
-        .then((res) => {
-          this.logger.info('Done');
-          return res;
-        })
-        .catch((err) => {
-          this.logger.error(err.message);
-          throw new Error(err);
-        });
-
-      return getColumnsResponse;
-    },
     getAvailableEntities: async (data) => {
       this.logger.info('InputClientService - GetAvailableEntities');
       data;
@@ -188,12 +162,9 @@ export class InputsService {
     // this.validateCron(data);
     const { body, info } = data;
 
-    if (body.info) delete body.info;
-
-    const inputCreateGenericRequest: any | InputCreateGenericRequest = {
+    const inputCreateGenericRequest: InputCreateGenericRequest = {
       input: {
         ...body,
-        credentials: body.credentials && JSON.stringify(body.credentials),
       },
       info,
     };
@@ -205,8 +176,8 @@ export class InputsService {
     return { input: adjustedInput };
   }
 
-  async getAvailableEntities(data): Promise<{ entities: string[] }> {
-    return await this.OLD_inputClient.getAvailableEntities(data);
+  async getAvailableEntities(data: GetAvailableEntitiesRequest) {
+    return lastValueFrom(this.inputReadService.GetAvailableEntities(data));
   }
 
   async findAll(info: Info) {
@@ -263,17 +234,6 @@ export class InputsService {
     }
   }
 
-  async getColumns(data) {
-    try {
-      const testConnectionGetColumnsResponse =
-        await this.OLD_inputClient.getColumns(data);
-
-      return testConnectionGetColumnsResponse;
-    } catch (err) {
-      throw new HttpException(err.message, HttpStatus.NOT_FOUND);
-    }
-  }
-
   generateInputS3Payload(payload) {
     const { credentials, plugin, cron } = payload;
     if (!credentials) return payload;

src/modules/mixpanel/mixpanel.controller.ts

@@ -1,7 +1,9 @@
 import { Body, Controller, Inject, Param, Post } from '@nestjs/common';
 import { init } from 'mixpanel';
+import { Authenticated } from 'src/authentication/authentication.decorator';
 import { RequestUser, User } from 'src/authentication/user.decorator';
 
+@Authenticated()
 @Controller('trackEvent')
 export class MixpanelController {
   constructor(

src/modules/oauth/oauth.controller.ts

@@ -148,10 +148,16 @@ export class OauthController {
     const { customer_id, customer_name, user_id } = connectionInfo;
 
     try {
-      const response = await this.connectionService.createConnection(
-        connectionInfo,
-        PackTheMetadata({ customer_id, customer_name, user_id }),
-      );
+      const response = connectionInfo.id
+        ? await this.connectionService.updateConnection(
+            connectionInfo.id,
+            connectionInfo,
+            PackTheMetadata({ customer_id, customer_name, user_id }),
+          )
+        : await this.connectionService.createConnection(
+            connectionInfo,
+            PackTheMetadata({ customer_id, customer_name, user_id }),
+          );
       url.searchParams.set('connection_id', response.connection.id);
       return { url: url.href };
     } catch (error) {

src/modules/oauth/oauth.service.ts

@@ -23,6 +23,7 @@ export class OauthService {
       user_id,
       customer_id,
       customer_name,
+      id,
     } = query;
 
     const properties = { plugin, credentials_type: 'oauth' };
@@ -45,6 +46,7 @@ export class OauthService {
       type,
       properties,
       plugin,
+      id,
     };
     return jwt.sign({ ...newConnection }, process.env.JWT_PRIVATE_KEY);
   }

src/modules/pipelinesV2/interfaces.ts

@@ -66,3 +66,23 @@ export interface IGetPipelineLogsRequest {
   id: string;
   details: string;
 }
+
+export class IUploadCSVFile {
+  @ApiProperty({ format: 'binary' })
+  file: string;
+
+  @ApiProperty()
+  name: string;
+
+  @ApiProperty()
+  description: string;
+
+  @ApiProperty()
+  encoding: string;
+
+  @ApiProperty()
+  sep: string;
+
+  @ApiProperty()
+  header: boolean;
+}

src/modules/pipelinesV2/pipelines.controller.ts

@@ -12,13 +12,21 @@ import {
   UseFilters,
   HttpCode,
   HttpStatus,
+  Patch,
+  UseInterceptors,
+  UploadedFile,
+  HttpException,
 } from '@nestjs/common';
 import {
+  ApiConsumes,
   ApiCreatedResponse,
   ApiNoContentResponse,
   ApiTags,
 } from '@nestjs/swagger';
-import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
+import {
+  AuthenticateCondition,
+  RequireAllPermissions,
+} from 'src/authentication/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { PipelinesService } from './pipelines.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
@@ -27,8 +35,13 @@ import { RequestUser, User } from 'src/authentication/user.decorator';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
 import { PipelinesService as OldPipelineService } from 'src/modules/pipelines/pipelines.service';
-import { ICreatePipelineV2Req, IPipelineV2 } from './interfaces';
+import {
+  ICreatePipelineV2Req,
+  IPipelineV2,
+  IUploadCSVFile,
+} from './interfaces';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
+import { FileInterceptor } from '@nestjs/platform-express';
 
 @UseFilters(new GrpcToHttpExceptionFilter())
 @ApiTags('PipelinesV2')
@@ -45,6 +58,10 @@ import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filt
       action = 'UPDATE';
       break;
 
+    case 'PATCH':
+      action = 'UPDATE';
+      break;
+
     default:
       action = req.method;
   }
@@ -116,6 +133,39 @@ export class PipelinesController {
     };
   }
 
+  @Get('/download-logs')
+  async downloadLogs(
+    @User() user: RequestUser,
+    @Headers('Dadosfera-Lang') language,
+    @Query() query,
+  ) {
+    this.logger.info('PipelinesController - downloadLogs', { user });
+
+    if (!language) language = 'en-us';
+
+    if (!query) {
+      throw new HttpException('Query params not provided', 400);
+    }
+
+    const { customer_id, customer_name, user_id, username } = user;
+    const metadata = PackTheMetadata({
+      customer_id,
+      customer_name,
+      user_id,
+      username,
+      language,
+    });
+
+    const url = await this.pipelinesClientService.downloadLogs(
+      query.pipeline_run_id,
+      metadata,
+    );
+
+    return {
+      url,
+    };
+  }
+
   @Get(':id/config')
   async getPipelineproperties(
     @Headers('Dadosfera-Lang') language,
@@ -130,6 +180,20 @@ export class PipelinesController {
     return this.pipelinesClientService.findOneProperties(id, metadata);
   }
 
+  @Get(':id/objects')
+  async getPipelineObjects(
+    @Headers('Dadosfera-Lang') language,
+    @User() user: RequestUser,
+    @Param('id') id,
+  ) {
+    this.logger.info('PipelinesController - getPipelineObjects', { user });
+    const metadata = PackTheMetadata({
+      ...user,
+      language: language || 'pt-br',
+    });
+    return this.pipelinesClientService.findOneObjects(id, metadata);
+  }
+
   @Get('/:id')
   async findOne(
     @Headers('Dadosfera-Lang') language,
@@ -175,20 +239,49 @@ export class PipelinesController {
 
   @Put('/:id')
   async update(
+    @Headers('Dadosfera-Lang') language,
     @Body() updatePipelineDto,
     @Param('id') id,
     @User() user: RequestUser,
   ) {
-    this.logger.info('PipelinesController - findOne', { user });
+    this.logger.info('PipelinesController - update', { user });
     const { info } = updatePipelineDto;
     delete updatePipelineDto.info;
 
-    const response = await this.pipelinesClientService.update({
-      ...updatePipelineDto,
-      info,
-      id,
+    const { customer_id, customer_name, user_id, username } = user;
+    if (!language) language = 'en-us';
+
+    const metadata = PackTheMetadata({
+      customer_id,
+      customer_name,
+      user_id,
+      username,
+      language,
     });
 
+    const response = await this.pipelinesClientService.update(
+      {
+        ...updatePipelineDto,
+        info,
+        id,
+      },
+      metadata,
+    );
+
+    this.logger.info('PipelinesController - update: OK', { user });
+    return response;
+  }
+
+  @Patch('/:id')
+  async updateByPatch(
+    @Headers('Dadosfera-Lang') language,
+    @Body() updatePipelineDto,
+    @Param('id') id,
+    @User() user: RequestUser,
+  ) {
+    this.logger.info('PipelinesController - patch', { user });
+    const response = await this.update(language, updatePipelineDto, id, user);
+    this.logger.info('PipelinesController - patch: OK', { user });
     return response;
   }
 
@@ -206,4 +299,74 @@ export class PipelinesController {
     await this.pipelinesClientService.remove({ id, metadata, user });
     this.logger.info('PipelinesController - delete: OK');
   }
+
+  @Post('/upload')
+  @RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE)
+  @ApiConsumes('multipart/form-data')
+  @UseInterceptors(
+    FileInterceptor('file', { limits: { fileSize: 50 * 1000 * 1000 + 1 } }),
+  )
+  async uploadFile(
+    @User() user: RequestUser,
+    @UploadedFile() file,
+    @Body() body: IUploadCSVFile,
+  ) {
+    this.logger.info('/upload - Upload Connector Route');
+    const metadata = PackTheMetadata({ ...user });
+
+    const parts_of_file_name = file.originalname.split('.');
+    const file_format = parts_of_file_name.pop();
+    const file_name = parts_of_file_name.join('.');
+    let name = `${new Date().getTime()}_${file_name}`;
+    body.name ? (name = `${new Date().getTime()}_${body.name}`) : name;
+
+    const source_prefix = `${user.customer_name}/${name}.${file_format}`;
+
+    const response = await this.pipelinesClientService.uploadFile(
+      {
+        file,
+        name,
+      },
+      metadata,
+    );
+
+    if (!response.url) {
+      this.logger.info('pipeline/upload - Failed File pipeline');
+      throw new HttpException(
+        'Upload failed, try again in a few minutes, if the problem persists, contact support.',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+
+    const { sep, header, encoding, description } = body;
+
+    const upload_pipeline = {
+      connection_id: process.env.UPLOAD_FILE_AGENT_CONNECTION,
+      connector_name: 'Amazon S3',
+      connector_plugin: 'aws_s3',
+      connector_version: '1.0.0',
+      image_url: 'https://assets.dadosfera.ai/images/connectors/csv.svg',
+      name: body.name || file_name,
+      description,
+      transformations_ids: [],
+      tags: [],
+      cron: '@once',
+      config: { cron: '@once', tables: [] },
+      properties: {
+        engine: 'csv',
+        source_bucket: process.env.BUCKET_CUSTOMER_CSV_ASSETS,
+        source_prefix,
+        file_format_params: { sep, encoding, header: Boolean(header) },
+        is_a_upload_csv: true,
+      },
+      input_id: undefined,
+    };
+
+    const pipeline = await this.pipelinesClientService.create(
+      upload_pipeline,
+      metadata,
+    );
+
+    return pipeline;
+  }
 }

src/modules/pipelinesV2/pipelines.service.ts

@@ -1,7 +1,8 @@
 import {
   BadRequestException,
+  HttpException,
+  HttpStatus,
   Inject,
-  InternalServerErrorException,
   OnModuleInit,
 } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
@@ -23,6 +24,8 @@ import { InputsService } from '../inputs/inputs.service';
 import { RequestUser } from 'src/authentication/user.decorator';
 import { TransformationsService } from '../transformations/transformations.service';
 import { getObjValueFromPath } from 'src/utils/ObjValueFromPath';
+import ErrorCodes from 'src/utils/errorCodes';
+import ErrorBuilder from 'src/utils/ErrorBuilder';
 
 export class PipelinesService implements OnModuleInit {
   logger: DadosferaLogger;
@@ -99,7 +102,7 @@ export class PipelinesService implements OnModuleInit {
         const [errorType, message] = error.details.split('|');
         throw new BadRequestException(message);
       }
-      throw new InternalServerErrorException(error.details);
+      throw new ErrorBuilder(error.details);
     });
     this.logger.info('Done');
 
@@ -140,11 +143,17 @@ export class PipelinesService implements OnModuleInit {
     return findOnePipelineResponse;
   }
 
-  async update(UpdatePipelineRequest: Messages.PipelineV2UpdateRequest) {
+  async update(
+    UpdatePipelineRequest: Messages.PipelineV2UpdateRequest,
+    metadata,
+  ) {
     this.logger.info('PipelinesClientService - Update');
 
     const updatePipelineResponse = await lastValueFrom(
-      this.pipelineWriteService.PipelineV2Update(UpdatePipelineRequest),
+      this.pipelineWriteService.PipelineV2Update(
+        UpdatePipelineRequest,
+        metadata,
+      ),
     );
     this.logger.info('Done');
 
@@ -158,45 +167,53 @@ export class PipelinesService implements OnModuleInit {
       customer_id: user.customer_id,
       customer: user.customer_name,
     };
+    let existsInProduct = true;
     const { pipeline } = await lastValueFrom(
       this.pipelineReadService.PipelineV2FindOne({ id }, metadata),
-    );
+    ).catch((e) => {
+      if (e.details === ErrorCodes.PIPELINE.NOT_FOUND) existsInProduct = false;
+      else throw new ErrorBuilder(e.details);
+
+      return { pipeline: undefined };
+    });
     await lastValueFrom(
       this.pipelineWriteService.PipelineV2Remove({ id }, metadata),
     );
 
-    //{pipeline:{tables: {tables: [], input_id: ''}}}
-    const input = pipeline.config.tables
-      ? JSON.parse(pipeline.config.tables)
-      : null;
-    if (input)
-      await this.inputsService
-        .remove({
-          id: input.input_id,
-          info,
-        })
-        .catch((error) =>
-          this.logger.error('Could not delete input', {
-            data: { input, error },
-          }),
-        );
-
-    const transformations: { id: string }[] = pipeline.transformations
-      ? JSON.parse(pipeline.transformations)
-      : null;
-    if (transformations && transformations.length)
-      for (const transformation of transformations) {
-        await this.transformationsService
+    if (existsInProduct) {
+      //{pipeline:{tables: {tables: [], input_id: ''}}}
+      const input = pipeline.config.tables
+        ? JSON.parse(pipeline.config.tables)
+        : null;
+      if (input)
+        await this.inputsService
           .remove({
-            id: transformation.id,
+            id: input.input_id,
             info,
           })
           .catch((error) =>
-            this.logger.error('Could not delete transformation', {
-              data: { transformation, error },
+            this.logger.error('Could not delete input', {
+              data: { input, error },
             }),
           );
-      }
+
+      const transformations: { id: string }[] = pipeline.transformations
+        ? JSON.parse(pipeline.transformations)
+        : null;
+      if (transformations && transformations.length)
+        for (const transformation of transformations) {
+          await this.transformationsService
+            .remove({
+              id: transformation.id,
+              info,
+            })
+            .catch((error) =>
+              this.logger.error('Could not delete transformation', {
+                data: { transformation, error },
+              }),
+            );
+        }
+    }
   }
 
   async findOneProperties(id: string, metadata: Metadata) {
@@ -232,4 +249,48 @@ export class PipelinesService implements OnModuleInit {
       },
     };
   }
+
+  async findOneObjects(id: string, metadata: Metadata) {
+    this.logger.info('PipelinesClientService - FindOneObjects');
+
+    const { objects } = await lastValueFrom(
+      this.pipelineReadService.PipelineV2FindObjects({ id }, metadata),
+    );
+    this.logger.info('Done');
+
+    return { objects: JSON.parse(objects) };
+  }
+
+  async uploadFile(uploadFile, metadata) {
+    const body: Messages.PipelineV2UploadFileRequest = {
+      file: {
+        buffer: uploadFile.file.buffer,
+        mimetypes: uploadFile.file.mimetype,
+      },
+      name: uploadFile.name,
+    };
+
+    return lastValueFrom(
+      this.pipelineWriteService.PipelineV2UploadFile(body, metadata),
+    ).catch((err) => {
+      throw new HttpException(
+        err.details,
+        err.code === 6 ? HttpStatus.CONFLICT : 400,
+      );
+    });
+  }
+
+  async downloadLogs(pipeline_run_id: string, metadata: Metadata) {
+    this.logger.info('PipelinesClientService - DownloadLogs');
+
+    const { url } = await lastValueFrom(
+      this.pipelineReadService.PipelineV2DownloadLogs(
+        { pipeline_run_id },
+        metadata,
+      ),
+    );
+    this.logger.info('Done');
+
+    return url;
+  }
 }

src/modules/users/users.controller.ts

@@ -48,11 +48,10 @@ import {
   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';
+import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
-// TODO GET de hierarquias e do PATCH em usuário
 @ApiTags('Users')
 @Controller('users')
 @ApiHeader({
@@ -75,10 +74,6 @@ export class UsersController {
   }
 
   @Get()
-  @ApiOkResponse({
-    type: GetAllUsersByCustomerIdRes,
-    description: 'List of users of a customer',
-  })
   async getAllUsersByCustomerId(
     @User() user: RequestUser,
     @Headers('dadosfera-lang') language,
@@ -154,12 +149,14 @@ export class UsersController {
     @Body() body: CreateUserReq,
     @Headers('dadosfera-lang') language,
   ) {
-    const meta = new Metadata();
-    meta.add('access_token', user.access_token);
+    const metadata = PackTheMetadata({
+      access_token: user.access_token,
+      language,
+    });
     this.logger.info('createUser', { user });
     this.userService.setLanguage(language);
 
-    return await this.userService.createUser(body, meta);
+    return await this.userService.createUser(body, metadata);
   }
 
   @Post('batch')
@@ -170,11 +167,15 @@ export class UsersController {
     @Body() body: BatchCreateUserReq,
     @Headers('dadosfera-lang') language,
   ) {
-    const meta = new Metadata();
-    meta.add('access_token', user.access_token);
     this.logger.info('batchCreateUser', { user });
     this.userService.setLanguage(language);
-    return await this.userService.batchCreateUser(body, meta);
+
+    const metadata = PackTheMetadata({
+      access_token: user.access_token,
+      language,
+    });
+
+    return await this.userService.batchCreateUser(body, metadata);
   }
 
   @Post(':id/resend-invite')
@@ -187,7 +188,11 @@ export class UsersController {
   ) {
     this.logger.info('resendInvite', { user });
     this.userService.setLanguage(language);
-    return this.userService.resendInvite({ id });
+
+    const metadata = PackTheMetadata({
+      language,
+    });
+    return this.userService.resendInvite({ id }, metadata);
   }
 
   @Delete('role')

src/modules/users/users.service.ts

@@ -122,6 +122,7 @@ export class UsersService implements OnModuleInit {
     if (roleNames) {
       await this.setRoles({ roleNames, userId: id }, customerId);
     }
+
     const { user } = await lastValueFrom(
       this.usersClientService.UserUpdate({
         name,
@@ -131,6 +132,7 @@ export class UsersService implements OnModuleInit {
         hierarchy,
         jobTitle,
         email,
+        metabaseUserId: undefined,
       }),
     );
     return { user: this.adjustUsersPayload([user])[0] };
@@ -183,8 +185,10 @@ export class UsersService implements OnModuleInit {
     };
   }
 
-  async resendInvite(body: IdRequest) {
-    return lastValueFrom(this.usersClientService.UserResendInvite(body));
+  async resendInvite(body: IdRequest, metadata: Metadata) {
+    return lastValueFrom(
+      this.usersClientService.UserResendInvite(body, metadata),
+    );
   }
 
   async assignRoleToUser(body: AssignRoleToUserRequest) {

src/utils/ PackTheMetadata.ts

@@ -7,8 +7,10 @@ interface IMetadata {
   user_id?: string;
   language?: string;
   details?: string;
+  sensitive?: string;
   roles?: string[];
   is_data_manager?: boolean;
+  access_token?: string;
 }
 
 export function PackTheMetadata(info: IMetadata): Metadata {

src/utils/ErrorBuilder.ts

@@ -214,6 +214,16 @@ export function EnrichErrorCode(code: string) {
         message: 'Id encontra-se num formato inválido',
         code,
       };
+    case ErrorCodes.CONNECTION.NOT_FOUND:
+    case ErrorCodes.CONNECTION.PLATFORM_NOT_FOUND:
+      return {
+        statusCode: HttpStatus.NOT_FOUND,
+        error: 'Conexão não encontrada',
+        message:
+          'Não encontramos a conexão solicitada. Caso o erro persista, entre em contato com o suporte',
+        code,
+      };
+
     case ErrorCodes.CONNECTION_TEST.ERROR:
       return {
         statusCode: HttpStatus.BAD_REQUEST,
@@ -282,6 +292,14 @@ export function EnrichErrorCode(code: string) {
         message: 'Caso o erro persista, entre em contato com o suporte',
         code,
       };
+    case ErrorCodes.CATALOG.DATA_ASSET_NOT_FOUND:
+      return {
+        statusCode: HttpStatus.NOT_FOUND,
+        error: 'Não encontramos o ativo solicitado',
+        message:
+          'Tente realizar a ação novamente. Caso o erro persista, entre em contato com o suporte',
+        code,
+      };
     case ErrorCodes.INTERNAL:
     case ErrorCodes.UNKNOWN:
     default:

src/utils/errorCodes.ts

@@ -60,9 +60,16 @@ const PIPELINE = {
 const INPUT = {
   NOT_FOUND: 'INPUT.NOT_FOUND',
 };
+const CONNECTION = {
+  NOT_FOUND: 'CONNECTION.NOT_FOUND',
+  PLATFORM_NOT_FOUND: 'CONNECTION.PLATFORM_NOT_FOUND',
+};
 const TRANSFORMATION = {
   NOT_FOUND: 'TRANSFORMATION.NOT_FOUND',
 };
+const CATALOG = {
+  DATA_ASSET_NOT_FOUND: 'CATALOG.DATA_ASSET_NOT_FOUND',
+};
 const ErrorCodes = {
   UNKNOWN: 'UNKNOWN',
   RATE_LIMIT: 'RATE_LIMIT',
@@ -77,6 +84,8 @@ const ErrorCodes = {
   PIPELINE,
   INPUT,
   TRANSFORMATION,
+  CONNECTION,
+  CATALOG,
 };
 
 export default ErrorCodes;