@velocitycareerlabs/server-careerwallet 1.27.0-dev-build.163831870 → 1.27.0-dev-build.17b8f41df

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-careerwallet",
-  "version": "1.27.0-dev-build.163831870",
+  "version": "1.27.0-dev-build.17b8f41df",
   "description": "Career Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -34,24 +34,24 @@
     "@fastify/swagger-ui": "^5.0.0",
     "@getyoti/sdk-sandbox": "1.7.0",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/migrations": "1.27.0-dev-build.163831870",
-    "@velocitycareerlabs/yoti-integration-plugin": "1.27.0-dev-build.163831870",
-    "@verii/auth": "1.0.7",
-    "@verii/aws-clients": "1.0.7",
-    "@verii/common-fetchers": "1.0.7",
-    "@verii/common-functions": "1.0.7",
-    "@verii/common-schemas": "1.0.7",
-    "@verii/config": "1.0.7",
-    "@verii/country-data": "1.0.7",
-    "@verii/crypto": "1.0.7",
-    "@verii/did-doc": "1.0.7",
-    "@verii/fastify-plugins": "1.0.7",
-    "@verii/jwt": "1.0.7",
-    "@verii/organizations-registry": "1.0.7",
-    "@verii/request": "1.0.7",
-    "@verii/server-provider": "1.0.7",
-    "@verii/spencer-mongo-extensions": "1.0.7",
-    "@verii/verii-verification": "1.0.7",
+    "@velocitycareerlabs/migrations": "1.27.0-dev-build.17b8f41df",
+    "@velocitycareerlabs/yoti-integration-plugin": "1.27.0-dev-build.17b8f41df",
+    "@verii/auth": "1.1.0-pre.1763452964",
+    "@verii/aws-clients": "1.1.0-pre.1763452964",
+    "@verii/common-fetchers": "1.1.0-pre.1763452964",
+    "@verii/common-functions": "1.1.0-pre.1763452964",
+    "@verii/common-schemas": "1.1.0-pre.1763452964",
+    "@verii/config": "1.1.0-pre.1763452964",
+    "@verii/country-data": "1.1.0-pre.1763452964",
+    "@verii/crypto": "1.1.0-pre.1763452964",
+    "@verii/did-doc": "1.1.0-pre.1763452964",
+    "@verii/fastify-plugins": "1.1.0-pre.1763452964",
+    "@verii/http-client": "1.1.0-pre.1763452964",
+    "@verii/jwt": "1.1.0-pre.1763452964",
+    "@verii/organizations-registry": "1.1.0-pre.1763452964",
+    "@verii/server-provider": "1.1.0-pre.1763452964",
+    "@verii/spencer-mongo-extensions": "1.1.0-pre.1763452964",
+    "@verii/verii-verification": "1.1.0-pre.1763452964",
     "aws-sdk": "2.1692.0",
     "canonicalize": "^2.0.0",
     "date-fns": "^3.0.0",
@@ -72,8 +72,8 @@
     "@aws-sdk/client-ses": "3.921.0",
     "@aws-sdk/client-sns": "3.921.0",
     "@spencejs/spence-factories": "0.10.2",
-    "@verii/test-regexes": "1.0.7",
-    "@verii/tests-helpers": "1.0.7",
+    "@verii/test-regexes": "1.1.0-pre.1763452964",
+    "@verii/tests-helpers": "1.1.0-pre.1763452964",
     "dotenv": "16.6.1",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
@@ -85,9 +85,9 @@
     "eslint-plugin-prettier": "4.2.5",
     "eslint-watch": "7.0.0",
     "expect": "30.2.0",
-    "nock": "14.0.9",
+    "nock": "v15.0.0-beta.6",
     "nodemon": "3.1.10",
     "prettier": "2.8.8"
   },
-  "gitHead": "06c1711138b1159662859238bf0b2b57c834d5a6"
+  "gitHead": "c9d4aa06c8f27df3ed4c9f54437a6f65c2726035"
 }

package/src/controllers/api/v0.6/push/push-gateway-auth.js

@@ -58,7 +58,7 @@ const loadKey = async (kid, context) => {
   try {
     return await resolveKid({ kid }, context);
   } catch (error) {
-    if (error.response?.statusCode === 404) {
+    if (error?.statusCode === 404) {
       throw newError.Unauthorized('kid_not_found');
     }
     throw newError.Unauthorized('kid_resolution_error');
@@ -69,7 +69,7 @@ const loadOrganizationVerifiedProfile = async (did, context) => {
   try {
     return await getOrganizationVerifiedProfile(did, context);
   } catch (error) {
-    if (error.response?.statusCode === 404) {
+    if (error?.statusCode === 404) {
       throw newError.Unauthorized('issuer_not_found');
     }
     throw newError.Unauthorized('issuer_resolution_error');

package/src/init-server.js

@@ -1,6 +1,6 @@
 const { corsPlugin } = require('@verii/fastify-plugins');
 const { sendEmailPlugin, sendSmsPlugin } = require('@verii/aws-clients');
-const initRequest = require('@verii/request');
+const { httpClientPlugin } = require('@verii/fastify-plugins');
 const Static = require('@fastify/static');
 const AutoLoad = require('@fastify/autoload');
 const path = require('path');
@@ -35,38 +35,29 @@ const initServer = (server) => {
       autoHooks: true,
       cascadeHooks: true,
     })
-    .decorate(
-      'baseAgentFetch',
-      initRequest({
+    .register(httpClientPlugin, {
+      name: 'agentFetch',
+      options: {
         ...server.config,
         prefixUrl: server.config.agentUrl,
-      })
-    )
-    .decorateRequest('agentFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.agentFetch = server.baseAgentFetch(req);
+      },
     })
-    .decorate(
-      'baseRegistrarFetch',
-      initRequest({
+    .register(httpClientPlugin, {
+      name: 'registrarFetch',
+      options: {
         ...server.config,
         prefixUrl: server.config.registrarUrl,
-      })
-    )
-    .decorateRequest('registrarFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.registrarFetch = server.baseRegistrarFetch(req);
+      },
     })
-    .decorate(
-      'baseLibFetch',
-      initRequest({
-        ...pick(['nodeEnv', 'requestTimeout', 'traceIdHeader'], server.config),
+    .register(httpClientPlugin, {
+      name: 'libFetch',
+      options: {
+        ...pick(
+          ['nodeEnv', 'requestTimeout', 'traceIdHeader', 'isTest'],
+          server.config
+        ),
         prefixUrl: server.config.libUrl,
-      })
-    )
-    .decorateRequest('libFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.libFetch = server.baseLibFetch(req);
+      },
     })
     .register(Static, {
       root: path.join(__dirname, 'assets'),

package/test/push-gateway-auth.test.js

@@ -5,7 +5,7 @@ const { expect } = require('expect');
 const { generateKeyPair, createCommitment } = require('@verii/crypto');
 const nock = require('nock');
 const { generateDocJwt } = require('@verii/jwt');
-const initRequest = require('@verii/request');
+const { initHttpClient } = require('@verii/http-client');
 const canonicalize = require('canonicalize');
 const { CredentialCheckResultValue } = require('@verii/verii-verification');
 const {
@@ -20,6 +20,8 @@ describe('Validate authorization token for the push gateway', () => {
   const did = 'did:velocity:123';
   const kid = `${did}#key-1`;
 
+  const prefixUrl = 'http://registrar.localhost.test';
+
   const verifiedProfile = ({
     permittedVelocityServiceCategory = ['Issuer'],
     credentialChecks = {},
@@ -70,17 +72,18 @@ describe('Validate authorization token for the push gateway', () => {
       config: { hostUrl, rootPrivateKey },
       body,
       headers: { authorization: authHeader },
-      registrarFetch: initRequest({
-        prefixUrl: 'http://registrar.localhost.test',
-      })({ log: console }),
+      registrarFetch: initHttpClient({
+        prefixUrl,
+        isTest: true,
+      })(prefixUrl, { log: console }),
     };
   });
 
   it('Should confirm a valid auth token', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(200, publicKey);
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(
         `/api/v0.6/organizations/${encodeURIComponent(did)}/verified-profile`
       )
@@ -89,7 +92,7 @@ describe('Validate authorization token for the push gateway', () => {
   });
 
   it('Should throw an error if invalid hash', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(200, publicKey);
 
@@ -104,7 +107,7 @@ describe('Validate authorization token for the push gateway', () => {
   });
 
   it('Should throw an error if kid cannot be resolved', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(404, publicKey);
 
@@ -114,7 +117,7 @@ describe('Validate authorization token for the push gateway', () => {
   });
 
   it('Should throw an error if kid resolution encounters an error', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(500);
 
@@ -124,10 +127,10 @@ describe('Validate authorization token for the push gateway', () => {
   });
 
   it('Should throw an error if did cannot be found', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(200, publicKey);
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(
         `/api/v0.6/organizations/${encodeURIComponent(did)}/verified-profile`
       )
@@ -139,10 +142,10 @@ describe('Validate authorization token for the push gateway', () => {
   });
 
   it('Should throw an error if did cannot be resolved', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(200, publicKey);
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(
         `/api/v0.6/organizations/${encodeURIComponent(did)}/verified-profile`
       )
@@ -153,10 +156,10 @@ describe('Validate authorization token for the push gateway', () => {
     });
   });
   it('Should throw an error if invalid permittedVelocityServiceCategory', async () => {
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
       .reply(200, publicKey);
-    nock('http://registrar.localhost.test')
+    nock(prefixUrl)
       .get(
         `/api/v0.6/organizations/${encodeURIComponent(did)}/verified-profile`
       )
@@ -190,10 +193,10 @@ describe('Validate authorization token for the push gateway', () => {
     ];
 
     for (const { check, message } of failedChecks) {
-      nock('http://registrar.localhost.test')
+      nock(prefixUrl)
         .get(`/api/v0.6/resolve-kid/${encodeURIComponent(kid)}?format=jwk`)
         .reply(200, publicKey);
-      nock('http://registrar.localhost.test')
+      nock(prefixUrl)
         .get(
           `/api/v0.6/organizations/${encodeURIComponent(did)}/verified-profile`
         )