@verii/server-credentialagent 1.1.0-pre.1765351552 → 1.1.0-pre.1765441856

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/server-credentialagent",
-  "version": "1.1.0-pre.1765351552",
+  "version": "1.1.0-pre.1765441856",
   "description": "Credential Agent application",
   "main": "src/index.js",
   "repository": "https://github.com/LFDT-Verii/core",
@@ -40,31 +40,31 @@
     "@fastify/view": "^11.0.0",
     "@spencejs/spence-factories": "^0.10.2",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@verii/auth": "1.1.0-pre.1765351552",
-    "@verii/base-contract-io": "1.1.0-pre.1765351552",
-    "@verii/blockchain-functions": "1.1.0-pre.1765351552",
-    "@verii/common-fetchers": "1.1.0-pre.1765351552",
-    "@verii/common-functions": "1.1.0-pre.1765351552",
-    "@verii/common-schemas": "1.1.0-pre.1765351552",
-    "@verii/config": "1.1.0-pre.1765351552",
-    "@verii/contract-permissions": "1.1.0-pre.1765351552",
-    "@verii/crypto": "1.1.0-pre.1765351552",
-    "@verii/csv-parser": "1.1.0-pre.1765351552",
-    "@verii/db-kms": "1.1.0-pre.1765351552",
-    "@verii/did-doc": "1.1.0-pre.1765351552",
-    "@verii/fastify-plugins": "1.1.0-pre.1765351552",
-    "@verii/http-client": "1.1.0-pre.1765351552",
-    "@verii/jwt": "1.1.0-pre.1765351552",
-    "@verii/metadata-registration": "1.1.0-pre.1765351552",
-    "@verii/organizations-registry": "1.1.0-pre.1765351552",
-    "@verii/rest-queries": "1.1.0-pre.1765351552",
-    "@verii/server-provider": "1.1.0-pre.1765351552",
-    "@verii/spencer-mongo-extensions": "1.1.0-pre.1765351552",
-    "@verii/test-regexes": "1.1.0-pre.1765351552",
-    "@verii/validation": "1.1.0-pre.1765351552",
-    "@verii/vc-checks": "1.1.0-pre.1765351552",
-    "@verii/verii-issuing": "1.1.0-pre.1765351552",
-    "@verii/verii-verification": "1.1.0-pre.1765351552",
+    "@verii/auth": "1.1.0-pre.1765441856",
+    "@verii/base-contract-io": "1.1.0-pre.1765441856",
+    "@verii/blockchain-functions": "1.1.0-pre.1765441856",
+    "@verii/common-fetchers": "1.1.0-pre.1765441856",
+    "@verii/common-functions": "1.1.0-pre.1765441856",
+    "@verii/common-schemas": "1.1.0-pre.1765441856",
+    "@verii/config": "1.1.0-pre.1765441856",
+    "@verii/contract-permissions": "1.1.0-pre.1765441856",
+    "@verii/crypto": "1.1.0-pre.1765441856",
+    "@verii/csv-parser": "1.1.0-pre.1765441856",
+    "@verii/db-kms": "1.1.0-pre.1765441856",
+    "@verii/did-doc": "1.1.0-pre.1765441856",
+    "@verii/fastify-plugins": "1.1.0-pre.1765441856",
+    "@verii/http-client": "1.1.0-pre.1765441856",
+    "@verii/jwt": "1.1.0-pre.1765441856",
+    "@verii/metadata-registration": "1.1.0-pre.1765441856",
+    "@verii/organizations-registry": "1.1.0-pre.1765441856",
+    "@verii/rest-queries": "1.1.0-pre.1765441856",
+    "@verii/server-provider": "1.1.0-pre.1765441856",
+    "@verii/spencer-mongo-extensions": "1.1.0-pre.1765441856",
+    "@verii/test-regexes": "1.1.0-pre.1765441856",
+    "@verii/validation": "1.1.0-pre.1765441856",
+    "@verii/vc-checks": "1.1.0-pre.1765441856",
+    "@verii/verii-issuing": "1.1.0-pre.1765441856",
+    "@verii/verii-verification": "1.1.0-pre.1765441856",
     "ajv": "8.17.1",
     "canonicalize": "^2.1.0",
     "date-fns": "~4.1.0",
@@ -83,10 +83,10 @@
   },
   "devDependencies": {
     "@spencejs/spence-config": "0.10.2",
-    "@verii/endpoints-organizations-registrar": "1.1.0-pre.1765351552",
-    "@verii/sample-data": "1.1.0-pre.1765351552",
+    "@verii/endpoints-organizations-registrar": "1.1.0-pre.1765441856",
+    "@verii/sample-data": "1.1.0-pre.1765441856",
     "@verii/test-regexes": "0.5.0-build",
-    "@verii/tests-helpers": "1.1.0-pre.1765351552",
+    "@verii/tests-helpers": "1.1.0-pre.1765441856",
     "cheerio": "1.1.2",
     "dotenv": "16.6.1",
     "eslint": "8.57.1",
@@ -107,5 +107,5 @@
     "prettier": "2.8.8",
     "qs": "6.14.0"
   },
-  "gitHead": "6a7ce7a831716e1159ac237d5a5566b2833b1d24"
+  "gitHead": "65907afa06a773fbe9c544abc54c6e7fb807a427"
 }

package/src/controllers/root/controller.js

@@ -22,6 +22,7 @@ const {
   forEach,
   isEmpty,
   values,
+  identity,
 } = require('lodash/fp');
 const { nanoid } = require('nanoid');
 const fastifyView = require('@fastify/view');
@@ -81,6 +82,19 @@ const appRedirectController = async (fastify) => {
                 items: { type: 'string' },
               },
               inspectorDid: { type: 'array', items: { type: 'string' } },
+              providers: {
+                type: 'array',
+                items: {
+                  type: 'object',
+                  properties: {
+                    name: { type: 'string' },
+                    logo: { type: 'string' },
+                    category: { type: 'string' },
+                    id: { type: 'string' },
+                  },
+                  required: ['name', 'id', 'logo', 'category'],
+                },
+              },
             },
             required: ['request_uri', 'exchange_type'],
           },
@@ -124,9 +138,13 @@ const appRedirectController = async (fastify) => {
 };
 
 const validateInspectorDid = ({ exchangeType, inspectorDid }) => {
-  if (exchangeType === EXCHANGE_TYPE.inspect && isEmpty(inspectorDid)) {
+  if (
+    (exchangeType === EXCHANGE_TYPE.inspect ||
+      exchangeType === EXCHANGE_TYPE.claim) &&
+    isEmpty(inspectorDid)
+  ) {
     throw new Error.BadRequest(
-      'inspectorDid should be present for exchange_type = "inspect"'
+      `inspectorDid should be present for exchange_type = "${exchangeType}"`
     );
   }
   if (exchangeType === EXCHANGE_TYPE.issue && !isEmpty(inspectorDid)) {
@@ -143,6 +161,7 @@ const processingLinks = (context) => {
       request_uri: requestUriItems,
       inspectorDid: inspectorDidItems = [],
       vendorOriginContext: vendorOriginContextItems = [],
+      providers: providersItems,
     },
   } = context;
 
@@ -152,17 +171,29 @@ const processingLinks = (context) => {
       requestUri: value,
       vendorOriginContext: vendorOriginContextItems[index],
       inspectorDid: inspectorDidItems[index],
+      ...(providersItems ? { providers: providersItems } : {}),
     }))
   )(requestUriItems);
 
   const deeplink = createDeepLinkUrl(exchangeType, context);
-  forEach(({ requestUri, inspectorDid, vendorOriginContext }) => {
-    flow(
-      appendSearchParam('request_uri', requestUri),
-      appendSearchParam('inspectorDid', inspectorDid),
-      appendSearchParam('vendorOriginContext', vendorOriginContext)
-    )(deeplink);
-  }, parsedLinks);
+  forEach(
+    ({
+      requestUri,
+      inspectorDid,
+      vendorOriginContext,
+      providers: providersItem,
+    }) => {
+      const appendParams = flow(
+        appendSearchParam('request_uri', requestUri),
+        appendSearchParam('inspectorDid', inspectorDid),
+        appendSearchParam('vendorOriginContext', vendorOriginContext),
+        providersItem ? appendSearchParam('providers', providersItem) : identity
+      );
+
+      appendParams(deeplink);
+    },
+    parsedLinks
+  );
 
   return { deeplink };
 };

package/src/entities/exchanges/domains/constants.js

@@ -17,6 +17,7 @@
 const EXCHANGE_TYPE = {
   inspect: 'inspect',
   issue: 'issue',
+  claim: 'claim.wizard',
 };
 
 module.exports = {

package/test/combined/app-redirect.test.js

@@ -126,6 +126,18 @@ describe('app redirect controller test', () => {
     );
   });
 
+  it('should 400 if exchange_type is claim.wizard and inspectorDid not provided', async () => {
+    setupNock();
+    const response = await fastify.injectJson({
+      method: 'GET',
+      url: `${appRedirectUrl}?request_uri=uri&exchange_type=claim.wizard`,
+    });
+    expect(response.statusCode).toEqual(400);
+    expect(response.json.message).toEqual(
+      'inspectorDid should be present for exchange_type = "claim.wizard"'
+    );
+  });
+
   it('should 400 if exchange_type is not one of allowed values', async () => {
     setupNock();
     const response = await fastify.injectJson({
@@ -187,7 +199,7 @@ describe('app redirect controller test', () => {
     expect(scriptTag.attr('nonce')).toEqual(nonceFromCspHeader);
   });
 
-  it('should include vnf wallet selection mount point', async () => {
+  it('should include vnf wallet selection mount point if inspect', async () => {
     const url =
       // eslint-disable-next-line max-len
       'http%3A%2F%2Flocalhost.test%2Fapi%2Fholder%2Fv0.6%2Forg%2Fdid%3Aion%3A4131209321321323123e%2Fissue%2Fget-credential-manifest%3Fexchange_id%3D5f123eab4362bb2e%26credential_types%3DPastEmploymentPosition%26id%3DsecretId';
@@ -205,4 +217,26 @@ describe('app redirect controller test', () => {
     expect(scriptTag.attr('data-deeplink')).toEqual(deeplink);
     expect(scriptTag.attr('data-automode')).toEqual('');
   });
+
+  it('should include vnf wallet selection mount point if claim.wizard', async () => {
+    setupNock();
+    const url =
+      // eslint-disable-next-line max-len
+      'http%3A%2F%2Flocalhost.test%2Fapi%2Fholder%2Fv0.6%2Forg%2Fdid%3Aion%3A4131209321321323123e%2Fissue%2Fget-credential-manifest%3Fexchange_id%3D5f123eab4362bb2e%26credential_types%3DPastEmploymentPosition%26id%3DsecretId';
+    const response = await fastify.injectJson({
+      method: 'GET',
+      // eslint-disable-next-line max-len
+      url: `${appRedirectUrl}?request_uri=${url}&exchange_type=claim.wizard&inspectorDid=321123providers=%5B%7B%22logo%22%3A%22https%3A//upload.wikimedia.org/wikipedia/commons/a/aa/LinkedIn_2021.svg%22%2C%22name%22%3A%22LinkedIn%22%2C%22category%22%3A%22Personal%20Records%22%2C%22id%22%3A%22a9f1063c-06b7-476a-8410-9ff6e427e637%22%7D%2C%7B%22logo%22%3A%22https%3A//logos-world.net/wp-content/uploads/2020/11/GitHub-Emblem.png%22%2C%22name%22%3A%22GitHub%22%2C%22category%22%3A%22User%20Profile%22%2C%22id%22%3A%226d3f6753-7ee6-49ee-a545-62f1b1822ae5%22%7D%5D`,
+    });
+
+    expect(response.statusCode).toEqual(200);
+    const $ = cheerio.load(response.body);
+
+    const scriptTag = $('html > body > #vnf-wallet-selection');
+    const deeplink =
+      // eslint-disable-next-line max-len
+      'velocity-test://claim.wizard?request_uri=http%3A%2F%2Flocalhost.test%2Fapi%2Fholder%2Fv0.6%2Forg%2Fdid%3Aion%3A4131209321321323123e%2Fissue%2Fget-credential-manifest%3Fexchange_id%3D5f123eab4362bb2e%26credential_types%3DPastEmploymentPosition%26id%3DsecretId&inspectorDid=321123providers%3D%5B%7B%22logo%22%3A%22https%3A%2F%2Fupload.wikimedia.org%2Fwikipedia%2Fcommons%2Fa%2Faa%2FLinkedIn_2021.svg%22%2C%22name%22%3A%22LinkedIn%22%2C%22category%22%3A%22Personal+Records%22%2C%22id%22%3A%22a9f1063c-06b7-476a-8410-9ff6e427e637%22%7D%2C%7B%22logo%22%3A%22https%3A%2F%2Flogos-world.net%2Fwp-content%2Fuploads%2F2020%2F11%2FGitHub-Emblem.png%22%2C%22name%22%3A%22GitHub%22%2C%22category%22%3A%22User+Profile%22%2C%22id%22%3A%226d3f6753-7ee6-49ee-a545-62f1b1822ae5%22%7D%5D';
+    expect(scriptTag.attr('data-deeplink')).toEqual(deeplink);
+    expect(scriptTag.attr('data-automode')).toEqual('');
+  });
 });

package/test/holder/e2e-issuing-controller.test.js

@@ -275,12 +275,14 @@ describe('e2e issuing tests', { timeout: 45000 }, () => {
 
     const metadataListAllocation = await mongoDb()
       .collection('allocations')
-      .findOne({ entityName: 'metadataListAllocations' });
+      .findOne({
+        entityName: 'HEX_AES_256_MetadataListAllocations',
+      });
     expect(metadataListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
-      entityName: 'metadataListAllocations',
+      entityName: 'HEX_AES_256_MetadataListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
@@ -330,12 +332,12 @@ describe('e2e issuing tests', { timeout: 45000 }, () => {
 
     const metadataListAllocation = await mongoDb()
       .collection('allocations')
-      .findOne({ entityName: 'metadataListAllocations' });
+      .findOne({ entityName: 'HEX_AES_256_MetadataListAllocations' });
     expect(metadataListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
-      entityName: 'metadataListAllocations',
+      entityName: 'HEX_AES_256_MetadataListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
@@ -385,12 +387,12 @@ describe('e2e issuing tests', { timeout: 45000 }, () => {
 
     const metadataListAllocation = await mongoDb()
       .collection('allocations')
-      .findOne({ entityName: 'metadataListAllocations' });
+      .findOne({ entityName: 'HEX_AES_256_MetadataListAllocations' });
     expect(metadataListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
-      entityName: 'metadataListAllocations',
+      entityName: 'HEX_AES_256_MetadataListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),

package/test/operator/vc-api-credentials.test.js

@@ -342,7 +342,7 @@ describe('vc-api credentials endpoints', () => {
             expect.any(Object),
             expect.any(String),
             'did:ion:cao',
-            'cosekey:aes-256-gcm',
+            'aes-256-gcm',
           ],
         ]);
       });