feat: updgraded passport-nevermined to latest version

- added morgan http middleware logger
- remove homemade logger middleware

package.json

@@ -35,9 +35,9 @@
     "@nestjs/swagger": "^5.2.0",
     "@nestjs/typeorm": "^10.0.0",
     "@nevermined-io/argo-workflows-api": "^0.1.3",
-    "@nevermined-io/passport-nevermined": "^0.1.1",
-    "@nevermined-io/sdk": "^1.5.2",
-    "@nevermined-io/sdk-dtp": "0.5.0",
+    "@nevermined-io/passport-nevermined": "^0.2.0",
+    "@nevermined-io/sdk": "^1.5.3",
+    "@nevermined-io/sdk-dtp": "^0.5.1",
     "@sideway/address": "^4.1.3",
     "@sideway/formula": "^3.0.1",
     "@sideway/pinpoint": "^2.0.0",
@@ -63,6 +63,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.43",
+    "morgan": "^1.10.0",
     "nest-router": "^1.0.9",
     "node-rsa": "^1.1.1",
     "passport": "^0.6.0",

src/access/access.controller.ts

@@ -137,7 +137,9 @@ export class AccessController {
     @Req() req: Request<unknown>,
     template: string,
   ): Promise<string> {
-    Logger.debug(`Transferring NFT with agreement ${transferData.agreementId}`)
+    Logger.debug(
+      `[${transferData.did}] Transferring NFT with agreement ${transferData.agreementId}`,
+    )
     const nevermined = this.nvmService.getNevermined()
 
     // Check the agreement exists on-chain
@@ -206,6 +208,9 @@ export class AccessController {
     const [from] = await nevermined.accounts.list()
 
     try {
+      Logger.debug(
+        `[${transferData.did}] Fulfilling transfer NFT with agreement ${transferData.agreementId}`,
+      )
       await plugin.process(params, from, undefined)
     } catch (e) {
       Logger.error(`Failed to transfer NFT ${e}`)

src/app.module.ts

@@ -9,7 +9,6 @@ import { EncryptModule } from './encrypt/encrypt.module'
 import { AccessModule } from './access/access.module'
 import { NeverminedModule } from './shared/nevermined/nvm.module'
 import { ComputeModule } from './compute/compute.module'
-import { HttpLoggerMiddleware } from './common/middlewares/http-logger/http-logger.middleware'
 import { SubscriptionsModule } from './subscriptions/subscriptions.module'
 
 @Module({
@@ -28,6 +27,5 @@ import { SubscriptionsModule } from './subscriptions/subscriptions.module'
 export class ApplicationModule {
   configure(consumer: MiddlewareConsumer) {
     consumer.apply(HttpsRedirectMiddleware).forRoutes({ path: '*', method: RequestMethod.ALL })
-    consumer.apply(HttpLoggerMiddleware).forRoutes('*')
   }
 }

src/info/info.controller.ts

@@ -1,4 +1,4 @@
-import { Get, Req, Controller, Logger } from '@nestjs/common'
+import { Get, Req, Controller } from '@nestjs/common'
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger'
 import { readFileSync } from 'fs'
 import path from 'path'
@@ -27,7 +27,6 @@ export class InfoController {
   })
   @Public()
   async getInfo(@Req() req: Request<unknown>): Promise<GetInfoDto> {
-    Logger.debug('Serving info')
     const nevermined = this.nvmService.getNevermined()
     const contractHandler = new ContractHandler(this.nvmService.instanceConfig())
     const pathEndpoint = `${req.protocol}://${req.hostname}${

src/main.ts

@@ -8,16 +8,26 @@ import { ApplicationModule } from './app.module'
 import { JwtAuthGuard } from './common/guards/auth/jwt-auth.guard'
 import { RolesGuard } from './common/guards/auth/roles.guards'
 import { ConfigService } from './shared/config/config.service'
+import morgan from 'morgan'
 
 const bootstrap = async () => {
   console.log(process.env.NODE_ENV)
   const app = await NestFactory.create<NestExpressApplication>(ApplicationModule, {
     cors: true,
     logger: ['error', 'log', 'warn', 'debug'],
-    // process.env.NODE_ENV !== 'production'
-    //   ? ['error', 'log', 'warn', 'debug']
-    //   : ['error', 'log', 'warn'],
   })
+
+  // http middleware logger
+  app.use(
+    morgan('dev', {
+      stream: {
+        write: (message: string) => {
+          Logger.log(message.trim())
+        },
+      },
+    }),
+  )
+
   app.enable('trust proxy')
   app.useGlobalPipes(new ValidationPipe())
   app.useGlobalGuards(new JwtAuthGuard(new Reflector()), new RolesGuard(new Reflector()))

yarn.lock

@@ -1146,7 +1146,6 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
-
 "@jest/types@^29.5.0":
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
@@ -1344,56 +1343,32 @@
   dependencies:
     axios "^0.21.1"
 
-"@nevermined-io/passport-nevermined@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/passport-nevermined/-/passport-nevermined-0.1.1.tgz#8cdea7533501ec2bb23c8d689c72d5723c9a8e1b"
-  integrity sha512-2oQsKY2G//jB/wMt768OQ2MngAijIKayUBmfTHMM9MWms6ACavjOb2gD+/MmlslPBlrLzyK8sg4ln7duRuxIYQ==
+"@nevermined-io/passport-nevermined@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/passport-nevermined/-/passport-nevermined-0.2.0.tgz#d41417f56fa8b8df697d845b0d4657c3ceceda91"
+  integrity sha512-vR1oUHaCKCob5Hzhv6KvybahV9ISqofUs6QNYwl20yJLotow9s9CPfbtqXDW5pDmBqplS0TcXlzEmSzNswXJIw==
   dependencies:
     ethers "^5.7.2"
     jose "^4.11.2"
     passport-strategy "^1.0.0"
 
-"@nevermined-io/sdk-dtp@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk-dtp/-/sdk-dtp-0.5.0.tgz#7520a69733246155cd03080f5bcabb3918caf4b6"
-  integrity sha512-3DXFHyeNSqbTSuVo7DZ3tz5ndvrOph70RHtNzLJa+9Rh4byzAb3DdSvrPCqmeFRzMBV1Yws+//xgh6T5SEBasQ==
+"@nevermined-io/sdk-dtp@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk-dtp/-/sdk-dtp-0.5.1.tgz#42f57b8b08b4773d581acd49427395b254f59773"
+  integrity sha512-ZJhQojowImE0rd1ip01a4K/rW0/WERbYJubajazZCic8mjtcg73PCq0yv0arXb5rCDqXa38Qut+oDFhwoxRCXA==
   dependencies:
-    "@nevermined-io/sdk" "1.5.0"
+    "@nevermined-io/sdk" "^1.5.3"
     circomlibjs "^0.1.1"
     eciesjs "^0.3.15"
     ffjavascript "^0.2.55"
     node-rsa "^1.1.1"
     snarkjs "^0.4.26"
     web3-utils "^1.7.4"
 
-"@nevermined-io/sdk@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk/-/sdk-1.5.0.tgz#538db356917697e6377619abdd4741ce40c152a1"
-  integrity sha512-i1Sjc6feZodCIYbEr3K8xqfIXBihXWAER2su7kF236Z7X7ntH+j/XlsNymRTnsDK1g2bx0DsptmC6fu51AhenQ==
-  dependencies:
-    "@nevermined-io/subgraphs" "0.5.1"
-    assert "^2.0.0"
-    codegen-graph-ts "npm:@nevermined-io/codegen-graph-ts@0.1.4"
-    crypto-browserify "^3.12.0"
-    deprecated-decorator "^0.1.6"
-    ethers "^5.6.9"
-    https-browserify "^1.0.0"
-    jose "^4.5.1"
-    js-file-download "^0.4.12"
-    node-fetch "^2.6.1"
-    os-browserify "^0.3.0"
-    path-browserify "^1.0.1"
-    save-file "^2.3.1"
-    stream-browserify "^3.0.0"
-    stream-http "^3.2.0"
-    url "^0.11.0"
-    uuid "^3.4.0"
-    whatwg-url "^7.1.0"
-
-"@nevermined-io/sdk@^1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk/-/sdk-1.5.2.tgz#15017996984a541036798ffa5cdfd6797f06be1d"
-  integrity sha512-UiI7U4aDNIoiLhMK//YmEXIHK+6Moqx4DHKGwnqyl0WPin0Lg/xKYbfuZxd+EZTadaRvs4JmWhTM0m9ilu1Z+Q==
+"@nevermined-io/sdk@^1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk/-/sdk-1.5.3.tgz#edd68e38b158c88692624c27a74b2f1a885ba9a0"
+  integrity sha512-eFSNrbcunOVChZSAHPueLPanpJXj6RD5EiqXcS4ru18A3oSFdWyRYjKTwhpQF5zvkbQ+Gm5n2Iun8o0G7pgu/Q==
   dependencies:
     "@nevermined-io/subgraphs" "0.5.1"
     assert "^2.0.0"
@@ -2624,6 +2599,13 @@ base64-js@^1.0.2, base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+basic-auth@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
 bech32@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
@@ -3545,7 +3527,7 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-depd@2.0.0:
+depd@2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -5800,8 +5782,7 @@ jest-snapshot@^29.5.0:
     pretty-format "^29.5.0"
     semver "^7.3.5"
 
-
-jest-util@^29.5.0:
+jest-util@^29.0.0, jest-util@^29.5.0:
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
   integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==
@@ -6507,6 +6488,17 @@ moment@^2.24.0, moment@^2.29.4:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
+morgan@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
+  dependencies:
+    basic-auth "~2.0.1"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-finished "~2.3.0"
+    on-headers "~1.0.2"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6807,6 +6799,18 @@ on-finished@2.4.1:
   dependencies:
     ee-first "1.1.1"
 
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -7211,11 +7215,6 @@ pure-rand@^6.0.0:
   resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
   integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
 
-pure-rand@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
-  integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
-
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -7517,16 +7516,16 @@ rxjs@7.8.1, rxjs@^7.5.5, rxjs@^7.5.7, rxjs@^7.8.0:
   dependencies:
     tslib "^2.1.0"
 
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"