Merge pull request #100 from dadosfera/tests

Tests

.github/workflows/deploy-manually.yml

@@ -37,9 +37,8 @@ jobs:
     outputs:
       #new_release_published: ${{ steps.semantic.outputs.last_release_version != steps.semantic.outputs.new_release_version }}
       new_release_published: ${{ steps.semantic.outputs.new_release_published }}
-      new_release_version: ${{ steps.semantic.outputs.new_release_version }}
-      test: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }}
-      testt: ${{ (needs.semantic_release.outputs.new_release_published == 'true' && needs.semantic_release.outputs.new_release_version) || '1.0.0' }}
+      #new_release_version: ${{ steps.semantic.outputs.new_release_version }}
+      new_release_version: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -61,18 +60,18 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   deploy:
-    if: ${{ (github.event_name != 'workflow_dispatch' && needs.semantic_release.outputs.new_release_published == 'true') || 'true' }}
+    if: ${{ github.event_name == 'workflow_dispatch' || needs.semantic_release.outputs.new_release_published == 'true' }}
     needs: [extract_environment, semantic_release]
     runs-on:
       [self-hosted, '${{ needs.extract_environment.outputs.environment }}']
 
     steps:
-      - name: print
+      - name: Printing stats
         env:
           EVENT: ${{ github.event_name }}
-          IMAGE_TAG: ${{ needs.semantic_release.outputs.test }}
-          IMAGE_TAGG: ${{ needs.semantic_release.outputs.testT }}
-        run: echo ${IMAGE_TAG} ${IMAGE_TAGG} ${EVENT}
+          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
+          ENV: ${{ needs.extract_environment.outputs.environment }}
+        run: echo ${GITHUB_REF#refs/heads/}
 
       - name: Checkout
         uses: actions/checkout@v2

README.md

@@ -1,4 +1,50 @@
+# Maestro
 <p align="center">
   <image src="./assets/maestro.svg" style="width:10rem">
   <h1 align="center">Maestro</h1>  
-</p>  
+</p> 
+This is the Dadosfera´s gateway repository, it´s responsable for the communication between frontend application and Dadosfera´s mirosservices.
+
+## 💻 Requirements
+
+Before you start, make sure you have done the following steps:
+
+* Installed Nodejs version 16.14.2
+* Installed latest NPM version
+
+
+
+## 🚀 Installing Maestro
+
+First of all clone the repository:
+ * SSH:
+```
+git clone git@github.com:dadosfera/maestro.git
+```
+ * HTTPS:
+```
+git clone git@github.com:dadosfera/maestro.git
+```
+
+## Enviroment variables
+
+Here is a list of enviroment variables needed in order to run the application correctly.
+
+```
+ENV=
+DUC_URL=
+INFACTORY_URL=
+TRFACTORY_URL=
+OTFACTORY_URL=
+PIFACTORY_URL=
+JWT_PRIVATE_KEY=
+AWS_IDENTITY_POOL_ID=
+```
+
+## Running Maestro
+
+In order to run Maestro just run the following command:
+```
+npm run start:dev
+```
+If everything is fine the Maestro will start and be ready to receive HTTP requests

package-lock.json

@@ -19,7 +19,7 @@
         "@nestjs/platform-express": "^8.4.3",
         "@nestjs/schedule": "^1.1.0",
         "@nestjs/swagger": "^5.2.1",
-        "@victorradael/protospack": "2.3.0",
+        "@victorradael/protospack": "2.4.1-1",
         "axios": "^0.25.0",
         "dotenv": "^14.2.0",
         "helmet": "^5.0.2",
@@ -46,6 +46,7 @@
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-prettier": "^4.0.0",
         "jest": "^27.5.1",
+        "nock": "^13.2.4",
         "prettier": "^2.6.1",
         "source-map-support": "^0.5.20",
         "supertest": "^6.1.3",
@@ -2359,9 +2360,9 @@
       }
     },
     "node_modules/@victorradael/protospack": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.3.0.tgz",
-      "integrity": "sha512-D2iy5Ff8G2FhH6Grs4MHM0qyqc6EU7iGuD3Bit6Tm6GbHmhDbLER9uBowClPjbPSAQ6jP7WTYxwn/TgDK4lNaA==",
+      "version": "2.4.1-1",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.1-1.tgz",
+      "integrity": "sha512-QpdnjOiSil1sPvOVuSC1mu5Z76ZDF1+QbDDe/RI3WVWo39dxARBxOxp7/biRY6KLxTPvSUOQbrBAg7Bfx0ul+A==",
       "dependencies": {
         "rxjs": "^7.5.5"
       }
@@ -6373,6 +6374,12 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
     "node_modules/json5": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
@@ -6579,6 +6586,12 @@
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
       "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
     },
+    "node_modules/lodash.set": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
+      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=",
+      "dev": true
+    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -6893,6 +6906,21 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node_modules/nock": {
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.4.tgz",
+      "integrity": "sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash.set": "^4.3.2",
+        "propagate": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      }
+    },
     "node_modules/node-emoji": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
@@ -7379,6 +7407,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/protobufjs": {
       "version": "6.11.2",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz",
@@ -10941,9 +10978,9 @@
       }
     },
     "@victorradael/protospack": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.3.0.tgz",
-      "integrity": "sha512-D2iy5Ff8G2FhH6Grs4MHM0qyqc6EU7iGuD3Bit6Tm6GbHmhDbLER9uBowClPjbPSAQ6jP7WTYxwn/TgDK4lNaA==",
+      "version": "2.4.1-1",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.1-1.tgz",
+      "integrity": "sha512-QpdnjOiSil1sPvOVuSC1mu5Z76ZDF1+QbDDe/RI3WVWo39dxARBxOxp7/biRY6KLxTPvSUOQbrBAg7Bfx0ul+A==",
       "requires": {
         "rxjs": "^7.5.5"
       }
@@ -14051,6 +14088,12 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
     "json5": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
@@ -14229,6 +14272,12 @@
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
       "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
     },
+    "lodash.set": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
+      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=",
+      "dev": true
+    },
     "log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -14469,6 +14518,18 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "nock": {
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.4.tgz",
+      "integrity": "sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash.set": "^4.3.2",
+        "propagate": "^2.0.0"
+      }
+    },
     "node-emoji": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
@@ -14824,6 +14885,12 @@
         "sisteransi": "^1.0.5"
       }
     },
+    "propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "dev": true
+    },
     "protobufjs": {
       "version": "6.11.2",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz",

package.json

@@ -31,7 +31,7 @@
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/schedule": "^1.1.0",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "2.3.0",
+    "@victorradael/protospack": "2.4.1",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "helmet": "^5.0.2",
@@ -42,6 +42,9 @@
     "rxjs": "^7.5.5",
     "swagger-ui-express": "^4.3.0"
   },
+  "overrides":{
+    "busboy@<1.6.0":"1.6.0"
+  },
   "devDependencies": {
     "@nestjs/cli": "^8.2.4",
     "@nestjs/schematics": "^8.0.8",
@@ -58,6 +61,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.5.1",
+    "nock": "^13.2.4",
     "prettier": "^2.6.1",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.3",

src/clients/auth/client.service.ts

@@ -167,21 +167,18 @@ export class AuthClientService implements OnModuleInit {
   }
 
   async refreshAccessToken({
-    username,
     refreshToken,
   }: AuthRefreshAccessTokenRequest): Promise<any> {
     console.log('AuthClientService', 'RefreshAccessToken');
 
     return new Promise((resolve, reject) => {
-      this.authService
-        .refreshAccessToken({ username, refreshToken })
-        .subscribe({
-          next: resolve,
-          error: (err) => reject(err.details),
-          complete() {
-            console.log('done');
-          },
-        });
+      this.authService.refreshAccessToken({ refreshToken }).subscribe({
+        next: resolve,
+        error: (err) => reject(err.details),
+        complete() {
+          console.log('done');
+        },
+      });
     });
   }
 }

src/middlewares/authentication.ts

@@ -9,7 +9,7 @@ import {
 } from '@nestjs/common';
 import jwkToPem from 'jwk-to-pem';
 import { decode, verify } from 'jsonwebtoken';
-import { HttpExceptionFilter } from 'src/error/http-exception.filter';
+import { HttpExceptionFilter } from '../error/http-exception.filter';
 
 @UseFilters(new HttpExceptionFilter())
 export class LoggerMiddleware implements NestMiddleware {

src/modules/auth/auth.controller.ts

@@ -57,12 +57,12 @@ export class AuthController {
   @Post('refresh-access-token')
   @HttpCode(HttpStatus.OK)
   async refreshAccessToken(
-    @Body() { username, refreshToken }: AuthRefreshAccessTokenRequest,
+    @Body() { refreshToken }: AuthRefreshAccessTokenRequest,
   ) {
     console.log(`/auth`, 'RefreshAccessToken');
 
     const accessToken = await this.authClient
-      .refreshAccessToken({ username, refreshToken })
+      .refreshAccessToken({ refreshToken })
       .catch((err) => {
         throw ErrorBuilder(err);
       });

src/modules/auth/auth.service.spec.ts

@@ -1,5 +1,152 @@
+import nock from 'nock';
+import { LoggerMiddleware } from '../../middlewares/authentication';
+import { NextFunction, Request, Response } from 'express';
+import { ConsoleLogger, UnauthorizedException } from '@nestjs/common';
+
 describe('PipelinesGrpcServerService', () => {
+  // let mockRequest: Partial<Request>;
+  // let mockResponse: Partial<Response>;
+  // const nextFunction: NextFunction = jest.fn();
+
+  // beforeEach(() => {
+  //   mockRequest = {
+  //     headers: {},
+  //     body: {
+  //       info: {},
+  //     },
+  //   };
+  //   mockResponse = {
+  //     json: jest.fn(),
+  //   };
+  // });
+
   it('should be defined', () => {
     expect(2 + 2).toBe(4);
   });
+
+  // it('Should be able to pass auth', async () => {
+  //   const awsRegion = process.env.AWS_REGION;
+  //   const awsPoolId = process.env.AWS_IDENTITY_POOL_ID;
+  //   const cognitoRes = {
+  //     keys: [
+  //       {
+  //         alg: 'RS256',
+  //         e: 'AQAB',
+  //         kid: 'z3VA3+i9JZY3JFDJTNWOap8RY+B7C6mFedaqCuvLvqA=',
+  //         kty: 'RSA',
+  //         n: 'vIGCQDkPA_eQUoaGDUsCyK_Whr76mNW0kZ1uac6ZnyY6hsjUIjvwehqv-ux3cQo4rQZQVFcoh8n9cK5jguz4GVdD972vIxoEdyv32nBFVr5e1PBunKJ2Y32GTR_Hl0XiE0hRe1v6cWuTqiC4qm1NY7tXYL3mI9L6s9ztNbhmG_V44y26PdhL4vRVrJaHOAmCs-77U-QYAC7Llkpmjh-8tG1zt9_FJ237cpBUVOuhD-7Nm32_eB9wddBGfBw0F10ko_KJoU-7683_Kv8k9coJzFUSONId-bfnLOzs8j1L6ZAHipXCR7rpmuRYzXztjp4Wmm2zPUToWLdMEy0Hq1OWmw',
+  //         use: 'sig',
+  //       },
+  //       {
+  //         alg: 'RS256',
+  //         e: 'AQAB',
+  //         kid: 'u+1W9pi+clp8LaPhZVrv4dXMqRkTRD02YWhbm0NvsUw=',
+  //         kty: 'RSA',
+  //         n: 'noGq1cRMAKJPWahqfC_zWasYovSUycaS1basMfEoh3ePLc9zRgmyfiVKYzLRosHMe1uk0Y5ekCBKnWA8Yl7I84Yt7IIIaE44oJjSEGBKT3m8i8YaXzawaNs63KPkRh8553o3KzL75bQWcI_ABKqkf-uAKSCl_XotBGkzLUl4hIOYtAtRGEfKaNMPqyTCT5Zn71pMd0isppaUiTW2T5QLsZV1IBp46aSrl_D5Q_FTsJT7feobQVoHp2zfIorCpkfTXBTBMQTEBFSDyPbc6cULl48VKxp0B0GEwR_kYCEHEVzf41LQcUWZUE0OdBychijkSc9MZJnBWUYQZyedJILWnQ',
+  //         use: 'sig',
+  //       },
+  //     ],
+  //   };
+
+  //   nock(
+  //     `https://cognito-idp.${awsRegion}.amazonaws.com/${awsPoolId}/.well-known/jwks.json`,
+  //   )
+  //     .persist()
+  //     .get('')
+  //     .reply(200, cognitoRes);
+
+  //   mockRequest.headers['Dadosfera-User'] =
+  //     'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7ImlkIjoiZTljYjI1ZGEtMTQyOC00NDJjLTg5NjItYTdkNmQxNjhkODUyIiwibmFtZSI6InJvZHJpZ28uemFtYm9uaSIsInVzZXJuYW1lIjoicm9kcmlnby56YW1ib25pQGRhZG9zZmVyYS5haSIsInJ1bGVJZCI6IjIxNzdmZjg4LThmY2ItNDRlNS1hYzYxLWNjYmU2Y2M3MGU4ZCIsImN1c3RvbWVySWQiOiIxMTI5ODBhMy0wYTEyLTQxYzktYmZmZC03OTFjZjdjYTg3YTIiLCJtZmFTdGF0dXMiOiJwZW5kaW5nIiwiY3JlYXRlZEF0IjoiMjAyMi0wNS0xM1QxNTowOTowOS4xMzhaIiwidXBkYXRlZEF0IjoiMjAyMi0wNS0xM1QxNTowOTowOS4xMzhaIiwicGVybWlzc2lvbnMiOlsiUE9TVCAvcGlwZWxpbmVzIiwiR0VUIC9waXBlbGluZXMiLCJQVVQgL3BpcGVsaW5lcyIsIkRFTEVURSAvcGlwZWxpbmVzIiwiUE9TVCAvaW5wdXRzIiwiR0VUIC9pbnB1dHMiLCJQVVQgL2lucHV0cyIsIkRFTEVURSAvaW5wdXRzIiwiUE9TVCAvb3V0cHV0cyIsIkdFVCAvb3V0cHV0cyIsIlBVVCAvb3V0cHV0cyIsIkRFTEVURSAvb3V0cHV0cyIsIlBPU1QgL3RyYW5zZm9ybWF0aW9ucyIsIkdFVCAvdHJhbnNmb3JtYXRpb25zIiwiUFVUIC90cmFuc2Zvcm1hdGlvbnMiLCJERUxFVEUgL3RyYW5zZm9ybWF0aW9ucyIsIlBPU1QgL2NhdGFsb2ciLCJHRVQgL2NhdGFsb2ciLCJQVVQgL2NhdGFsb2ciLCJERUxFVEUgL2NhdGFsb2ciLCJQT1NUIC9hdXRoIiwiR0VUIC9tZXRhYmFzZSIsIkdFVCAvc25vd2ZsYWtlIl0sImN1c3RvbWVyIjoiZGFkb3NmZXJhIn0sImlhdCI6MTY1MzY1NjE2NywiZXhwIjoxNjUzNzQyNTY3fQ.eeNEEUk_95KOxM-objS7gXz-SCVkNFYpEP688MfLkdI';
+  //   mockRequest.headers['Authorization'] =
+  //     'eyJraWQiOiJ1KzFXOXBpK2NscDhMYVBoWlZydjRkWE1xUmtUUkQwMllXaGJtME52c1V3PSIsImFsZyI6IlJTMjU2In0.eyJzdWIiOiIxYjkyZmFkMC1iNWVlLTQwMzAtOGRmYy1hZWM0MGQzYzdkYmUiLCJpc3MiOiJodHRwczpcL1wvY29nbml0by1pZHAudXMtZWFzdC0xLmFtYXpvbmF3cy5jb21cL3VzLWVhc3QtMV9OVXY3WTJTeGoiLCJjbGllbnRfaWQiOiI0N3RrY3Jxc2NuajY3bWhnYmg3dXQ1YnJzNCIsIm9yaWdpbl9qdGkiOiJhZWJjNjA5NC1hYTJmLTRiZmUtOWExZi01ZWVhYTVmYzAwNDAiLCJldmVudF9pZCI6IjBhY2NjMzJiLTllNzktNGY2NS1iMDFiLWZhZGJlYzFhZWFiNiIsInRva2VuX3VzZSI6ImFjY2VzcyIsInNjb3BlIjoiYXdzLmNvZ25pdG8uc2lnbmluLnVzZXIuYWRtaW4iLCJhdXRoX3RpbWUiOjE2NTM2NTYxNjcsImV4cCI6MTY1MzY1Nzk2NywiaWF0IjoxNjUzNjU2MTY3LCJqdGkiOiIyYTgzNDhmOC0xNDhlLTQ3NjctODcxYi00M2UyOGRjNjc2NTkiLCJ1c2VybmFtZSI6InJvZHJpZ28uemFtYm9uaUBkYWRvc2ZlcmEuYWkifQ.UgIgeGEH2olNgqPly8cymNgWIZJz5n9N4yeKgTusfGsu5h-TWP_jVhPoCvFoixO2XKzFjSCvKwlKQYZyB74jLQLs-j5C5KGBdOea1HX7pUnEfEVtBINd1kcHib5YpGYq3MHG1uVx8vNJS3XviwgYg4rgNWA4du-QbhMicdRyHolYM-dWxuxtkwTRWMe1Vw6KlTctFsvUWx1GMgjp37tsLONcp3B8OsYXfiR764K_pBNs5gMhJ39gJ7NHHLWkJrtrUTpIoHWaZS_HEgvVyQiJENQvK_bPDMPm_lyF1dW-JBgot4TpAxMmvV1XGabkzycIcAOwUaPsKBlMphgunz1Ffw';
+  //   mockRequest.method = 'GET';
+  //   mockRequest.route = {
+  //     path: '/inputs/',
+  //     stack: [
+  //       {
+  //         method: 'get',
+  //       },
+  //     ],
+  //     methods: {
+  //       get: true,
+  //     },
+  //   };
+  //   const authMiddleware = new LoggerMiddleware();
+
+  //   await authMiddleware.useTest(
+  //     mockRequest as Request,
+  //     mockResponse as Response,
+  //     nextFunction,
+  //   );
+  //   expect(nextFunction).toHaveBeenCalled();
+  // });
+
+  // it('Should not be able to pass auth', async () => {
+  //   const awsRegion = process.env.AWS_REGION;
+  //   const awsPoolId = process.env.AWS_IDENTITY_POOL_ID;
+  //   const cognitoRes = {
+  //     keys: [
+  //       {
+  //         alg: 'RS256',
+  //         e: 'AQAB',
+  //         kid: 'z3VA3+i9JZY3JFDJTNWOap8RY+B7C6mFedaqCuvLvqA=',
+  //         kty: 'RSA',
+  //         n: 'vIGCQDkPA_eQUoaGDUsCyK_Whr76mNW0kZ1uac6ZnyY6hsjUIjvwehqv-ux3cQo4rQZQVFcoh8n9cK5jguz4GVdD972vIxoEdyv32nBFVr5e1PBunKJ2Y32GTR_Hl0XiE0hRe1v6cWuTqiC4qm1NY7tXYL3mI9L6s9ztNbhmG_V44y26PdhL4vRVrJaHOAmCs-77U-QYAC7Llkpmjh-8tG1zt9_FJ237cpBUVOuhD-7Nm32_eB9wddBGfBw0F10ko_KJoU-7683_Kv8k9coJzFUSONId-bfnLOzs8j1L6ZAHipXCR7rpmuRYzXztjp4Wmm2zPUToWLdMEy0Hq1OWmw',
+  //         use: 'sig',
+  //       },
+  //       {
+  //         alg: 'RS256',
+  //         e: 'AQAB',
+  //         kid: 'u+1W9pi+clp8LaPhZVrv4dXMqRkTRD02YWhbm0NvsUw=',
+  //         kty: 'RSA',
+  //         n: 'noGq1cRMAKJPWahqfC_zWasYovSUycaS1basMfEoh3ePLc9zRgmyfiVKYzLRosHMe1uk0Y5ekCBKnWA8Yl7I84Yt7IIIaE44oJjSEGBKT3m8i8YaXzawaNs63KPkRh8553o3KzL75bQWcI_ABKqkf-uAKSCl_XotBGkzLUl4hIOYtAtRGEfKaNMPqyTCT5Zn71pMd0isppaUiTW2T5QLsZV1IBp46aSrl_D5Q_FTsJT7feobQVoHp2zfIorCpkfTXBTBMQTEBFSDyPbc6cULl48VKxp0B0GEwR_kYCEHEVzf41LQcUWZUE0OdBychijkSc9MZJnBWUYQZyedJILWnQ',
+  //         use: 'sig',
+  //       },
+  //     ],
+  //   };
+
+  //   nock(
+  //     `https://cognito-idp.${awsRegion}.amazonaws.com/${awsPoolId}/.well-known/jwks.json`,
+  //   )
+  //     .persist()
+  //     .get('')
+  //     .reply(200, cognitoRes);
+
+  //   mockRequest.headers['Dadosfera-User'] =
+  //     'asdeyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7ImlkIjoiZTljYjI1ZGEtMTQyOC00NDJjLTg5NjItYTdkNmQxNjhkODUyIiwibmFtZSI6InJvZHJpZ28uemFtYm9uaSIsInVzZXJuYW1lIjoicm9kcmlnby56YW1ib25pQGRhZG9zZmVyYS5haSIsInJ1bGVJZCI6IjIxNzdmZjg4LThmY2ItNDRlNS1hYzYxLWNjYmU2Y2M3MGU4ZCIsImN1c3RvbWVySWQiOiIxMTI5ODBhMy0wYTEyLTQxYzktYmZmZC03OTFjZjdjYTg3YTIiLCJtZmFTdGF0dXMiOiJwZW5kaW5nIiwiY3JlYXRlZEF0IjoiMjAyMi0wNS0xM1QxNTowOTowOS4xMzhaIiwidXBkYXRlZEF0IjoiMjAyMi0wNS0xM1QxNTowOTowOS4xMzhaIiwicGVybWlzc2lvbnMiOlsiUE9TVCAvcGlwZWxpbmVzIiwiR0VUIC9waXBlbGluZXMiLCJQVVQgL3BpcGVsaW5lcyIsIkRFTEVURSAvcGlwZWxpbmVzIiwiUE9TVCAvaW5wdXRzIiwiR0VUIC9pbnB1dHMiLCJQVVQgL2lucHV0cyIsIkRFTEVURSAvaW5wdXRzIiwiUE9TVCAvb3V0cHV0cyIsIkdFVCAvb3V0cHV0cyIsIlBVVCAvb3V0cHV0cyIsIkRFTEVURSAvb3V0cHV0cyIsIlBPU1QgL3RyYW5zZm9ybWF0aW9ucyIsIkdFVCAvdHJhbnNmb3JtYXRpb25zIiwiUFVUIC90cmFuc2Zvcm1hdGlvbnMiLCJERUxFVEUgL3RyYW5zZm9ybWF0aW9ucyIsIlBPU1QgL2NhdGFsb2ciLCJHRVQgL2NhdGFsb2ciLCJQVVQgL2NhdGFsb2ciLCJERUxFVEUgL2NhdGFsb2ciLCJQT1NUIC9hdXRoIiwiR0VUIC9tZXRhYmFzZSIsIkdFVCAvc25vd2ZsYWtlIl0sImN1c3RvbWVyIjoiZGFkb3NmZXJhIn0sImlhdCI6MTY1MzY1NjE2NywiZXhwIjoxNjUzNzQyNTY3fQ.eeNEEUk_95KOxM-objS7gXz-SCVkNFYpEP688MfLkdI';
+  //   mockRequest.headers['Authorization'] =
+  //     'asdeyJraWQiOiJ1KzFXOXBpK2NscDhMYVBoWlZydjRkWE1xUmtUUkQwMllXaGJtME52c1V3PSIsImFsZyI6IlJTMjU2In0.eyJzdWIiOiIxYjkyZmFkMC1iNWVlLTQwMzAtOGRmYy1hZWM0MGQzYzdkYmUiLCJpc3MiOiJodHRwczpcL1wvY29nbml0by1pZHAudXMtZWFzdC0xLmFtYXpvbmF3cy5jb21cL3VzLWVhc3QtMV9OVXY3WTJTeGoiLCJjbGllbnRfaWQiOiI0N3RrY3Jxc2NuajY3bWhnYmg3dXQ1YnJzNCIsIm9yaWdpbl9qdGkiOiJhZWJjNjA5NC1hYTJmLTRiZmUtOWExZi01ZWVhYTVmYzAwNDAiLCJldmVudF9pZCI6IjBhY2NjMzJiLTllNzktNGY2NS1iMDFiLWZhZGJlYzFhZWFiNiIsInRva2VuX3VzZSI6ImFjY2VzcyIsInNjb3BlIjoiYXdzLmNvZ25pdG8uc2lnbmluLnVzZXIuYWRtaW4iLCJhdXRoX3RpbWUiOjE2NTM2NTYxNjcsImV4cCI6MTY1MzY1Nzk2NywiaWF0IjoxNjUzNjU2MTY3LCJqdGkiOiIyYTgzNDhmOC0xNDhlLTQ3NjctODcxYi00M2UyOGRjNjc2NTkiLCJ1c2VybmFtZSI6InJvZHJpZ28uemFtYm9uaUBkYWRvc2ZlcmEuYWkifQ.UgIgeGEH2olNgqPly8cymNgWIZJz5n9N4yeKgTusfGsu5h-TWP_jVhPoCvFoixO2XKzFjSCvKwlKQYZyB74jLQLs-j5C5KGBdOea1HX7pUnEfEVtBINd1kcHib5YpGYq3MHG1uVx8vNJS3XviwgYg4rgNWA4du-QbhMicdRyHolYM-dWxuxtkwTRWMe1Vw6KlTctFsvUWx1GMgjp37tsLONcp3B8OsYXfiR764K_pBNs5gMhJ39gJ7NHHLWkJrtrUTpIoHWaZS_HEgvVyQiJENQvK_bPDMPm_lyF1dW-JBgot4TpAxMmvV1XGabkzycIcAOwUaPsKBlMphgunz1Ffw';
+  //   mockRequest.method = 'GET';
+  //   mockRequest.route = {
+  //     path: '/inputs/',
+  //     stack: [
+  //       {
+  //         method: 'get',
+  //       },
+  //     ],
+  //     methods: {
+  //       get: true,
+  //     },
+  //   };
+  //   const authMiddleware = new LoggerMiddleware();
+
+  //   // const t = await authMiddleware.useTest(
+  //   //   mockRequest as Request,
+  //   //   mockResponse as Response,
+  //   //   nextFunction,
+  //   // );
+  //   // expect(nextFunction).toHaveBeenCalled();
+
+  //   expect(async () => {
+  //     const t = await authMiddleware.useTest(
+  //       mockRequest as Request,
+  //       mockResponse as Response,
+  //       nextFunction,
+  //     );
+  //     console.log(t);
+  //   }).toThrow('Unauthorized');
+
+  //   expect(1).toBe(2);
+  //   // expect(t).toThrow(UnauthorizedException);
+  // });
 });

src/modules/inputs/inputs.controller.ts

@@ -4,8 +4,8 @@ import {
   Delete,
   Get,
   Param,
+  Patch,
   Post,
-  Put,
 } from '@nestjs/common';
 import { InputsService } from './inputs.service';
 import { InputsClientService } from 'src/clients/inputs/client.service';
@@ -71,7 +71,7 @@ export class InputsController {
     return response;
   }
 
-  @Put(':id')
+  @Patch(':id')
   async update(@Body() updateInputDto: UpdateInputRequest, @Param() params) {
     const { id } = params;
     const { info } = updateInputDto;

src/modules/inputs/inputs.service.ts

@@ -7,6 +7,9 @@ import { IIdRequest, Info } from 'src/clients/inputs/interfaces';
 export class InputsService {
   constructor(private inputClient: InputsClientService) {}
 
+  adjustInputPayload(payload) {
+    return payload?.input_s3 || payload?.input_jdbc;
+  }
   async create(@Body() data) {
     try {
       if (
@@ -35,8 +38,12 @@ export class InputsService {
 
   async findAll(body) {
     try {
-      const findAllInputResponse = await this.inputClient.findAll(body);
-
+      const findAllInputResponse: any = await this.inputClient.findAll(body);
+      if (findAllInputResponse?.inputs?.length) {
+        findAllInputResponse.inputs = findAllInputResponse.inputs.map((input) =>
+          this.adjustInputPayload(input),
+        );
+      }
       return findAllInputResponse;
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
@@ -45,7 +52,12 @@ export class InputsService {
 
   async findOne(idRequest: IIdRequest) {
     try {
-      const findOneInputResponse = await this.inputClient.findOne(idRequest);
+      const findOneInputResponse: any = await this.inputClient.findOne(
+        idRequest,
+      );
+      findOneInputResponse.input = this.adjustInputPayload(
+        findOneInputResponse.input,
+      );
       return findOneInputResponse;
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
@@ -54,12 +66,15 @@ export class InputsService {
 
   async update(id: string, data, info: Info) {
     try {
-      const updateInputResponse = await this.inputClient.update({
+      const updateInputResponse: any = await this.inputClient.update({
         id,
         info,
         ...data,
       });
 
+      updateInputResponse.input = this.adjustInputPayload(
+        updateInputResponse?.input,
+      );
       return updateInputResponse;
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);