@velocitycareerlabs/server-webwallet 1.26.0-dev-build.1ad63e207 → 1.26.0-dev-build.15052cf8c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-webwallet",
-  "version": "1.26.0-dev-build.1ad63e207",
+  "version": "1.26.0-dev-build.15052cf8c",
   "description": "Web Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -33,7 +33,7 @@
     "@fastify/swagger": "^9.0.0",
     "@fastify/swagger-ui": "^5.0.0",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/migrations": "1.26.0-dev-build.1ad63e207",
+    "@velocitycareerlabs/migrations": "1.26.0-dev-build.15052cf8c",
     "@verii/auth": "1.0.0-pre.1754473517",
     "@verii/common-functions": "1.0.0-pre.1754473517",
     "@verii/common-schemas": "1.0.0-pre.1754473517",
@@ -73,5 +73,5 @@
     "nodemon": "3.1.10",
     "prettier": "2.8.8"
   },
-  "gitHead": "244188d5b206fb4a39eb198807b26cff6bf21b93"
+  "gitHead": "0784b85e60ee15b52086d6e1ff0196b24e355881"
 }

package/src/controllers/feeds/controller.js

@@ -7,6 +7,7 @@ const {
   VCLDidJwk,
   VCLAuthTokenDescriptor,
 } = require('@verii/vnf-nodejs-wallet-sdk');
+const { feedsService } = require('../../entities/feeds');
 
 /**
  * @param {import('fastify').FastifyInstance} fastify
@@ -31,9 +32,26 @@ const feedsController = async (fastify) => {
         filter: { auth0UserId: user.sub },
       });
 
-      return feeds;
+      if (feeds.length === 0) {
+        return { feeds: [] };
+      }
+
+      const disclosureIds = feeds.map((feed) => feed.disclosureId);
+
+      const disclosures = await repos.disclosures.find({
+        filter: feedsService.buildDisclosureFilter(user.sub, disclosureIds),
+      });
+
+      const disclosureMap = feedsService.createDisclosureMap(disclosures);
+      const enrichedFeeds = feedsService.enrichFeedsWithDisclosureData(
+        feeds,
+        disclosureMap
+      );
+
+      return { feeds: enrichedFeeds };
     }
   );
+
   fastify.delete(
     '/:feedId',
     {

package/src/controllers/feeds/schemas/webwallet-get-feeds-response.schema.js

@@ -2,36 +2,49 @@ const webWalletGetFeedsResponseSchema = {
   $id: 'https://velocitycareerlabs.io/webwallet-get-feeds-response.schema.json',
   title: 'webwallet-get-feeds-response',
   description: 'an array of feed objects returned by webwallet get feeds',
-  type: 'array',
-  items: {
-    type: 'object',
-    properties: {
-      id: { type: 'string' },
-      auth0UserId: { type: 'string' },
-      authToken: { type: 'object', additionalProperties: true },
-      deeplink: { type: 'string' },
-      disclosureId: { type: 'string' },
-      inspectorDid: { type: 'string' },
-      credentialTypes: {
-        type: 'array',
-        items: { type: 'string' },
+  type: 'object',
+  properties: {
+    feeds: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string' },
+          inspectorDid: { type: 'string' },
+          credentialTypes: {
+            type: 'array',
+            items: { type: 'string' },
+          },
+          presentationMetadata: {
+            type: 'object',
+            additionalProperties: true,
+          },
+          sharedCredentials: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
+          disclosureId: { type: 'string' },
+          createdAt: { type: 'string' },
+          updatedAt: { type: 'string' },
+        },
+        required: [
+          'id',
+          'disclosureId',
+          'inspectorDid',
+          'credentialTypes',
+          'presentationMetadata',
+          'sharedCredentials',
+          'createdAt',
+          'updatedAt',
+        ],
+        additionalProperties: false,
       },
-      createdAt: { type: 'string' },
-      updatedAt: { type: 'string' },
-      revokedAt: { type: 'string' },
     },
-    required: [
-      'auth0UserId',
-      'authToken',
-      'deeplink',
-      'disclosureId',
-      'inspectorDid',
-      'credentialTypes',
-      'createdAt',
-      'updatedAt',
-    ],
-    additionalProperties: false,
   },
+  required: ['feeds'],
+  additionalProperties: false,
 };
 
 module.exports = {

package/src/entities/feeds/index.js

@@ -1,4 +1,5 @@
 module.exports = {
   feedsRepoPlugin: require('./repos/feeds.repo'),
+  feedsService: require('./orchestrators'),
   ...require('./schemas'),
 };

package/src/entities/feeds/orchestrators/feedsService.js

@@ -0,0 +1,106 @@
+/**
+ * Extract disclosureId from presentationDefinitionId
+ * @param {string} presentationDefinitionId - Format: "exchangeId.disclosureId"
+ * @returns {string} disclosureId
+ */
+const extractDisclosureId = (presentationDefinitionId) => {
+  if (
+    !presentationDefinitionId ||
+    typeof presentationDefinitionId !== 'string'
+  ) {
+    throw new Error('Invalid presentationDefinitionId');
+  }
+
+  const parts = presentationDefinitionId.split('.');
+  if (parts.length < 2) {
+    throw new Error(
+      'presentationDefinitionId must contain exchangeId and disclosureId separated by "."'
+    );
+  }
+
+  return parts[1];
+};
+
+/**
+ * Create a map of disclosures grouped by disclosureId
+ * @param {Array} disclosures - Array of disclosure objects
+ * @returns {Object} Map with disclosureId as key and {presentationMetadata, sharedCredentials} as value
+ */
+const createDisclosureMap = (disclosures) => {
+  if (!Array.isArray(disclosures)) {
+    return {};
+  }
+
+  return disclosures.reduce((disclosureMatched, disclosure) => {
+    const disclosureId = extractDisclosureId(
+      disclosure.presentationDefinitionId
+    );
+
+    if (!disclosureMatched[disclosureId]) {
+      return {
+        ...disclosureMatched,
+        [disclosureId]: {
+          presentationMetadata: disclosure.presentation?.metadata || {},
+          sharedCredentials: disclosure.sharedCredentials || [],
+        },
+      };
+    }
+
+    return {
+      ...disclosureMatched,
+      [disclosureId]: {
+        ...disclosureMatched[disclosureId],
+        sharedCredentials: [
+          ...disclosureMatched[disclosureId].sharedCredentials,
+          ...(disclosure.sharedCredentials || []),
+        ],
+      },
+    };
+  }, {});
+};
+
+/**
+ * Enrich feeds with presentation metadata and shared credentials
+ * @param {Array} feeds - Array of feed objects
+ * @param {Object} disclosureMap - Map of disclosures by disclosureId
+ * @returns {Array} Enriched feeds array
+ */
+const enrichFeedsWithDisclosureData = (feeds, disclosureMap) => {
+  if (!Array.isArray(feeds)) {
+    return [];
+  }
+
+  return feeds.map((feed) => ({
+    ...feed,
+    presentationMetadata:
+      disclosureMap[feed.disclosureId]?.presentationMetadata || {},
+    sharedCredentials:
+      disclosureMap[feed.disclosureId]?.sharedCredentials || [],
+  }));
+};
+
+/**
+ * Build MongoDB filter for finding disclosures by disclosureIds
+ * @param {string} auth0UserId - User ID
+ * @param {Array} disclosureIds - Array of disclosure IDs
+ * @returns {Object} MongoDB filter object
+ */
+const buildDisclosureFilter = (auth0UserId, disclosureIds) => {
+  return {
+    auth0UserId,
+    feed: true,
+    $expr: {
+      $in: [
+        { $arrayElemAt: [{ $split: ['$presentationDefinitionId', '.'] }, 1] },
+        disclosureIds,
+      ],
+    },
+  };
+};
+
+module.exports = {
+  extractDisclosureId,
+  createDisclosureMap,
+  enrichFeedsWithDisclosureData,
+  buildDisclosureFilter,
+};

package/src/entities/feeds/orchestrators/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('./feedsService'),
+};

package/test/feeds-controller.test.js

@@ -2,6 +2,7 @@ const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const nock = require('nock');
 const buildFastify = require('./helpers/webwallet-build-fastify');
 const initFeedsFactory = require('./factories/feeds');
+const initDisclosuresFactory = require('./factories/disclosures');
 
 const auth0Token =
   // eslint-disable-next-line max-len
@@ -23,18 +24,22 @@ jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
 describe('Feeds Controller', () => {
   let fastify;
   let persistFeeds;
+  let persistDisclosures;
 
   beforeAll(async () => {
     fastify = buildFastify();
     nock('https://localhost/').get('/.well-known/jwks.json').reply(200, jwks);
     await fastify.ready();
     await mongoDb().collection('feeds').deleteMany({});
+    await mongoDb().collection('disclosures').deleteMany({});
     ({ persistFeeds } = initFeedsFactory(fastify));
+    ({ persistDisclosures } = initDisclosuresFactory(fastify));
   });
 
   afterEach(async () => {
     nock.cleanAll();
     await mongoDb().collection('feeds').deleteMany({});
+    await mongoDb().collection('disclosures').deleteMany({});
   });
 
   afterAll(async () => {
@@ -43,9 +48,27 @@ describe('Feeds Controller', () => {
   });
 
   describe('getFeeds', () => {
-    it('should return list of feeds on success', async () => {
+    it('should return list of feeds with presentation metadata and shared credentials', async () => {
+      const disclosureId = '68736ac609c41e44796d040e';
+      const exchangeId = '657b15a1b4de9ac4f06b63ee';
+
       await persistFeeds({
         auth0UserId,
+        disclosureId,
+      });
+
+      await persistDisclosures({
+        auth0UserId,
+        presentationDefinitionId: `${exchangeId}.${disclosureId}`,
+        feed: true,
+        sharedCredentials: ['credential1', 'credential2'],
+        presentation: {
+          metadata: {
+            client_name: 'University of Massachusetts Amherst',
+            logo_uri: 'https://example.com/logo.png',
+            tos_uri: 'https://example.com/terms',
+          },
+        },
       });
 
       const response = await fastify.inject({
@@ -57,7 +80,19 @@ describe('Feeds Controller', () => {
       });
 
       expect(response.statusCode).toBe(200);
-      expect(response.json()).toHaveLength(1);
+      const responseData = response.json();
+      expect(responseData).toHaveProperty('feeds');
+      expect(responseData.feeds).toHaveLength(1);
+
+      const feed = responseData.feeds[0];
+      expect(feed).toHaveProperty('presentationMetadata');
+      expect(feed.presentationMetadata).toEqual({
+        client_name: 'University of Massachusetts Amherst',
+        logo_uri: 'https://example.com/logo.png',
+        tos_uri: 'https://example.com/terms',
+      });
+      expect(feed).toHaveProperty('sharedCredentials');
+      expect(feed.sharedCredentials).toEqual(['credential1', 'credential2']);
     });
   });