@velocitycareerlabs/server-webwallet 1.26.0-dev-build.1f5f235dd → 1.26.0-dev-build.1a6aed3a4

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

@@ -5,48 +5,55 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+const {
+  after,
+  afterEach,
+  before,
+  beforeEach,
+  describe,
+  it,
+  mock,
+} = require('node:test');
+
+const { expect } = require('expect');
+
 const nock = require('nock');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
+const { VCLFinalizeOffersDescriptor } = require('@verii/vnf-nodejs-wallet-sdk');
+const { vclMockCredentialManifest } = require('./mocks');
+const { mockOffers } = require('./mocks/offers');
+const { mockIssuers } = require('./mocks/issuers');
 const {
-  VCLFinalizeOffersDescriptor,
-  VCLProvider,
-} = require('@verii/vnf-nodejs-wallet-sdk');
-const { vclMockCredentialManifest } = require('./mocks/credential-manifest');
-
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-
-  const {
-    mockAcceptedFailedCredentials,
-  } = require('./mocks/accepted-credentials');
-  // eslint-disable-next-line no-shadow
-  const { vclMockCredentialManifest } = require('./mocks');
-  const { mockOffers } = require('./mocks/offers');
-  const { mockIssuers } = require('./mocks/issuers');
-
-  return {
-    ...originalModule,
+  mockAcceptedFailedCredentials,
+} = require('./mocks/accepted-credentials');
+
+const initialize = mock.fn(() => Promise.resolve(null));
+const getCredentialManifest = mock.fn(() =>
+  Promise.resolve(vclMockCredentialManifest)
+);
+const generateOffers = mock.fn(() => Promise.resolve(mockOffers));
+const searchForOrganizations = mock.fn(() => Promise.resolve(mockIssuers));
+const finalizeOffers = mock.fn(() =>
+  Promise.resolve(mockAcceptedFailedCredentials)
+);
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
     VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-        getCredentialManifest: jest
-          .fn()
-          .mockResolvedValue(vclMockCredentialManifest),
-        generateOffers: jest.fn().mockResolvedValue(mockOffers),
-        searchForOrganizations: jest.fn().mockResolvedValue(mockIssuers),
-        finalizeOffers: jest
-          .fn()
-          .mockResolvedValue(mockAcceptedFailedCredentials),
-      }),
+      getInstance: mock.fn(() => ({
+        initialize,
+        getCredentialManifest,
+        generateOffers,
+        searchForOrganizations,
+        finalizeOffers,
+      })),
     },
-  };
+  },
 });
 
-const vclSdk = VCLProvider.getInstance();
 const initAccountsFactory = require('../factories/accounts');
 
-const { mockOffers } = require('./mocks');
-
 const buildFastify = require('../helpers/webwallet-build-fastify');
 const { mockParsedFailedResponse } = require('./mocks/accept-offers-response');
 const { Jwk } = require('../mocks/jwk');
@@ -59,7 +66,7 @@ describe('Test Deep Link issuing controller', () => {
   let fastify;
   let persistAccounts;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
 
     await fastify.ready();
@@ -78,15 +85,15 @@ describe('Test Deep Link issuing controller', () => {
 
   afterEach(async () => {
     nock.cleanAll();
-    jest.clearAllMocks();
     await mongoDb().collection('credentials').deleteMany();
     await mongoDb().collection('accounts').deleteMany();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await mongoDb().collection('accounts').deleteMany();
     await fastify.close();
+    mock.reset();
   });
 
   describe('POST /issuing/deep-link/accept-offers', () => {
@@ -113,10 +120,10 @@ describe('Test Deep Link issuing controller', () => {
       expect(response.statusCode).toBe(200);
       expect(response.json).toEqual(mockParsedFailedResponse);
 
-      expect(vclSdk.getCredentialManifest).toBeCalledTimes(0); // important!
+      expect(getCredentialManifest.mock.callCount()).toEqual(0); // important!
 
-      expect(vclSdk.finalizeOffers).toBeCalledTimes(1);
-      expect(vclSdk.finalizeOffers).toBeCalledWith(
+      expect(finalizeOffers.mock.callCount()).toEqual(1);
+      expect(finalizeOffers.mock.calls[0].arguments).toEqual([
         expect.objectContaining(
           new VCLFinalizeOffersDescriptor(
             vclMockCredentialManifest,
@@ -127,8 +134,8 @@ describe('Test Deep Link issuing controller', () => {
         ),
         expect.objectContaining({
           value: mockOffers.sessionToken.value,
-        })
-      );
+        }),
+      ]);
 
       const savedCredential = await mongoDb()
         .collection('credentials')

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

@@ -1,3 +1,15 @@
+const {
+  after,
+  afterEach,
+  before,
+  beforeEach,
+  describe,
+  it,
+  mock,
+} = require('node:test');
+
+const { expect } = require('expect');
+
 const nock = require('nock');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
@@ -8,48 +20,48 @@ const {
   VCLFilter,
   VCLDeepLink,
   VCLOrganizationsSearchDescriptor,
-  VCLProvider,
   VCLGenerateOffersDescriptor,
   VCLVerifiableCredential,
 } = require('@verii/vnf-nodejs-wallet-sdk');
 const { deepLink } = require('./mocks');
-
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-
-  const { vclMockCredentialManifest } = require('./mocks');
-  const { mockOffers } = require('./mocks/offers');
-  const { mockIssuers } = require('./mocks/issuers');
-  const { mockAcceptedCredentials } = require('./mocks/accepted-credentials');
-  const { mockCredentialTypes } = require('../mocks');
-
-  return {
-    ...originalModule,
+const { vclMockCredentialManifest } = require('./mocks');
+const { mockOffers } = require('./mocks/offers');
+const { mockIssuers } = require('./mocks/issuers');
+const { mockAcceptedCredentials } = require('./mocks/accepted-credentials');
+const { mockCredentialTypes } = require('../mocks');
+
+const initialize = mock.fn(() => Promise.resolve(null));
+const getCredentialManifest = mock.fn(() =>
+  Promise.resolve(vclMockCredentialManifest)
+);
+const generateOffers = mock.fn(() => Promise.resolve(mockOffers));
+const searchForOrganizations = mock.fn(() => Promise.resolve(mockIssuers));
+const finalizeOffers = mock.fn(() => Promise.resolve(mockAcceptedCredentials));
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
     VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-        getCredentialManifest: jest
-          .fn()
-          .mockResolvedValue(vclMockCredentialManifest),
-        generateOffers: jest.fn().mockResolvedValue(mockOffers),
-        searchForOrganizations: jest.fn().mockResolvedValue(mockIssuers),
-        finalizeOffers: jest.fn().mockResolvedValue(mockAcceptedCredentials),
+      getInstance: mock.fn(() => ({
+        initialize,
+        getCredentialManifest,
+        generateOffers,
+        searchForOrganizations,
+        finalizeOffers,
         credentialTypes: mockCredentialTypes,
-      }),
+      })),
     },
-  };
+  },
 });
 
-const vclSdk = VCLProvider.getInstance();
 const initAccountsFactory = require('../factories/accounts');
 const initCredentialsFactory = require('../factories/credentials');
 
 const { mockDisplayDescriptor } = require('../mocks');
 
-const { mockOffers, mockParsedResponse } = require('./mocks');
+const { mockParsedResponse } = require('./mocks');
 
 const buildFastify = require('../helpers/webwallet-build-fastify');
-const { vclMockCredentialManifest } = require('./mocks/credential-manifest');
 const { Jwk } = require('../mocks/jwk');
 const { WebWalletServerError } = require('../../src/errors/error-codes');
 
@@ -62,7 +74,7 @@ describe('Test Deep Link issuing controller', () => {
   let persistAccounts;
   let persistCredentials;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
 
     await fastify.ready();
@@ -72,8 +84,11 @@ describe('Test Deep Link issuing controller', () => {
   });
 
   beforeEach(async () => {
-    nock('https://localhost/').get('/.well-known/jwks.json').reply(200, Jwk);
+    getCredentialManifest.mock.resetCalls();
+    generateOffers.mock.resetCalls();
+    searchForOrganizations.mock.resetCalls();
 
+    nock('https://localhost/').get('/.well-known/jwks.json').reply(200, Jwk);
     await persistAccounts({
       userId: '1234567890',
       did: 'did:example:123',
@@ -82,15 +97,15 @@ describe('Test Deep Link issuing controller', () => {
 
   afterEach(async () => {
     nock.cleanAll();
-    jest.clearAllMocks();
     await mongoDb().collection('credentials').deleteMany();
     await mongoDb().collection('accounts').deleteMany();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await mongoDb().collection('accounts').deleteMany();
     await fastify.close();
+    mock.reset();
   });
 
   describe('GET /issuing/deep-link/manifest - get manifest by deep link', () => {
@@ -107,10 +122,12 @@ describe('Test Deep Link issuing controller', () => {
 
       expect(response.statusCode).toBe(200);
 
-      expect(vclSdk.getCredentialManifest).toHaveBeenCalledTimes(1);
-      expect(vclSdk.getCredentialManifest).toHaveBeenCalledWith(
-        new VCLCredentialManifestDescriptorByDeepLink(new VCLDeepLink(deepLink))
-      );
+      expect(getCredentialManifest.mock.callCount()).toEqual(1);
+      expect(getCredentialManifest.mock.calls[0].arguments).toEqual([
+        new VCLCredentialManifestDescriptorByDeepLink(
+          new VCLDeepLink(deepLink)
+        ),
+      ]);
 
       const { credentialManifest } = response.json;
       expect(credentialManifest).toEqual({
@@ -155,21 +172,21 @@ describe('Test Deep Link issuing controller', () => {
 
       expect(response.statusCode).toBe(200);
 
-      expect(vclSdk.getCredentialManifest).toHaveBeenCalledTimes(0); // important!
+      expect(getCredentialManifest.mock.callCount()).toEqual(0); // important!
 
-      expect(vclSdk.generateOffers).toHaveBeenCalledTimes(1);
-      expect(vclSdk.generateOffers).toHaveBeenCalledWith(
+      expect(generateOffers.mock.callCount()).toEqual(1);
+      expect(generateOffers.mock.calls[0].arguments).toEqual([
         expect.objectContaining(
           new VCLGenerateOffersDescriptor(vclMockCredentialManifest, [], [], [])
-        )
-      );
+        ),
+      ]);
 
-      expect(vclSdk.searchForOrganizations).toHaveBeenCalledTimes(1);
-      expect(vclSdk.searchForOrganizations).toHaveBeenCalledWith(
+      expect(searchForOrganizations.mock.callCount()).toEqual(1);
+      expect(searchForOrganizations.mock.calls[0].arguments).toEqual([
         new VCLOrganizationsSearchDescriptor(
           new VCLFilter(mockOffers.all[0].payload.issuer.id)
-        )
-      );
+        ),
+      ]);
 
       const { offers, credentialManifest } = response.json;
       expect(credentialManifest.jwt).toBe(
@@ -204,10 +221,10 @@ describe('Test Deep Link issuing controller', () => {
 
       expect(response.statusCode).toBe(200);
 
-      expect(vclSdk.getCredentialManifest).toBeCalledTimes(0); // important!
+      expect(getCredentialManifest.mock.callCount()).toEqual(0); // important!
 
-      expect(vclSdk.generateOffers).toBeCalledTimes(1);
-      expect(vclSdk.generateOffers).toBeCalledWith(
+      expect(generateOffers.mock.callCount()).toEqual(1);
+      expect(generateOffers.mock.calls[0].arguments).toEqual([
         expect.objectContaining(
           new VCLGenerateOffersDescriptor(
             vclMockCredentialManifest,
@@ -220,15 +237,15 @@ describe('Test Deep Link issuing controller', () => {
               ),
             ]
           )
-        )
-      );
+        ),
+      ]);
 
-      expect(vclSdk.searchForOrganizations).toHaveBeenCalledTimes(1);
-      expect(vclSdk.searchForOrganizations).toHaveBeenCalledWith(
+      expect(searchForOrganizations.mock.callCount()).toEqual(1);
+      expect(searchForOrganizations.mock.calls[0].arguments).toEqual([
         new VCLOrganizationsSearchDescriptor(
           new VCLFilter(mockOffers.all[0].payload.issuer.id)
-        )
-      );
+        ),
+      ]);
 
       const { offers, credentialManifest } = response.json;
       expect(credentialManifest.jwt).toBe(
@@ -286,10 +303,10 @@ describe('Test Deep Link issuing controller', () => {
       expect(response.statusCode).toBe(200);
       expect(response.json).toEqual(mockParsedResponse);
 
-      expect(vclSdk.getCredentialManifest).toBeCalledTimes(0); // important!
+      expect(getCredentialManifest.mock.callCount()).toEqual(0); // important!
 
-      expect(vclSdk.finalizeOffers).toBeCalledTimes(1);
-      expect(vclSdk.finalizeOffers).toBeCalledWith(
+      expect(finalizeOffers.mock.callCount()).toEqual(1);
+      expect(finalizeOffers.mock.calls[0].arguments).toEqual([
         expect.objectContaining(
           new VCLFinalizeOffersDescriptor(
             vclMockCredentialManifest,
@@ -300,8 +317,8 @@ describe('Test Deep Link issuing controller', () => {
         ),
         expect.objectContaining({
           value: mockOffers.sessionToken.value,
-        })
-      );
+        }),
+      ]);
 
       const savedCredential = await mongoDb()
         .collection('credentials')

package/test/issuing-controller/issuing-identity-credentials.test.js

@@ -1,3 +1,38 @@
+const {
+  after,
+  afterEach,
+  before,
+  beforeEach,
+  describe,
+  it,
+  mock,
+} = require('node:test');
+const { expect } = require('expect');
+
+const initialize = mock.fn(() => Promise.resolve(null));
+const getCredentialManifest = mock.fn(() =>
+  Promise.resolve(vclMockCredentialManifest)
+);
+const generateOffers = mock.fn(() => Promise.resolve(mockOffers));
+const searchForOrganizations = mock.fn(() => Promise.resolve(mockIssuers));
+const finalizeOffers = mock.fn(() => Promise.resolve(mockAcceptedCredentials));
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
+    VCLProvider: {
+      getInstance: mock.fn(() => ({
+        initialize,
+        getCredentialManifest,
+        generateOffers,
+        searchForOrganizations,
+        finalizeOffers,
+        credentialTypes: mockCredentialTypes,
+      })),
+    },
+  },
+});
+
 const nock = require('nock');
 const { omit } = require('lodash/fp');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
@@ -8,40 +43,7 @@ const {
   VCLIssuingType,
 } = require('@verii/vnf-nodejs-wallet-sdk');
 const { errorResponseMatcher } = require('@verii/tests-helpers');
-
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-
-  const { vclMockCredentialManifest } = require('./mocks/credential-manifest');
-  const { mockOffers } = require('./mocks/offers');
-  const {
-    getOrganizationMock,
-  } = require('./mocks/identity-issuing/get-organization');
-  const {
-    acceptOffersMock,
-  } = require('./mocks/identity-issuing/accept-offers');
-
-  return {
-    ...originalModule,
-    VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-        getCredentialManifest: jest
-          .fn()
-          .mockResolvedValue(vclMockCredentialManifest),
-        generateOffers: jest.fn().mockResolvedValue(mockOffers),
-        searchForOrganizations: jest
-          .fn()
-          .mockResolvedValue(getOrganizationMock),
-        finalizeOffers: jest.fn().mockResolvedValue(acceptOffersMock),
-      }),
-    },
-  };
-});
-
-const { VCLProvider } = require('@verii/vnf-nodejs-wallet-sdk');
-
-const vclSdk = VCLProvider.getInstance();
+const { vclMockCredentialManifest } = require('./mocks/credential-manifest');
 
 const buildFastify = require('../helpers/webwallet-build-fastify');
 
@@ -51,7 +53,10 @@ const {
   getAppConfigMock,
   confirmVerificationCodeMock,
 } = require('./mocks/identity-issuing');
-const { vclMockCredentialManifest } = require('./mocks/credential-manifest');
+const { mockOffers } = require('./mocks/offers');
+const { mockIssuers } = require('./mocks/issuers');
+const { mockAcceptedCredentials } = require('./mocks/accepted-credentials');
+const { mockCredentialTypes } = require('../mocks');
 
 const auth0Token =
   // eslint-disable-next-line max-len
@@ -65,7 +70,7 @@ describe('Test Disclosures controller, get disclosures list', () => {
   let fastify;
   let persistAccounts;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
 
     nock('https://localhost/').get('/.well-known/jwks.json').reply(200, jwks);
@@ -83,14 +88,14 @@ describe('Test Disclosures controller, get disclosures list', () => {
 
   afterEach(async () => {
     nock.cleanAll();
-    jest.clearAllMocks();
     await mongoDb().collection('credentials').deleteMany();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await mongoDb().collection('accounts').deleteMany();
     await fastify.close();
+    mock.reset();
   });
 
   describe('POST /issuing/identity-credentials/request-code/email', () => {
@@ -182,23 +187,23 @@ describe('Test Disclosures controller, get disclosures list', () => {
       expect(nockedAppConfig.isDone()).toBe(true);
       expect(nockedConfirmVerification.isDone()).toBe(true);
 
-      expect(vclSdk.getCredentialManifest).toHaveBeenCalledTimes(1);
-      expect(vclSdk.getCredentialManifest).toHaveBeenCalledWith(
+      expect(getCredentialManifest.mock.callCount()).toEqual(1);
+      expect(getCredentialManifest.mock.calls[0].arguments).toEqual([
         new VCLCredentialManifestDescriptorByDeepLink(
           new VCLDeepLink(deepLink),
           VCLIssuingType.Identity,
           null,
           null,
           null
-        )
-      );
+        ),
+      ]);
 
-      expect(vclSdk.generateOffers).toHaveBeenCalledTimes(1);
-      expect(vclSdk.generateOffers).toHaveBeenCalledWith(
+      expect(generateOffers.mock.callCount()).toEqual(1);
+      expect(generateOffers.mock.calls[0].arguments).toEqual([
         expect.objectContaining({
           credentialManifest: vclMockCredentialManifest,
-        })
-      );
+        }),
+      ]);
 
       const savedCredential = await mongoDb()
         .collection('credentials')
@@ -234,8 +239,8 @@ describe('Test Disclosures controller, get disclosures list', () => {
       nockAppConfig(fastify);
       nockConfirmVerificationCode('123456', fastify);
 
-      vclSdk.searchForOrganizations.mockResolvedValueOnce(
-        new VCLOrganizations([])
+      searchForOrganizations.mock.mockImplementationOnce(() =>
+        Promise.resolve(new VCLOrganizations([]))
       );
 
       const response = await fastify.injectJson({
@@ -266,9 +271,9 @@ describe('Test Disclosures controller, get disclosures list', () => {
       nockAppConfig(fastify);
       nockConfirmVerificationCode('123456', fastify);
 
-      vclSdk.generateOffers.mockResolvedValueOnce({
+      generateOffers.mock.mockImplementation(() => ({
         all: [],
-      });
+      }));
 
       const response = await fastify.injectJson({
         method: 'POST',

package/test/issuing-controller/mocks/accept-offers-response.js

@@ -1,3 +1,5 @@
+const { expect } = require('expect');
+
 const { VelocityRevocationListType } = require('@verii/vc-checks');
 const { mockAcceptedCredentials } = require('./accepted-credentials');
 

package/test/linkedin-controller.test.js

@@ -1,3 +1,17 @@
+const { after, afterEach, before, describe, it, mock } = require('node:test');
+const { expect } = require('expect');
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
+    VCLProvider: {
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
+      })),
+    },
+  },
+});
+
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 
 const nock = require('nock');
@@ -22,24 +36,11 @@ const auth0Token =
 const auth0userId = '1234567890';
 const usersDid = 'did:example:123';
 
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-
-  return {
-    ...originalModule,
-    VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-      }),
-    },
-  };
-});
-
 describe('linkedin-controller', () => {
   let fastify;
   let persistAccounts;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
 
     nock('https://localhost/')
@@ -55,9 +56,10 @@ describe('linkedin-controller', () => {
     await mongoDb().collection('accounts').deleteMany({});
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await fastify.close();
+    mock.reset();
   });
   describe('GET /linkedin/me', () => {
     it('should return linkedin user information is exist', async () => {

package/test/root.test.js

@@ -1,28 +1,30 @@
-const buildFastify = require('./helpers/webwallet-build-fastify');
-
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
+const { after, before, describe, it, mock } = require('node:test');
+const { expect } = require('expect');
 
-  return {
-    ...originalModule,
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
     VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-      }),
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
+      })),
     },
-  };
+  },
 });
 
+const buildFastify = require('./helpers/webwallet-build-fastify');
+
 describe('Root routes', () => {
   let fastify;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
+    mock.reset();
   });
 
   it('should respond to /', async () => {