@velocitycareerlabs/data-loader 1.20.0-dev-build.188151f81 → 1.20.0-qa-build.1ed749dfb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/data-loader",
-  "version": "1.20.0-dev-build.188151f81",
+  "version": "1.20.0-qa-build.1ed749dfb",
   "description": "A tool for uploading data to the different target systems.",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "main": "src/index.js",
@@ -38,7 +38,8 @@
     "handlebars": "~4.7.7",
     "inquirer": "^8.0.0",
     "lodash": "~4.17.20",
-    "nanoid": "3.3.1"
+    "nanoid": "3.3.1",
+    "strip-bom-stream": "^4.0.0"
   },
-  "gitHead": "4a2d56e5252547827dc6439d6829287fcb547675"
+  "gitHead": "7765ee052ba21627bbc243185fe5e96ef93d432e"
 }

package/src/batch-issuing/fetchers.js

@@ -1,3 +1,4 @@
+const { env } = require('node:process');
 const got = require('got');
 const { map, isEmpty } = require('lodash/fp');
 const { printInfo } = require('../helpers/common');
@@ -10,6 +11,11 @@ const setupGot = ({ endpoint, authToken, did }) => {
   if (authToken != null) {
     options.headers = { Authorization: `Bearer ${authToken}` };
   }
+  if (env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
+    options.https = {
+      rejectUnauthorized: false,
+    };
+  }
   return got.extend(options);
 };
 

package/src/batch-issuing/index.js

@@ -3,6 +3,12 @@ const { reduce } = require('lodash/fp');
 const { printInfo, printError, parseColumn } = require('../helpers');
 const { runBatchIssuing } = require('./orchestrators');
 
+const parseVar = reduce((acc, pair) => {
+  const [key, value] = pair.split('=');
+  acc[key] = value;
+  return acc;
+}, {});
+
 program
   .name('data-loader vendorcreds')
   .description('Loads data into a db')
@@ -109,9 +115,3 @@ program
     }
   })
   .parseAsync(process.argv);
-
-const parseVar = reduce((acc, pair) => {
-  const [key, value] = pair.split('=');
-  acc[key] = value;
-  return acc;
-}, {});

package/src/batch-issuing/orchestrators.js

@@ -62,21 +62,22 @@ const runBatchIssuing = async (opts) => {
     return { disclosureRequest, newExchangeOffers };
   }
 
-  if (disclosureRequest.id == null) {
-    await createDisclosureRequest(disclosureRequest, context);
-  }
+  const issuingDisclosure =
+    disclosureRequest.id != null
+      ? disclosureRequest
+      : await createDisclosureRequest(disclosureRequest, context);
 
-  await writeDisclosureToJson(disclosureRequest, options);
+  await writeDisclosureToJson(issuingDisclosure, options);
 
   const outputs = options.legacy
     ? await runLegacyBatchIssuing(
-        disclosureRequest,
+        issuingDisclosure,
         newExchangeOffers,
         options,
         context
       )
     : await runSingleQrCodeBatchIssuing(
-        disclosureRequest,
+        issuingDisclosure,
         newExchangeOffers,
         options,
         context
@@ -227,14 +228,17 @@ const writeDisclosureToJson = async (disclosureRequest, options) => {
 const createOfferExchangeAndQrCode = async (
   { newExchange, newOffer, disclosureRequest },
   options,
-  { fetchers }
+  context
 ) => {
-  const { exchange, offer, vendorUserId } = await createOfferExchange({
-    newExchange,
-    newOffer,
-    disclosureRequest,
-    fetchers,
-  });
+  const { fetchers } = context;
+  const { exchange, offer, vendorUserId } = await createOfferExchange(
+    {
+      newExchange,
+      newOffer,
+      disclosureRequest,
+    },
+    context
+  );
 
   const deeplink = await fetchers.loadExchangeDeeplink(exchange);
   const qrcode = await fetchers.loadExchangeQrcode(exchange);
@@ -258,8 +262,9 @@ const createOfferExchangeAndQrCode = async (
 
 const createOfferExchange = async (
   { newExchange, newOffer, disclosureRequest },
-  { fetchers }
+  context
 ) => {
+  const { fetchers } = context;
   const { vendorUserId } = newOffer.credentialSubject;
   printInfo(`Setting up vendorUserId:${vendorUserId}`);
   const exchange = await fetchers.createOfferExchange({

package/src/helpers/load-csv.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const csv = require('csv-parser');
+const stripBom = require('strip-bom-stream');
 const { isString, indexOf } = require('lodash/fp');
 
 const loadCsv = (fileName) => {
@@ -7,6 +8,7 @@ const loadCsv = (fileName) => {
     const csvRows = [];
     let csvHeaders;
     fs.createReadStream(fileName)
+      .pipe(stripBom())
       .pipe(csv())
       .on('headers', (headers) => {
         // eslint-disable-next-line better-mutation/no-mutation

package/test/batch-issuing.test.js

@@ -1,5 +1,9 @@
+const { env } = require('node:process');
 const path = require('path');
 const nock = require('nock');
+const got = require('got');
+
+const gotExtendSpy = jest.spyOn(got, 'extend');
 const { nanoid } = require('nanoid');
 const { runBatchIssuing } = require('../src/batch-issuing/orchestrators');
 
@@ -15,6 +19,10 @@ describe('batch issuing test', () => {
     nock.restore();
   });
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it("should fail if options don't have credential type or type doesn't exist", async () => {
     const options = {
       csvFilename: path.join(__dirname, 'data/batch-vars-offerids.csv'),
@@ -1087,6 +1095,95 @@ describe('batch issuing test', () => {
     });
   });
 
+  it('should handle csv with BOM characters', async () => {
+    const options = {
+      csvFilename: path.join(__dirname, 'data/with-bom.csv'),
+      offerTemplateFilename: path.join(
+        __dirname,
+        'data/email-offer.template.json'
+      ),
+      termsUrl: 'http://example.com/terms.html',
+      did: 'did:ion:sap123',
+      idCredentialType: 'EmailV1.0',
+      vendorUseridColumn: 'email',
+      new: true,
+      dryrun: true,
+    };
+
+    const updates = await runBatchIssuing(options);
+    expect(
+      new Date(updates.disclosureRequest.activationDate).getTime()
+    ).toBeLessThan(Date.now());
+
+    expect(updates).toEqual({
+      disclosureRequest: {
+        configurationType: 'issuing',
+        vendorEndpoint: 'integrated-issuing-identification',
+        types: [
+          {
+            type: 'EmailV1.0',
+          },
+        ],
+        identityMatchers: {
+          rules: [
+            {
+              valueIndex: 0,
+              path: ['$.emails'],
+              rule: 'pick',
+            },
+          ],
+          vendorUserIdIndex: 2,
+        },
+        vendorDisclosureId: expect.any(Number),
+        setIssuingDefault: true,
+        duration: '1h', // 1 hour by default
+        offerMode: 'preloaded',
+        purpose: 'Issuing Career Credential', // by default have a generic message
+        activationDate: expect.stringMatching(ISO_DATETIME_TZ_FORMAT),
+        termsUrl: 'http://example.com/terms.html',
+        authTokenExpiresIn: 525600,
+      },
+      newExchangeOffers: [
+        {
+          newOffer: {
+            type: ['EmailV1.0'],
+            issuer: {
+              id: 'did:ion:sap123',
+            },
+            credentialSubject: {
+              vendorUserId: 'joan.lee@sap.com',
+              email: 'joan.lee@sap.com',
+            },
+
+            offerId: expect.any(String),
+          },
+          newExchange: {
+            type: 'ISSUING',
+            identityMatcherValues: ['joan.lee@sap.com'],
+          },
+        },
+        {
+          newOffer: {
+            type: ['EmailV1.0'],
+            issuer: {
+              id: 'did:ion:sap123',
+            },
+            credentialSubject: {
+              vendorUserId: 'john.smith@sap.com',
+              email: 'john.smith@sap.com',
+            },
+
+            offerId: expect.any(String),
+          },
+          newExchange: {
+            type: 'ISSUING',
+            identityMatcherValues: ['john.smith@sap.com'],
+          },
+        },
+      ],
+    });
+  });
+
   it('should load the templates and csv with vars', async () => {
     const options = {
       csvFilename: path.join(__dirname, 'data/variables.csv'),
@@ -1286,4 +1383,55 @@ describe('batch issuing test', () => {
       });
     });
   });
+
+  describe('https.rejectUnauthorized test suite', () => {
+    beforeEach(() => {
+      env.NODE_TLS_REJECT_UNAUTHORIZED = '';
+    });
+    afterAll(() => {
+      env.NODE_TLS_REJECT_UNAUTHORIZED = '';
+    });
+
+    it('when NODE_TLS_REJECT_UNAUTHORIZED is "0", got client should be setup with https.rejectUnauthorized false', async () => {
+      env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+      const options = {
+        csvFilename: path.join(__dirname, 'data/batch-vars-offerids.csv'),
+        offerTemplateFilename: path.join(
+          __dirname,
+          'data/email-offer.template.json'
+        ),
+        termsUrl: 'http://example.com/terms.html',
+        did: 'did:ion:sap123',
+        new: true,
+        dryrun: true,
+      };
+      await runBatchIssuing(options);
+      expect(gotExtendSpy.mock.calls).toEqual([
+        [{ https: { rejectUnauthorized: false } }],
+      ]);
+    });
+
+    it('when NODE_TLS_REJECT_UNAUTHORIZED is value other than "0", got client should be setup without https.rejectUnauthorized', async () => {
+      const options = {
+        csvFilename: path.join(__dirname, 'data/batch-vars-offerids.csv'),
+        offerTemplateFilename: path.join(
+          __dirname,
+          'data/email-offer.template.json'
+        ),
+        termsUrl: 'http://example.com/terms.html',
+        did: 'did:ion:sap123',
+        new: true,
+        dryrun: true,
+      };
+      env.NODE_TLS_REJECT_UNAUTHORIZED = 'false';
+      await runBatchIssuing(options);
+      env.NODE_TLS_REJECT_UNAUTHORIZED = '';
+      await runBatchIssuing(options);
+      env.NODE_TLS_REJECT_UNAUTHORIZED = 'undefined';
+      await runBatchIssuing(options);
+      delete env.NODE_TLS_REJECT_UNAUTHORIZED;
+      await runBatchIssuing(options);
+      expect(gotExtendSpy.mock.calls).toEqual([[{}], [{}], [{}], [{}]]);
+    });
+  });
 });

package/test/data/with-bom.csv

@@ -0,0 +1,3 @@
+givenName,familyName,email,did
+Joan,Lee,joan.lee@sap.com,did:ion:sap123
+John,Smith,john.smith@sap.com,did:ion:sap123