@verii/data-loader 1.1.0-pre.1775646065 → 1.1.0-pre.1775953178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/data-loader",
-  "version": "1.1.0-pre.1775646065",
+  "version": "1.1.0-pre.1775953178",
   "description": "A tool for uploading data to the different target systems.",
   "repository": "https://github.com/LFDT-Verii/core",
   "main": "src/index.js",
@@ -29,20 +29,20 @@
     "eslint-watch": "8.0.0",
     "expect": "30.3.0",
     "globals": "17.4.0",
-    "nock": "15.0.0",
+    "nock": "15.0.0-beta.10",
     "prettier": "3.8.1"
   },
   "dependencies": {
+    "@verii/http-client": "1.1.0-pre.1775953178",
     "chalk": "~4.1.2",
     "commander": "~14.0.0",
     "csv-parser": "~3.2.0",
     "date-fns": "4.1.0",
-    "got": "11.8.6",
     "handlebars": "^4.7.7",
     "inquirer": "^8.0.0",
     "lodash": "^4.17.21",
     "nanoid": "5.1.6",
     "strip-bom-stream": "^4.0.0"
   },
-  "gitHead": "c90142b444d418223ac72994f14bfd0ccd336444"
+  "gitHead": "05090118369e202d7c77fc4a420b14f94338a3e5"
 }

package/src/batch-issuing/fetchers.js

@@ -1,78 +1,77 @@
 const { env } = require('node:process');
-const got = require('got');
+const { initHttpClient } = require('@verii/http-client');
 const { map, isEmpty } = require('lodash/fp');
 const { printInfo } = require('../helpers/common');
 
-const setupGot = ({ endpoint, authToken }) => {
+const setupHttpClient = ({ endpoint, authToken }) => {
   const options = {};
   if (endpoint != null) {
     options.prefixUrl = `${endpoint}/operator-api/v0.8`;
   }
   if (authToken != null) {
-    options.headers = { Authorization: `Bearer ${authToken}` };
+    options.bearerToken = authToken;
   }
   if (env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
-    options.https = {
-      rejectUnauthorized: false,
-    };
+    options.tlsRejectUnauthorized = false;
   }
-  return got.extend(options);
+  if (env.NODE_ENV === 'test') {
+    options.isTest = true;
+  }
+
+  return initHttpClient(options)({
+    log: console,
+    traceId: 'TRACE-ID',
+  });
 };
 
 const initFetchers = (options) => {
-  const credentialAgentTenantGot = setupGot(options);
+  const credentialAgentTenantClient = setupHttpClient(options);
   const param = getTenantsRouteParam(options);
   return {
     getTenant: async () => {
       printInfo('Retrieving tenant');
-      return credentialAgentTenantGot.get(`tenants/${param}`).json();
+      return credentialAgentTenantClient
+        .get(`tenants/${param}`)
+        .then((res) => res.json());
     },
     createDisclosure: async (disclosureRequest) => {
       printInfo('Creating disclosure');
-      return credentialAgentTenantGot
-        .post(`tenants/${param}/disclosures`, {
-          json: disclosureRequest,
-        })
-        .json();
+      return credentialAgentTenantClient
+        .post(`tenants/${param}/disclosures`, disclosureRequest)
+        .then((res) => res.json());
     },
     getDisclosureList: async (vendorEndpoints) => {
       printInfo('Retrieving disclosure list');
-      const url = new URL(
-        `tenants/${param}/disclosures`,
-        credentialAgentTenantGot.defaults.options.prefixUrl,
-      );
-
+      const searchParams = new URLSearchParams();
       if (!isEmpty(vendorEndpoints)) {
         vendorEndpoints.forEach((vendorEndpoint) => {
-          url.searchParams.append('vendorEndpoint', vendorEndpoint);
+          searchParams.append('vendorEndpoint', vendorEndpoint);
         });
       }
 
-      return credentialAgentTenantGot.get(url).json();
+      return credentialAgentTenantClient
+        .get(`tenants/${param}/disclosures`, { searchParams })
+        .then((res) => res.json());
     },
     getDisclosure: async (disclosureId) => {
       printInfo('Retrieving disclosure');
-      return credentialAgentTenantGot
+      return credentialAgentTenantClient
         .get(`tenants/${param}/disclosures/${disclosureId}`)
-        .json();
+        .then((res) => res.json());
     },
     createOfferExchange: async (newExchange) => {
       printInfo('Creating exchange');
-      return credentialAgentTenantGot
-        .post(`tenants/${param}/exchanges`, {
-          json: newExchange,
-        })
-        .json();
+      return credentialAgentTenantClient
+        .post(`tenants/${param}/exchanges`, newExchange)
+        .then((res) => res.json());
     },
     createOffer: async (exchange, newOffer) => {
       printInfo(
         `Adding offer ${newOffer.offerId} to exchange id: ${exchange.id}`,
       );
-      return credentialAgentTenantGot
-        .post(`tenants/${param}/exchanges/${exchange.id}/offers`, {
-          json: newOffer,
-        })
-        .json();
+      return credentialAgentTenantClient
+        .post(`tenants/${param}/exchanges/${exchange.id}/offers`, newOffer)
+        .then((res) => res.json());
     },
     submitCompleteOffer: async (exchange, offers) => {
       printInfo(
@@ -81,30 +80,34 @@ const initFetchers = (options) => {
           offers,
         )}`,
       );
-      return credentialAgentTenantGot
+      return credentialAgentTenantClient
         .post(`tenants/${param}/exchanges/${exchange.id}/offers/complete`)
-        .json();
+        .then((res) => res.json());
     },
     loadExchangeQrcode: async (exchange) =>
-      (
-        await credentialAgentTenantGot.get(
-          `tenants/${param}/exchanges/${exchange.id}/qrcode.png`,
-        )
-      ).rawBody,
+      Buffer.from(
+        await (
+          await credentialAgentTenantClient.get(
+            `tenants/${param}/exchanges/${exchange.id}/qrcode.png`,
+          )
+        ).rawBody.arrayBuffer(),
+      ),
     loadExchangeDeeplink: async (exchange) =>
-      credentialAgentTenantGot
+      credentialAgentTenantClient
         .get(`tenants/${param}/exchanges/${exchange.id}/qrcode.uri`)
-        .text(),
+        .then((res) => res.text()),
     loadDisclosureQrcode: async (disclosure) =>
-      (
-        await credentialAgentTenantGot.get(
-          `tenants/${param}/disclosures/${disclosure.id}/qrcode.png`,
-        )
-      ).rawBody,
+      Buffer.from(
+        await (
+          await credentialAgentTenantClient.get(
+            `tenants/${param}/disclosures/${disclosure.id}/qrcode.png`,
+          )
+        ).rawBody.arrayBuffer(),
+      ),
     loadDisclosureDeeplink: async (disclosure) =>
-      credentialAgentTenantGot
+      credentialAgentTenantClient
         .get(`tenants/${param}/disclosures/${disclosure.id}/qrcode.uri`)
-        .text(),
+        .then((res) => res.text()),
   };
 };
 

package/src/vendor-credentials/execute-update.js

@@ -1,28 +1,35 @@
-const got = require('got');
+const { initHttpClient } = require('@verii/http-client');
 const { printInfo } = require('../helpers/common');
 
-const setupGot = ({ endpoint, authToken }) => {
-  const options = {
-    prefixUrl: endpoint,
-  };
+const setupHttpClient = ({ endpoint, authToken }) => {
+  const options = { prefixUrl: endpoint };
   if (authToken != null) {
-    options.headers = { Authorization: `Bearer ${authToken}` };
+    options.bearerToken = authToken;
+  }
+  if (process.env.NODE_ENV === 'test') {
+    options.isTest = true;
   }
-  return got.extend(options);
+
+  return initHttpClient(options)({
+    log: console,
+    traceId: 'TRACE-ID',
+  });
 };
 
 const initExecuteUpdate = (options) => {
-  const vendorGot = setupGot(options);
+  const vendorHttpClient = setupHttpClient(options);
   return async ({ person, offer }) => {
     if (person) {
       printInfo({
-        createdPerson: await vendorGot
-          .post('api/users', { json: person })
-          .json(),
+        createdPerson: await vendorHttpClient
+          .post('api/users', person)
+          .then((res) => res.json()),
       });
     }
     printInfo({
-      createdOffer: await vendorGot.post('api/offers', { json: offer }).json(),
+      createdOffer: await vendorHttpClient
+        .post('api/offers', offer)
+        .then((res) => res.json()),
     });
   };
 };

package/test/batch-issuing.test.js

@@ -1,6 +1,8 @@
 const { after, before, describe, it } = require('node:test');
 const { expect } = require('expect');
 
+const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const nock = require('nock');
 
@@ -1465,4 +1467,151 @@ describe('batch issuing test', () => {
       });
     });
   });
+
+  it('should create disclosure and exchange payloads through the full issuing flow', async () => {
+    const agentUrl = 'https://exampleUrl';
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'data-loader-batch-issuing-'),
+    );
+    const expectedDisclosure = {
+      configurationType: 'issuing',
+      vendorEndpoint: 'integrated-issuing-identification',
+      types: [{ type: 'EmailV1.0' }],
+      identityMatchers: {
+        rules: [
+          {
+            valueIndex: 0,
+            path: ['$.emails'],
+            rule: 'pick',
+          },
+        ],
+        vendorUserIdIndex: 2,
+      },
+      setIssuingDefault: true,
+      duration: '1h',
+      purpose: 'Issuing Career Credential',
+      authTokenExpiresIn: 525600,
+      termsUrl: 'http://example.com/terms.html',
+    };
+    const expectedFirstExchange = {
+      type: 'ISSUING',
+      identityMatcherValues: ['joan.lee@sap.com'],
+      disclosureId: 'disclosure-id',
+    };
+    const expectedSecondExchange = {
+      type: 'ISSUING',
+      identityMatcherValues: ['john.smith@sap.com'],
+      disclosureId: 'disclosure-id',
+    };
+    const expectedFirstOffer = {
+      type: ['EmailV1.0'],
+      issuer: { id: 'did:sap:123' },
+      credentialSubject: {
+        vendorUserId: 'joan.lee@sap.com',
+        email: 'joan.lee@sap.com',
+      },
+    };
+    const expectedSecondOffer = {
+      type: ['EmailV1.0'],
+      issuer: { id: 'did:sap:123' },
+      credentialSubject: {
+        vendorUserId: 'john.smith@sap.com',
+        email: 'john.smith@sap.com',
+      },
+    };
+
+    const disclosureScope = nock(agentUrl, {
+      reqheaders: { Authorization: 'Bearer fakeToken' },
+    })
+      .post('/operator-api/v0.8/tenants/tenant-id/disclosures', (body) => {
+        expect(body).toMatchObject(expectedDisclosure);
+        expect(body.vendorDisclosureId).toEqual(expect.any(Number));
+        expect(body.activationDate).toEqual(
+          expect.stringMatching(ISO_DATETIME_TZ_FORMAT),
+        );
+        return true;
+      })
+      .reply(200, { id: 'disclosure-id' });
+
+    const exchangeOfferScope = nock(agentUrl, {
+      reqheaders: { Authorization: 'Bearer fakeToken' },
+    })
+      .post(
+        '/operator-api/v0.8/tenants/tenant-id/exchanges',
+        expectedFirstExchange,
+      )
+      .reply(200, { id: 'exchange-1' })
+      .post(
+        '/operator-api/v0.8/tenants/tenant-id/exchanges/exchange-1/offers',
+        (body) => {
+          expect(body).toMatchObject(expectedFirstOffer);
+          expect(body.offerId).toEqual(expect.any(String));
+          return true;
+        },
+      )
+      .reply(200, { id: 'offer-1' })
+      .post(
+        '/operator-api/v0.8/tenants/tenant-id/exchanges/exchange-1/offers/complete',
+      )
+      .reply(200, {})
+      .post(
+        '/operator-api/v0.8/tenants/tenant-id/exchanges',
+        expectedSecondExchange,
+      )
+      .reply(200, { id: 'exchange-2' })
+      .post(
+        '/operator-api/v0.8/tenants/tenant-id/exchanges/exchange-2/offers',
+        (body) => {
+          expect(body).toMatchObject(expectedSecondOffer);
+          expect(body.offerId).toEqual(expect.any(String));
+          return true;
+        },
+      )
+      .reply(200, { id: 'offer-2' })
+      .post(
+        '/operator-api/v0.8/tenants/tenant-id/exchanges/exchange-2/offers/complete',
+      )
+      .reply(200, {})
+      .get(
+        '/operator-api/v0.8/tenants/tenant-id/disclosures/disclosure-id/qrcode.uri',
+      )
+      .reply(200, 'https://example.com/disclosure')
+      .get(
+        '/operator-api/v0.8/tenants/tenant-id/disclosures/disclosure-id/qrcode.png',
+      )
+      .reply(200, Buffer.from('fake-png'));
+
+    const options = {
+      csvFilename: path.join(__dirname, 'data/variables.csv'),
+      offerTemplateFilename: path.join(
+        __dirname,
+        'data/email-offer.template.json',
+      ),
+      tenant: 'tenant-id',
+      did: 'did:sap:123',
+      termsUrl: 'http://example.com/terms.html',
+      idCredentialType: 'EmailV1.0',
+      vendorUseridColumn: 'email',
+      new: true,
+      endpoint: agentUrl,
+      authToken: 'fakeToken',
+      path: tempDir,
+    };
+
+    try {
+      await expect(runBatchIssuing(options)).resolves.toBeUndefined();
+
+      disclosureScope.done();
+      exchangeOfferScope.done();
+      expect(
+        fs.existsSync(path.join(tempDir, 'disclosure-disclosure-id.json')),
+      ).toBe(true);
+      expect(fs.existsSync(path.join(tempDir, 'lastrun.json'))).toBe(true);
+      expect(fs.existsSync(path.join(tempDir, 'qrcode-generic.png'))).toBe(
+        true,
+      );
+    } finally {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
 });

package/test/vendor-credentials.test.js

@@ -1,5 +1,6 @@
-const { describe, it } = require('node:test');
+const { after, before, describe, it } = require('node:test');
 const { expect } = require('expect');
+const nock = require('nock');
 
 const path = require('path');
 const {
@@ -7,6 +8,15 @@ const {
 } = require('../src/vendor-credentials/orchestrator');
 
 describe('vendor credentials test', () => {
+  before(() => {
+    nock.cleanAll();
+  });
+
+  after(() => {
+    nock.cleanAll();
+    nock.restore();
+  });
+
   it('should load the templates and csv', async () => {
     const options = {
       csvFilename: path.join(__dirname, 'data/variables.csv'),
@@ -227,4 +237,88 @@ describe('vendor credentials test', () => {
       },
     ]);
   });
+
+  it('should post prepared person and offer payloads when endpoint is provided', async () => {
+    const endpoint = 'https://vendor.example';
+    const firstPerson = {
+      emails: [{ email: 'joan.lee@sap.com' }],
+      firstName: { localized: { en: 'Joan' } },
+      lastName: { localized: { en: 'Lee' } },
+    };
+    const secondPerson = {
+      emails: [{ email: 'john.smith@sap.com' }],
+      firstName: { localized: { en: 'John' } },
+      lastName: { localized: { en: 'Smith' } },
+    };
+    const firstOffer = {
+      type: ['OpenBadgeV1.0'],
+      issuer: {
+        id: 'did:ion:sap123',
+      },
+      credentialSubject: {
+        vendorUserId: 'joan.lee@sap.com',
+        holds: {
+          name: 'SAP Sapphire Attendance',
+          description:
+            'Digital Badge for the Conference Attendees of SAPs Sapphire Conference',
+          type: 'BadgeClass',
+          issuer: {
+            type: 'Profile',
+            id: 'did:ion:sap123',
+            name: 'SAP',
+            uri: 'https://sap.com',
+          },
+          image: 'https://example.com/badge-image.png',
+          criteria: 'https://example.com/sap/criteria.html',
+        },
+      },
+    };
+    const secondOffer = {
+      type: ['OpenBadgeV1.0'],
+      issuer: {
+        id: 'did:ion:sap123',
+      },
+      credentialSubject: {
+        vendorUserId: 'john.smith@sap.com',
+        holds: {
+          name: 'SAP Sapphire Attendance',
+          description:
+            'Digital Badge for the Conference Attendees of SAPs Sapphire Conference',
+          type: 'BadgeClass',
+          issuer: {
+            type: 'Profile',
+            id: 'did:ion:sap123',
+            name: 'SAP',
+            uri: 'https://sap.com',
+          },
+          image: 'https://example.com/badge-image.png',
+          criteria: 'https://example.com/sap/criteria.html',
+        },
+      },
+    };
+
+    const scope = nock(endpoint, {
+      reqheaders: { Authorization: 'Bearer fakeToken' },
+    })
+      .post('/api/users', firstPerson)
+      .reply(200, { id: 'person-id-1' })
+      .post('/api/offers', firstOffer)
+      .reply(200, { id: 'offer-id-1' })
+      .post('/api/users', secondPerson)
+      .reply(200, { id: 'person-id-2' })
+      .post('/api/offers', secondOffer)
+      .reply(200, { id: 'offer-id-2' });
+
+    const options = {
+      csvFilename: path.join(__dirname, 'data/variables.csv'),
+      offerTemplateFilename: path.join(__dirname, 'data/offer.template.json'),
+      personTemplateFilename: path.join(__dirname, 'data/person.template.json'),
+      endpoint,
+      authToken: 'fakeToken',
+    };
+
+    await expect(executeVendorCredentials(options)).resolves.toBeUndefined();
+
+    scope.done();
+  });
 });