@velocitycareerlabs/server-webwallet 1.27.0-dev-build.18cc7822e → 1.27.0-dev-build.191854f58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-webwallet",
-  "version": "1.27.0-dev-build.18cc7822e",
+  "version": "1.27.0-dev-build.191854f58",
   "description": "Web Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -34,31 +34,31 @@
     "@fastify/swagger": "^9.0.0",
     "@fastify/swagger-ui": "^5.0.0",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/migrations": "1.27.0-dev-build.18cc7822e",
-    "@verii/auth": "1.0.7",
-    "@verii/common-functions": "1.0.7",
-    "@verii/common-schemas": "1.0.7",
-    "@verii/config": "1.0.7",
-    "@verii/fastify-plugins": "1.0.7",
-    "@verii/jwt": "1.0.7",
-    "@verii/request": "1.0.7",
-    "@verii/server-provider": "1.0.7",
-    "@verii/vc-checks": "1.0.7",
-    "@verii/vnf-nodejs-wallet-sdk": "1.0.7",
+    "@velocitycareerlabs/migrations": "1.27.0-dev-build.191854f58",
+    "@verii/auth": "1.1.0-pre.1762411615",
+    "@verii/common-functions": "1.1.0-pre.1762411615",
+    "@verii/common-schemas": "1.1.0-pre.1762411615",
+    "@verii/config": "1.1.0-pre.1762411615",
+    "@verii/fastify-plugins": "1.1.0-pre.1762411615",
+    "@verii/http-client": "1.1.0-pre.1762411615",
+    "@verii/jwt": "1.1.0-pre.1762411615",
+    "@verii/server-provider": "1.1.0-pre.1762411615",
+    "@verii/vc-checks": "1.1.0-pre.1762411615",
+    "@verii/vnf-nodejs-wallet-sdk": "1.1.0-pre.1762411615",
     "blueimp-md5": "2.19.0",
     "env-var": "^7.0.0",
     "fastify": "^5.0.0",
     "fastify-plugin": "^5.0.0",
-    "got": "11.8.6",
     "http-errors": "2.0.0",
     "lodash": "^4.17.21",
     "migrate-mongo": "~11.0.0",
-    "mongodb": "~6.19.0"
+    "mongodb": "~6.19.0",
+    "undici": "^7.0.0"
   },
   "devDependencies": {
     "@spencejs/spence-factories": "0.10.2",
-    "@verii/crypto": "1.0.7",
-    "@verii/tests-helpers": "1.0.7",
+    "@verii/crypto": "1.1.0-pre.1762411615",
+    "@verii/tests-helpers": "1.1.0-pre.1762411615",
     "dotenv": "16.6.1",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
@@ -70,9 +70,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": "15ad5367e4e6b0969707994f12bf5f76d6ef8412"
+  "gitHead": "6fa4496c8f99eb2b05763ba4d8140a5e3008707e"
 }

package/src/controllers/linkedin/controller.js

@@ -119,7 +119,7 @@ const linkedinController = async (fastify) => {
           userEmail: elements[0]['handle~'].emailAddress,
         };
       } catch (error) {
-        if (error?.response.statusCode === 401) {
+        if (error?.statusCode === 401) {
           await accounts.updateUsingFilter(
             {
               filter: { userId: user.sub },
@@ -244,11 +244,14 @@ const linkedinController = async (fastify) => {
                 asset: uploadLinkData.value.asset,
               };
 
-              await uploadImageToLinkedin({
-                accessToken: linkedinAccessToken,
-                file: params.logo,
-                uploadUrl: imageData.uploadUrl,
-              });
+              await uploadImageToLinkedin(
+                {
+                  accessToken: linkedinAccessToken,
+                  file: params.logo,
+                  uploadUrl: imageData.uploadUrl,
+                },
+                req
+              );
             }
             return createLinkedinPost(
               {

package/src/fetchers/career-wallet/create-account-fetcher.js

@@ -1,5 +1,7 @@
-const createCareerWalletAccount = (payload, { careerWalletFetch }) => {
-  return careerWalletFetch.post('api/v0.6/accounts', { json: payload }).json();
+const createCareerWalletAccount = async (payload, { careerWalletFetch }) => {
+  const response = await careerWalletFetch.post('api/v0.6/accounts', payload);
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/create-did-fetcher.js

@@ -1,15 +1,18 @@
-const createDidForAccount = (crv, accessToken, { careerWalletFetch }) => {
-  return careerWalletFetch
-    .post('api/v0.6/create_did_key', {
-      json: {
-        crv: `${crv}`,
-        didMethod: 'did:jwk',
-      },
+const createDidForAccount = async (crv, accessToken, { careerWalletFetch }) => {
+  const response = await careerWalletFetch.post(
+    'api/v0.6/create_did_key',
+    {
+      crv: `${crv}`,
+      didMethod: 'did:jwk',
+    },
+    {
       headers: {
         Authorization: `Bearer ${accessToken}`,
       },
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/get-app-config.js

@@ -1,9 +1,9 @@
-const getAppConfig = async ({ careerWalletFetch, cache }) => {
-  return careerWalletFetch
-    .get('api/v0.6/careerwallet/appconfig', {
-      cache,
-    })
-    .json();
+const getAppConfig = async ({ careerWalletFetch }) => {
+  const response = await careerWalletFetch.get(
+    'api/v0.6/careerwallet/appconfig'
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/get-consents.js

@@ -1,11 +1,14 @@
-const getConsentLatest = (accountId, { careerWalletFetch, config }) => {
-  return careerWalletFetch
-    .get(`api/v0.6/careerwallet/consents/latest?accountId=${accountId}`, {
+const getConsentLatest = async (accountId, { careerWalletFetch, config }) => {
+  const response = await careerWalletFetch.get(
+    `api/v0.6/careerwallet/consents/latest?accountId=${accountId}`,
+    {
       headers: {
         Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
       },
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/get-credential-categories.js

@@ -1,5 +1,9 @@
-const getCredentialCategories = ({ careerWalletFetch }) => {
-  return careerWalletFetch.get('api/v0.6/credential-categories').json();
+const getCredentialCategories = async ({ careerWalletFetch }) => {
+  const response = await careerWalletFetch.get(
+    'api/v0.6/credential-categories'
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/get-personas.js

@@ -1,5 +1,7 @@
-const getPersonas = ({ careerWalletFetch, cache }) => {
-  return careerWalletFetch.get('reference/personas', { cache }).json();
+const getPersonas = async ({ careerWalletFetch }) => {
+  const response = await careerWalletFetch.get('reference/personas');
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/post-consent.js

@@ -1,7 +1,10 @@
-const postConsent = (payload, authorization, { careerWalletFetch }) => {
-  return careerWalletFetch
-    .post('api/v0.6/careerwallet/consents/add', { json: payload })
-    .json();
+const postConsent = async (payload, authorization, { careerWalletFetch }) => {
+  const response = await careerWalletFetch.post(
+    'api/v0.6/careerwallet/consents/add',
+    payload
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/send-feedback.js

@@ -1,12 +1,11 @@
-const sendFeedback = (payload, { careerWalletFetch, config }) => {
-  return careerWalletFetch
-    .post('api/v0.6/feedback', {
-      json: payload,
-      headers: {
-        Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
-      },
-    })
-    .json();
+const sendFeedback = async (payload, { careerWalletFetch, config }) => {
+  const response = await careerWalletFetch.post('api/v0.6/feedback', payload, {
+    headers: {
+      Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
+    },
+  });
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/sign-fetcher.js

@@ -1,12 +1,11 @@
-const signFetcher = (payload, accessToken, { careerWalletFetch }) => {
-  return careerWalletFetch
-    .post('api/v0.6/jwt/sign', {
-      json: { ...payload },
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-    .json();
+const signFetcher = async (payload, accessToken, { careerWalletFetch }) => {
+  const response = await careerWalletFetch.post('api/v0.6/jwt/sign', payload, {
+    headers: {
+      Authorization: `Bearer ${accessToken}`,
+    },
+  });
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/verify-id-credential-confirm-code.js

@@ -1,17 +1,19 @@
 const verifyIdCredentialConfirmCode = async (
   verificationCode,
-  { careerWalletFetch, cache, config }
+  { careerWalletFetch, config }
 ) => {
-  return careerWalletFetch
-    .post('api/v0.6/verify/confirm', {
-      json: { verificationCode },
+  const response = await careerWalletFetch.post(
+    'api/v0.6/verify/confirm',
+    { verificationCode },
+    {
       headers: {
         'x-vcl-verif-version': config.vclVerificationVersion,
         Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
       },
-      cache,
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/career-wallet/verify-id-credential-request-code.js

@@ -1,18 +1,20 @@
 const verifyIdCredentialRequestCode = async (
   credentialType,
   value,
-  { careerWalletFetch, cache, config }
+  { careerWalletFetch, config }
 ) => {
-  return careerWalletFetch
-    .post(`api/v0.6/verify/${credentialType}/request-code`, {
-      json: { value },
+  const response = await careerWalletFetch.post(
+    `api/v0.6/verify/${credentialType}/request-code`,
+    { value },
+    {
       headers: {
         'x-vcl-verif-version': config.vclVerificationVersion,
         Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
       },
-      cache,
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/credverify/remove-credentials.js

@@ -1,15 +1,18 @@
-const removeCredentials = (
+const removeCredentials = async (
   payload,
   { verificationServiceActionFetch, config }
 ) => {
-  return verificationServiceActionFetch
-    .post('remove-credentials', {
-      json: payload,
+  const response = await verificationServiceActionFetch.post(
+    'remove-credentials',
+    payload,
+    {
       headers: {
         Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
       },
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/lib-api/get-credential-display-schema.js

@@ -1,10 +1,9 @@
-const getCredentialDisplaySchema = async (
-  credentialType,
-  { libFetch, cache }
-) => {
-  return libFetch
-    .get(`display-descriptors/${credentialType}.descriptor.json`, { cache })
-    .json();
+const getCredentialDisplaySchema = async (credentialType, { libFetch }) => {
+  const response = await libFetch.get(
+    `display-descriptors/${credentialType}.descriptor.json`
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/create-linkedin-post.js

@@ -1,43 +1,46 @@
-const createLinkedinPost = (
+const createLinkedinPost = async (
   { accessToken, linkedinUserId, text, asset },
   { linkedInFetch }
 ) => {
-  return linkedInFetch
-    .post('ugcPosts', {
+  const response = await linkedInFetch.post(
+    'ugcPosts',
+    {
+      author: `urn:li:person:${linkedinUserId}`,
+      lifecycleState: 'PUBLISHED',
+      specificContent: {
+        'com.linkedin.ugc.ShareContent': {
+          shareCommentary: {
+            text,
+          },
+          ...(asset
+            ? {
+                shareMediaCategory: 'IMAGE',
+                media: [
+                  {
+                    status: 'READY',
+                    media: asset,
+                  },
+                ],
+              }
+            : {
+                shareMediaCategory: 'NONE',
+              }),
+        },
+      },
+      visibility: {
+        'com.linkedin.ugc.MemberNetworkVisibility': 'PUBLIC',
+      },
+    },
+    {
       headers: {
         'Content-Type': 'application/json',
         'X-Restli-Protocol-Version': '2.0.0',
         Authorization: `Bearer ${accessToken}`,
       },
-      json: {
-        author: `urn:li:person:${linkedinUserId}`,
-        lifecycleState: 'PUBLISHED',
-        specificContent: {
-          'com.linkedin.ugc.ShareContent': {
-            shareCommentary: {
-              text,
-            },
-            ...(asset
-              ? {
-                  shareMediaCategory: 'IMAGE',
-                  media: [
-                    {
-                      status: 'READY',
-                      media: asset,
-                    },
-                  ],
-                }
-              : {
-                  shareMediaCategory: 'NONE',
-                }),
-          },
-        },
-        visibility: {
-          'com.linkedin.ugc.MemberNetworkVisibility': 'PUBLIC',
-        },
-      },
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/get-access-token.js

@@ -1,24 +1,27 @@
-const getLinkedInAccessToken = (
+const getLinkedInAccessToken = async (
   { code, redirectUri },
   { config, linkedInAuthFetch }
 ) => {
-  return linkedInAuthFetch
-    .post('accessToken', {
+  const response = await linkedInAuthFetch.post(
+    'accessToken',
+    String(
+      new URLSearchParams({
+        code,
+        redirect_uri:
+          redirectUri || `${config.webWalletBaseUrl}/share-to-linkedin`,
+        client_id: config.linkedIn.clientId,
+        client_secret: config.linkedIn.clientSecret,
+        grant_type: 'authorization_code',
+      })
+    ),
+    {
       headers: {
         'Content-Type': ' application/x-www-form-urlencoded',
       },
-      body: String(
-        new URLSearchParams({
-          code,
-          redirect_uri:
-            redirectUri || `${config.webWalletBaseUrl}/share-to-linkedin`,
-          client_id: config.linkedIn.clientId,
-          client_secret: config.linkedIn.clientSecret,
-          grant_type: 'authorization_code',
-        })
-      ),
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/get-linkedin-user-email.js

@@ -1,11 +1,14 @@
-const getLinkedInUserEmail = (accessToken, { linkedInFetch }) => {
-  return linkedInFetch
-    .get('emailAddress?q=members&projection=(elements*(handle~))', {
+const getLinkedInUserEmail = async (accessToken, { linkedInFetch }) => {
+  const response = await linkedInFetch.get(
+    'emailAddress?q=members&projection=(elements*(handle~))',
+    {
       headers: {
         Authorization: `Bearer ${accessToken}`,
       },
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/get-linkedin-user-id.js

@@ -1,14 +1,14 @@
-const getLinkedInUserId = (accessToken, { linkedInFetch }) => {
-  return linkedInFetch
-    .get(
-      'me?projection=(id,localizedFirstName,localizedLastName,profilePicture(displayImage~digitalmediaAsset:playableStreams))',
-      {
-        headers: {
-          Authorization: `Bearer ${accessToken}`,
-        },
-      }
-    )
-    .json();
+const getLinkedInUserId = async (accessToken, { linkedInFetch }) => {
+  const response = await linkedInFetch.get(
+    'me?projection=(id,localizedFirstName,localizedLastName,profilePicture(displayImage~digitalmediaAsset:playableStreams))',
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/register-image-to-upload.js

@@ -1,28 +1,31 @@
-const registerImageToUpload = (
+const registerImageToUpload = async (
   { linkedinUserId, accessToken },
   { linkedInFetch }
 ) => {
-  return linkedInFetch
-    .post('assets?action=registerUpload', {
+  const response = await linkedInFetch.post(
+    'assets?action=registerUpload',
+    {
+      registerUploadRequest: {
+        recipes: ['urn:li:digitalmediaRecipe:feedshare-image'],
+        owner: `urn:li:person:${linkedinUserId}`,
+        serviceRelationships: [
+          {
+            relationshipType: 'OWNER',
+            identifier: 'urn:li:userGeneratedContent',
+          },
+        ],
+      },
+    },
+    {
       headers: {
         'Content-Type': 'application/json',
         'X-Restli-Protocol-Version': '2.0.0',
         Authorization: `Bearer ${accessToken}`,
       },
-      json: {
-        registerUploadRequest: {
-          recipes: ['urn:li:digitalmediaRecipe:feedshare-image'],
-          owner: `urn:li:person:${linkedinUserId}`,
-          serviceRelationships: [
-            {
-              relationshipType: 'OWNER',
-              identifier: 'urn:li:userGeneratedContent',
-            },
-          ],
-        },
-      },
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/revoke-linkedin-access.js

@@ -1,18 +1,24 @@
-const revokeLinkedinAccess = (accessToken, { config, linkedInAuthFetch }) => {
-  return linkedInAuthFetch
-    .post('revoke', {
+const revokeLinkedinAccess = async (
+  accessToken,
+  { config, linkedInAuthFetch }
+) => {
+  const response = await linkedInAuthFetch.post(
+    'revoke',
+    String(
+      new URLSearchParams({
+        client_id: config.linkedIn.clientId,
+        client_secret: config.linkedIn.clientSecret,
+        token: accessToken,
+      })
+    ),
+    {
       headers: {
         'Content-Type': ' application/x-www-form-urlencoded',
       },
-      body: String(
-        new URLSearchParams({
-          client_id: config.linkedIn.clientId,
-          client_secret: config.linkedIn.clientSecret,
-          token: accessToken,
-        })
-      ),
-    })
-    .json();
+    }
+  );
+
+  return response.json();
 };
 
 module.exports = {

package/src/fetchers/linkedin/upload-image-to-linkedin.js

@@ -1,14 +1,14 @@
-const { default: got } = require('got');
+const uploadImageToLinkedin = async (
+  { accessToken, uploadUrl, file },
+  { fetch }
+) => {
+  const response = await fetch.post(uploadUrl, file, {
+    headers: {
+      Authorization: `Bearer ${accessToken}`,
+    },
+  });
 
-const uploadImageToLinkedin = ({ accessToken, uploadUrl, file }) => {
-  return got
-    .post(uploadUrl, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-      body: file,
-    })
-    .json();
+  return response.json();
 };
 
 module.exports = {

package/src/init-server.js

@@ -1,5 +1,5 @@
 const { corsPlugin } = require('@verii/fastify-plugins');
-const initRequest = require('@verii/request');
+const { httpClientPlugin } = require('@verii/fastify-plugins');
 const AutoLoad = require('@fastify/autoload');
 const path = require('path');
 const { pick } = require('lodash/fp');
@@ -27,87 +27,67 @@ const initServer = (server) => {
       autoHooks: true,
       cascadeHooks: true,
     })
-    .decorate(
-      'baseAgentFetch',
-      initRequest({
+    .register(httpClientPlugin, {
+      name: 'fetch',
+      options: pick(
+        ['nodeEnv', 'requestTimeout', 'traceIdHeader', 'isTest'],
+        server.config
+      ),
+    })
+    .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);
+      },
     })
-    .decorate(
-      'baseVerificationServiceActionFetch',
-      initRequest({
-        ...pick(['nodeEnv', 'requestTimeout', 'traceIdHeader'], server.config),
+    .register(httpClientPlugin, {
+      name: 'verificationServiceActionFetch',
+      options: {
+        ...pick(
+          ['nodeEnv', 'requestTimeout', 'traceIdHeader', 'isTest'],
+          server.config
+        ),
         prefixUrl: server.config.verificationServiceActionBaseUrl,
-      })
-    )
-    .decorateRequest('verificationServiceActionFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.verificationServiceActionFetch =
-        server.baseVerificationServiceActionFetch(req);
+      },
     })
-    .decorate(
-      'baseCareerWalletFetch',
-      initRequest({
+    .register(httpClientPlugin, {
+      name: 'careerWalletFetch',
+      options: {
         ...server.config,
         prefixUrl: server.config.careerWalletUrl,
-      })
-    )
-    .decorate(
-      'globalCareerWalletFetch',
-      server.baseCareerWalletFetch({ log: server.log })
-    )
-    .decorateRequest('careerWalletFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.careerWalletFetch = server.baseCareerWalletFetch(req);
+      },
     })
-    .decorate(
-      'baseLinkedInFetch',
-      initRequest({
+    .register(httpClientPlugin, {
+      name: 'linkedInFetch',
+      options: {
         ...server.config,
         prefixUrl: server.config.linkedIn.apiUrl,
-      })
-    )
-    .decorateRequest('linkedInFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.linkedInFetch = server.baseLinkedInFetch(req);
+      },
     })
-    .decorate(
-      'baseLinkedInAuthFetch',
-      initRequest({
+    .register(httpClientPlugin, {
+      name: 'linkedInAuthFetch',
+      options: {
         ...server.config,
         prefixUrl: server.config.linkedIn.authUrl,
-      })
-    )
-    .decorateRequest('linkedInAuthFetch', null)
-    .addHook('preValidation', async (req) => {
-      req.linkedInAuthFetch = server.baseLinkedInAuthFetch(req);
+      },
     })
     .register(vnfSdkPlugin)
     .addHook('preValidation', async (req) => {

package/src/plugins/crypto-services/jwt-sign-service-impl.js

@@ -13,7 +13,13 @@ const JwtSignServiceImpl = (context) => {
       const signedJwtRes = await signFetcher(
         payload,
         remoteCryptoServicesToken,
-        { ...context, careerWalletFetch: context.globalCareerWalletFetch }
+        {
+          ...context,
+          careerWalletFetch: context.baseCareerWalletFetch()(
+            context.config.careerWalletUrl,
+            context
+          ),
+        }
       );
       const signedJwt = signedJwtRes.compactJwt;
       return new Promise((resolve) => {

package/src/plugins/crypto-services/key-service-impl.js

@@ -9,7 +9,13 @@ const KeyServiceImpl = (context) => {
       const didJwkJson = await createDidForAccount(
         didJwkDescriptor.signatureAlgorithm,
         didJwkDescriptor.remoteCryptoServicesToken,
-        { ...context, careerWalletFetch: context.globalCareerWalletFetch }
+        {
+          ...context,
+          careerWalletFetch: context.baseCareerWalletFetch()(
+            context.config.careerWalletUrl,
+            context
+          ),
+        }
       );
       return new Promise((resolve) => {
         resolve(VCLDidJwk.fromJSON(didJwkJson));

package/src/plugins/fetch-errors-handler-plugin.js

@@ -1,6 +1,6 @@
 const fp = require('fastify-plugin');
 const newError = require('http-errors');
-const { HTTPError } = require('got');
+const { errors } = require('undici');
 const { isObject } = require('lodash/fp');
 const { WebWalletServerError } = require('../errors/error-codes');
 
@@ -20,7 +20,7 @@ const fetchErrorsHandlerPlugin = (fastify, options, next) => {
 };
 
 const handleHttpErrors = (error) => {
-  if (error instanceof HTTPError) {
+  if (error instanceof errors.ResponseError) {
     handleHTTPError(error);
   } else {
     handleGenericError(error);
@@ -28,16 +28,29 @@ const handleHttpErrors = (error) => {
 };
 
 const handleHTTPError = (error) => {
-  const errorBody = parseErrorBody(error.response.body);
-  throw newError(
-    error.response.statusCode,
-    errorBody?.message || errorBody || error.response.statusMessage,
-    {
+  if (!error.errorCode) {
+    const errorBody = getErrorBody(error);
+    throw newError(getStatusCode(error), getErrorMesssage(error, errorBody), {
       ...(isObject(errorBody) ? errorBody : {}),
-    }
-  );
+    });
+  } else {
+    throw error;
+  }
 };
 
+const getErrorBody = (error) =>
+  parseErrorBody(error?.response?.body || error?.body);
+
+const getStatusCode = (error) =>
+  error?.response?.statusCode || error?.statusCode;
+
+const getErrorMesssage = (error, errorBody) =>
+  errorBody?.message ||
+  errorBody ||
+  error?.statusMessage ||
+  error?.code ||
+  'HTTP Error';
+
 const handleGenericError = (error) => {
   if (!error.errorCode) {
     throw newError(error.statusCode || 500, error.message, {

package/test/fetch-errors-handler-plugin.test.js

@@ -4,9 +4,21 @@ const { expect } = require('expect');
 
 const buildFastify = require('fastify');
 const nock = require('nock');
-const got = require('got');
+const { request, errors } = require('undici');
 const { fetchErrorsHandlerPlugin } = require('../src/plugins');
 
+const handleResponse = async (response, isText = false) => {
+  if (response.statusCode >= 300) {
+    const body = isText
+      ? await response.body.text()
+      : await response.body.json();
+    throw new errors.ResponseError(body.message, response.statusCode, {
+      code: body.code,
+      body,
+    });
+  }
+};
+
 describe('Test fetchErrorsHandlerPlugin', () => {
   let fastify;
 
@@ -16,9 +28,13 @@ describe('Test fetchErrorsHandlerPlugin', () => {
   });
 
   it('Should return the same HTTPError as the nested fetch request', async () => {
-    fastify.get('/test', () =>
-      got.get('https://test/endpoint_that_returns_error')
-    );
+    fastify.get('/test', async () => {
+      const response = await request(
+        'https://test/endpoint_that_returns_error'
+      );
+
+      await handleResponse(response);
+    });
 
     const nockedRequest = nock('https://test')
       .get('/endpoint_that_returns_error')
@@ -49,9 +65,13 @@ describe('Test fetchErrorsHandlerPlugin', () => {
   });
 
   it('Should return correct error when nested fetch request returns fatal error', async () => {
-    fastify.get('/test', () =>
-      got.get('https://test/endpoint_that_throws_fatal_error')
-    );
+    fastify.get('/test', async () => {
+      const response = await request(
+        'https://test/endpoint_that_throws_fatal_error'
+      );
+
+      await handleResponse(response);
+    });
 
     const nockedRequest = nock('https://test')
       .get('/endpoint_that_throws_fatal_error')
@@ -65,7 +85,6 @@ describe('Test fetchErrorsHandlerPlugin', () => {
     expect(response.statusCode).toBe(500);
 
     expect(response.json()).toEqual({
-      code: 'ERR_GOT_REQUEST_ERROR',
       error: 'Internal Server Error',
       message: 'Unknown fatal error',
       statusCode: 500,
@@ -75,9 +94,13 @@ describe('Test fetchErrorsHandlerPlugin', () => {
   });
 
   it('Should return correct error when nested fetch request returns string error', async () => {
-    fastify.get('/test', () =>
-      got.get('https://test/endpoint_that_returns_error')
-    );
+    fastify.get('/test', async () => {
+      const response = await request(
+        'https://test/endpoint_that_returns_error'
+      );
+
+      await handleResponse(response, true);
+    });
 
     const nockedRequest = nock('https://test')
       .get('/endpoint_that_returns_error')

package/test/linkedin-controller.test.js

@@ -401,9 +401,7 @@ describe('linkedin-controller', () => {
       });
 
       expect(response.statusCode).toBe(400);
-      expect(JSON.parse(response.payload).error).toBe(
-        'Response code 400 (Bad Request)'
-      );
+      expect(JSON.parse(response.payload).error).toBe('Response Error');
     });
   });
 });