@velocitycareerlabs/server-webwallet 1.25.0-dev-build.1c0807f72 → 1.25.0-dev-build.1253d0f86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-webwallet",
-  "version": "1.25.0-dev-build.1c0807f72",
+  "version": "1.25.0-dev-build.1253d0f86",
   "description": "Web Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -26,28 +26,28 @@
     "access": "public"
   },
   "dependencies": {
-    "@fastify/autoload": "^5.10.0",
-    "@fastify/helmet": "^11.1.1",
-    "@fastify/multipart": "^8.3.1",
-    "@fastify/sensible": "^5.6.0",
-    "@fastify/swagger": "^8.15.0",
-    "@fastify/swagger-ui": "^4.2.0",
+    "@fastify/autoload": "^6.0.0",
+    "@fastify/helmet": "^13.0.0",
+    "@fastify/multipart": "^9.0.0",
+    "@fastify/sensible": "^6.0.0",
+    "@fastify/swagger": "^9.0.0",
+    "@fastify/swagger-ui": "^5.0.0",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/auth": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/common-functions": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/common-schemas": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/config": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/jwt": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/migrations": "1.25.0-dev-build.1c0807f72",
-    "@velocitycareerlabs/request": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/server-provider": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/vc-checks": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "1.25.0-dev-build.1100a9862",
+    "@velocitycareerlabs/auth": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/common-functions": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/common-schemas": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/config": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/jwt": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/migrations": "1.25.0-dev-build.1253d0f86",
+    "@velocitycareerlabs/request": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/server-provider": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/vc-checks": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "1.25.0-dev-build.10fcae56a",
     "blueimp-md5": "2.19.0",
     "env-var": "^7.0.0",
-    "fastify": "^4.29.0",
-    "fastify-plugin": "^4.5.1",
+    "fastify": "^5.0.0",
+    "fastify-plugin": "^5.0.0",
     "got": "11.8.6",
     "http-errors": "2.0.0",
     "lodash": "^4.17.21",
@@ -56,8 +56,8 @@
   },
   "devDependencies": {
     "@spencejs/spence-factories": "0.10.2",
-    "@velocitycareerlabs/crypto": "1.25.0-dev-build.1100a9862",
-    "@velocitycareerlabs/tests-helpers": "1.25.0-dev-build.1100a9862",
+    "@velocitycareerlabs/crypto": "1.25.0-dev-build.10fcae56a",
+    "@velocitycareerlabs/tests-helpers": "1.25.0-dev-build.10fcae56a",
     "dotenv": "16.4.7",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
@@ -73,5 +73,5 @@
     "nodemon": "3.1.10",
     "prettier": "2.8.8"
   },
-  "gitHead": "4a89d7939ee0210fb27471a554b37ac8bb187aea"
+  "gitHead": "7f963613f230d1f27dfad8bbbe3d4bf1159618d3"
 }

package/src/plugins/vnf-sdk-plugin.js

@@ -22,12 +22,12 @@ const vnfSdkPlugin = async (fastify) => {
       config.vclSdkEnvironment || VCLEnvironment.Prod,
       config.vclSdkProtocolVersion ||
         VCLXVnfProtocolVersion.XVnfProtocolVersion2,
-      config.vclSdkIsDebugOn,
       new VCLCryptoServicesDescriptor(
         KeyServiceImpl(fastify),
         JwtSignServiceImpl(fastify),
         JwtVerifyServiceImpl()
       ),
+      config.vclSdkIsDebugOn,
       log
     );
 

package/test/credentials-controller.test.js

@@ -1,4 +1,3 @@
-const { mock } = require('node:test');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
 const nock = require('nock');
@@ -14,8 +13,10 @@ const {
   mongoify,
 } = require('@velocitycareerlabs/tests-helpers');
 const buildFastify = require('./helpers/webwallet-build-fastify');
-const { mockFetch } = require('./helpers/mock-fetch');
-const { mockSchema, mockedCredentialCategories } = require('./mocks');
+const {
+  mockDisplayDescriptor,
+  mockedCredentialCategories,
+} = require('./mocks');
 const initCredentialsFactory = require('./factories/credentials');
 const { WebWalletServerError } = require('../src/errors/error-codes');
 
@@ -48,7 +49,6 @@ describe('Test credentials controller', () => {
 
   beforeAll(async () => {
     fastify = buildFastify();
-
     nock('https://localhost/').get('/.well-known/jwks.json').reply(200, jwks);
 
     await fastify.ready();
@@ -77,8 +77,11 @@ describe('Test credentials controller', () => {
           did: 'did:test:2',
         }),
       ]);
+      nock('http://lib.localhost.test')
+        .get('/display-descriptors/open-badge-v2.0.descriptor.json')
+        .reply(200, mockDisplayDescriptor);
 
-      mock.method(global, 'fetch', () => mockFetch(200, mockSchema));
+      // mock.method(global, 'fetch', () => mockFetch(200, mockDisplayDescriptor));
       const response = await fastify.injectJson({
         method: 'GET',
         url: '/credentials',
@@ -95,7 +98,7 @@ describe('Test credentials controller', () => {
           new VCLFilter(currentUserCredential.issuer.id)
         )
       );
-      expect(global.fetch.mock.calls).toHaveLength(1);
+      // expect(global.fetch.mock.calls).toHaveLength(1);
 
       expect(response.json).toEqual({
         credentials: [
@@ -122,7 +125,9 @@ describe('Test credentials controller', () => {
         }),
       ]);
 
-      mock.method(global, 'fetch', () => mockFetch(500, mockSchema));
+      nock('http://lib.localhost.test')
+        .get('/display-descriptors/open-badge-v2.0.descriptor.json')
+        .reply(500);
       const response = await fastify.injectJson({
         method: 'GET',
         url: '/credentials',
@@ -137,7 +142,7 @@ describe('Test credentials controller', () => {
         'Failed to fetch descriptor from http://lib.localhost.test/display-descriptors/open-badge-v2.0.descriptor.json'
       );
 
-      expect(global.fetch.mock.calls).toHaveLength(1);
+      // expect(global.fetch.mock.calls).toHaveLength(1);
     });
 
     it('should return empty array of credentials if there are no items in DB for user Id', async () => {

package/test/helpers/.env.test

@@ -1,6 +1,6 @@
 HOST_URL=http://localhost.test
 CAREER_WALLET_URL=http://careerwallet.localhost.test
-OAUTH0_DOMAIN=https://localhost/
+OAUTH0_DOMAIN=localhost
 OAUTH0_WEBAPP_CLIENT_ID=foo
 AUTH0_WEB_WALLET_AUDIENCE=foo
 LIB_URL=http://lib.localhost.test

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

@@ -1,4 +1,3 @@
-const { mock } = require('node:test');
 const nock = require('nock');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
@@ -14,7 +13,6 @@ 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(
@@ -48,7 +46,7 @@ const vclSdk = VCLProvider.getInstance();
 const initAccountsFactory = require('../factories/accounts');
 const initCredentialsFactory = require('../factories/credentials');
 
-const { mockSchema } = require('../mocks');
+const { mockDisplayDescriptor } = require('../mocks');
 
 const { mockOffers, mockParsedResponse } = require('./mocks');
 
@@ -138,7 +136,9 @@ 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 () => {
-      mock.method(global, 'fetch', () => mockFetch(200, mockSchema));
+      nock('http://lib.localhost.test')
+        .get('/display-descriptors/open-badge-v2.0.descriptor.json')
+        .reply(200, mockDisplayDescriptor);
 
       const response = await fastify.injectJson({
         method: 'POST',
@@ -173,7 +173,6 @@ describe('Test Deep Link issuing controller', () => {
         )
       );
 
-      expect(global.fetch.mock.calls).toHaveLength(1);
       const { offers, credentialManifest } = response.json;
       expect(credentialManifest.jwt).toBe(
         vclMockCredentialManifest.jwt.encodedJwt
@@ -182,7 +181,9 @@ describe('Test Deep Link issuing controller', () => {
     });
 
     it('should return offers by Input Credentials successfully', async () => {
-      mock.method(global, 'fetch', () => mockFetch(200, mockSchema));
+      nock('http://lib.localhost.test')
+        .get('/display-descriptors/open-badge-v2.0.descriptor.json')
+        .reply(200, mockDisplayDescriptor);
       const inputCredential = await persistCredentials({
         encodedCredential: 'InputCredentialForOffers',
       });
@@ -231,8 +232,6 @@ describe('Test Deep Link issuing controller', () => {
         )
       );
 
-      expect(global.fetch.mock.calls).toHaveLength(1);
-
       const { offers, credentialManifest } = response.json;
       expect(credentialManifest.jwt).toBe(
         vclMockCredentialManifest.jwt.encodedJwt

package/test/mocks/{schema.js → display-descriptor.js}

@@ -1,4 +1,4 @@
-const mockSchema = {
+const mockDisplayDescriptor = {
   title: {
     path: [
       '$.hasCredential.issuer.name',
@@ -103,5 +103,5 @@ const mockSchema = {
 };
 
 module.exports = {
-  mockSchema,
+  mockDisplayDescriptor,
 };

package/test/mocks/index.js

@@ -1,6 +1,6 @@
 module.exports = {
   ...require('./issuers'),
-  ...require('./schema'),
+  ...require('./display-descriptor'),
   ...require('./credential-categories'),
   ...require('./credentials'),
   ...require('./didjwk'),

package/test/helpers/mock-fetch.js

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