@velocitycareerlabs/server-webwallet 1.25.0-dev-build.1a0f93709 → 1.25.0-dev-build.17c8036c5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-webwallet",
-  "version": "1.25.0-dev-build.1a0f93709",
+  "version": "1.25.0-dev-build.17c8036c5",
   "description": "Web Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -28,17 +28,17 @@
     "@fastify/autoload": "5.10.0",
     "@fastify/multipart": "~8.3.1",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/auth": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/common-functions": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/common-schemas": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/config": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/jwt": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/migrations": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/request": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/server-provider": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/vc-checks": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "1.25.0-dev-build.1a0f93709",
+    "@velocitycareerlabs/auth": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/common-functions": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/common-schemas": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/config": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/jwt": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/migrations": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/request": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/server-provider": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/vc-checks": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "1.25.0-dev-build.17c8036c5",
     "blueimp-md5": "2.19.0",
     "env-var": "^7.0.0",
     "fastify": "4.29.0",
@@ -51,8 +51,8 @@
   },
   "devDependencies": {
     "@spencejs/spence-factories": "0.10.2",
-    "@velocitycareerlabs/crypto": "1.25.0-dev-build.1a0f93709",
-    "@velocitycareerlabs/tests-helpers": "1.25.0-dev-build.1a0f93709",
+    "@velocitycareerlabs/crypto": "1.25.0-dev-build.17c8036c5",
+    "@velocitycareerlabs/tests-helpers": "1.25.0-dev-build.17c8036c5",
     "dotenv": "16.4.7",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
@@ -68,5 +68,5 @@
     "nodemon": "3.1.9",
     "prettier": "2.8.8"
   },
-  "gitHead": "a6f6011b8a2c640b5812f0d8daabab494d0456c6"
+  "gitHead": "8cbf70c3e8fbf7d5b345ce013b64f1f7a35c005b"
 }

package/src/entities/credentials/orchestrators/load-additional-render-info.js

@@ -4,10 +4,6 @@ const {
   VCLOrganizationsSearchDescriptor,
   VCLFilter,
 } = require('@velocitycareerlabs/vnf-nodejs-wallet-sdk');
-const {
-  normalizeJsonSchemaName,
-} = require('@velocitycareerlabs/common-functions');
-const { getCredentialDisplaySchema } = require('../../../fetchers/lib-api');
 
 const loadAdditionalRenderInfo = async (credentials, context) => {
   return {
@@ -37,13 +33,10 @@ const loadIssuersInfo = async (credentials, context) => {
   }, {});
 };
 
-const getCredentialSchemaByType = async (credentialTypes, context) => {
+const getCredentialSchemaByType = async (credentialTypes) => {
   const schemas = await Promise.all(
     map(
-      (type) =>
-        getCredentialDisplaySchema(normalizeJsonSchemaName(type), context).then(
-          (data) => [type, data]
-        ),
+      ([type, url]) => fetchDisplayDescriptor(url).then((data) => [type, data]),
       credentialTypes
     )
   );
@@ -51,10 +44,24 @@ const getCredentialSchemaByType = async (credentialTypes, context) => {
   return fromPairs(schemas);
 };
 
+const fetchDisplayDescriptor = async (url) => {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch descriptor from ${url}`);
+  }
+  return response.json();
+};
+
 const loadCredentialTypeDisplaySchemas = async (credentials, context) => {
   const credentialTypes = flow(map('type.0'), compact, uniq)(credentials);
+  const typesInfo = await context.vclSdk.credentialTypes;
+  const matchedTypes = credentialTypes.map((type) => [
+    type,
+    typesInfo.all.find((info) => info.credentialType === type)?.payload
+      .displayDescriptorUrls.en,
+  ]);
 
-  return getCredentialSchemaByType(credentialTypes, context);
+  return getCredentialSchemaByType(matchedTypes, context);
 };
 
 module.exports = {

package/test/credentials-controller.test.js

@@ -1,3 +1,4 @@
+const { mock } = require('node:test');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
 const nock = require('nock');
@@ -13,6 +14,7 @@ const {
   errorResponseMatcher,
 } = require('@velocitycareerlabs/tests-helpers/src/error-matchers');
 const buildFastify = require('./helpers/webwallet-build-fastify');
+const { mockFetch } = require('./helpers/mock-fetch');
 const { mockSchema, mockedCredentialCategories } = require('./mocks');
 const initCredentialsFactory = require('./factories/credentials');
 const { WebWalletServerError } = require('../src/errors/error-codes');
@@ -22,7 +24,7 @@ const auth0Token =
   'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IktFWSJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlzcyI6Imh0dHBzOi8vbG9jYWxob3N0LyIsImF1ZCI6ImZvbyIsInNjb3BlIjoicmVhZDp1c2VycyJ9.VwIIUqx9T-AxqbfL_FyNRAeOxTwiC2JpcwtrqnEWN3DdF07ijUkF1WYy8Ahfr_p4R3KnoPbiefZnIbVANCt-lt0ej32rfil2yHhQEsvFxSOjcrx6ARmPp0YAfWlN-5Sotzkxy29jaOZMEDkmRFZg3jkdC7wosPW_S6M-olC4g3HHfylpZI8O3Jdd87Qr9wD_QtUzANwnPbl2Q-9NEyxVjAZIWg_HWK9JAAaf_2IY5VwHBvyp0oeQSEHKi4hogcM59EOc4FxdR5WH45B_PenVa6W4mHFBkH8sAXxt2Zs9s2efujkfWYfyXvgL_lN7vT-TEADlAPP2L6CpWpDISOMsQWUSgGHcN_KwRh_E7qJwahR6mv4QHY6ReEoyjkmSS3swrD1l74jNs7QLAdsMywvzCMDsHabs7DYcEMGQBdP14PJ_ucLFnkivZeBDAc6sS445ocbyrpyO40XMaMorD5khRd9ej89SxR7d_v0W6Ne2Nn4XgW3pAZzu5Rdc4JvqfzLFxkp95jxy1MTAddjWISPmNOYYyXHM9SSqSpqVECOFS0f4z2zycHRqXUcOytWrvED6VGo9x7-IVCgu8vFzj0zToIWQmsDs3UoH9RnV12z0PMwGXQzca1lT_zGwJxBF3e4zJjmcJ05OMF2JgZ2_G48O3M4Dtb0jlgWbKLd0kWlIFzQ;';
 
 jest.mock('@velocitycareerlabs/vnf-nodejs-wallet-sdk', () => {
-  const { mockIssuers } = require('./mocks');
+  const { mockIssuers, mockCredentialTypes } = require('./mocks');
   const originalModule = jest.requireActual(
     '@velocitycareerlabs/vnf-nodejs-wallet-sdk'
   );
@@ -32,6 +34,7 @@ jest.mock('@velocitycareerlabs/vnf-nodejs-wallet-sdk', () => {
       getInstance: jest.fn().mockReturnValue({
         initialize: jest.fn().mockResolvedValue(null),
         searchForOrganizations: jest.fn().mockResolvedValue(mockIssuers),
+        credentialTypes: mockCredentialTypes,
       }),
     },
   };
@@ -41,14 +44,12 @@ const vclSdk = VCLProvider.getInstance();
 
 describe('Test credentials controller', () => {
   let fastify;
-  let schemaNock;
   let persistCredentials;
 
   beforeAll(async () => {
     fastify = buildFastify();
 
     nock('https://localhost/').get('/.well-known/jwks.json').reply(200, jwks);
-    schemaNock = nockSchemaRequest(fastify);
 
     await fastify.ready();
     ({ persistCredentials } = initCredentialsFactory(fastify));
@@ -77,6 +78,7 @@ describe('Test credentials controller', () => {
         }),
       ]);
 
+      mock.method(global, 'fetch', () => mockFetch(200, mockSchema));
       const response = await fastify.injectJson({
         method: 'GET',
         url: '/credentials',
@@ -93,8 +95,7 @@ describe('Test credentials controller', () => {
           new VCLFilter(currentUserCredential.issuer.id)
         )
       );
-
-      expect(schemaNock.isDone()).toBe(true);
+      expect(global.fetch.mock.calls).toHaveLength(1);
 
       expect(response.json).toEqual({
         credentials: [
@@ -256,13 +257,6 @@ describe('Test credentials controller', () => {
   });
 });
 
-const nockSchemaRequest = (fastify) => {
-  return nock(fastify.config.libUrl)
-    .get('/display-descriptors/open-badge-v2.0.descriptor.json')
-    .once()
-    .reply(200, mockSchema);
-};
-
 const jwks = {
   keys: [
     {

package/test/helpers/mock-fetch.js

@@ -0,0 +1,12 @@
+const mockFetch = (statusCode, responseBody) => {
+  return Promise.resolve(
+    new Response(JSON.stringify(responseBody), {
+      status: statusCode,
+      ok: statusCode >= 200 && statusCode < 300,
+    })
+  );
+};
+
+module.exports = {
+  mockFetch,
+};

package/test/issuing-controller/issuing-by-deeplink.test.js

@@ -1,3 +1,4 @@
+const { mock } = require('node:test');
 const nock = require('nock');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
@@ -13,6 +14,7 @@ const {
   VCLVerifiableCredential,
 } = require('@velocitycareerlabs/vnf-nodejs-wallet-sdk');
 const { deepLink } = require('./mocks');
+const { mockFetch } = require('../helpers/mock-fetch');
 
 jest.mock('@velocitycareerlabs/vnf-nodejs-wallet-sdk', () => {
   const originalModule = jest.requireActual(
@@ -23,6 +25,7 @@ jest.mock('@velocitycareerlabs/vnf-nodejs-wallet-sdk', () => {
   const { mockOffers } = require('./mocks/offers');
   const { mockIssuers } = require('./mocks/issuers');
   const { mockAcceptedCredentials } = require('./mocks/accepted-credentials');
+  const { mockCredentialTypes } = require('../mocks');
 
   return {
     ...originalModule,
@@ -35,6 +38,7 @@ jest.mock('@velocitycareerlabs/vnf-nodejs-wallet-sdk', () => {
         generateOffers: jest.fn().mockResolvedValue(mockOffers),
         searchForOrganizations: jest.fn().mockResolvedValue(mockIssuers),
         finalizeOffers: jest.fn().mockResolvedValue(mockAcceptedCredentials),
+        credentialTypes: mockCredentialTypes,
       }),
     },
   };
@@ -134,7 +138,7 @@ describe('Test Deep Link issuing controller', () => {
 
   describe('GET /issuing/deep-link/offers - get offers by deep link', () => {
     it('should return offers by pre-auth token (vendorOriginContext) successfully', async () => {
-      const schemaNock = nockSchemaRequest(fastify);
+      mock.method(global, 'fetch', () => mockFetch(200, mockSchema));
 
       const response = await fastify.injectJson({
         method: 'POST',
@@ -153,24 +157,23 @@ describe('Test Deep Link issuing controller', () => {
 
       expect(response.statusCode).toBe(200);
 
-      expect(vclSdk.getCredentialManifest).toBeCalledTimes(0); // important!
+      expect(vclSdk.getCredentialManifest).toHaveBeenCalledTimes(0); // important!
 
-      expect(vclSdk.generateOffers).toBeCalledTimes(1);
-      expect(vclSdk.generateOffers).toBeCalledWith(
+      expect(vclSdk.generateOffers).toHaveBeenCalledTimes(1);
+      expect(vclSdk.generateOffers).toHaveBeenCalledWith(
         expect.objectContaining(
           new VCLGenerateOffersDescriptor(vclMockCredentialManifest, [], [], [])
         )
       );
 
-      expect(vclSdk.searchForOrganizations).toBeCalledTimes(1);
-      expect(vclSdk.searchForOrganizations).toBeCalledWith(
+      expect(vclSdk.searchForOrganizations).toHaveBeenCalledTimes(1);
+      expect(vclSdk.searchForOrganizations).toHaveBeenCalledWith(
         new VCLOrganizationsSearchDescriptor(
           new VCLFilter(mockOffers.all[0].payload.issuer.id)
         )
       );
 
-      expect(schemaNock.isDone()).toBe(true);
-
+      expect(global.fetch.mock.calls).toHaveLength(1);
       const { offers, credentialManifest } = response.json;
       expect(credentialManifest.jwt).toBe(
         vclMockCredentialManifest.jwt.encodedJwt
@@ -179,7 +182,7 @@ describe('Test Deep Link issuing controller', () => {
     });
 
     it('should return offers by Input Credentials successfully', async () => {
-      const schemaNock = nockSchemaRequest(fastify);
+      mock.method(global, 'fetch', () => mockFetch(200, mockSchema));
       const inputCredential = await persistCredentials({
         encodedCredential: 'InputCredentialForOffers',
       });
@@ -228,7 +231,7 @@ describe('Test Deep Link issuing controller', () => {
         )
       );
 
-      expect(schemaNock.isDone()).toBe(true);
+      expect(global.fetch.mock.calls).toHaveLength(1);
 
       const { offers, credentialManifest } = response.json;
       expect(credentialManifest.jwt).toBe(
@@ -483,10 +486,3 @@ describe('Test Deep Link issuing controller', () => {
     });
   });
 });
-
-const nockSchemaRequest = (fastify) => {
-  return nock(fastify.config.libUrl)
-    .get('/display-descriptors/open-badge-v2.0.descriptor.json')
-    .once()
-    .reply(200, mockSchema);
-};

package/test/mocks/credential-types.js

@@ -0,0 +1,16 @@
+const mockCredentialTypes = {
+  all: [
+    {
+      credentialType: 'OpenBadgeV2.0',
+      payload: {
+        displayDescriptorUrls: {
+          en: 'http://lib.localhost.test/display-descriptors/open-badge-v2.0.descriptor.json',
+        },
+      },
+    },
+  ],
+};
+
+module.exports = {
+  mockCredentialTypes,
+};

package/test/mocks/index.js

@@ -4,4 +4,5 @@ module.exports = {
   ...require('./credential-categories'),
   ...require('./credentials'),
   ...require('./didjwk'),
+  ...require('./credential-types'),
 };