@velocitycareerlabs/server-webwallet 1.25.0-dev-build.1f73bb0fe → 1.25.0-dev-build.187d88673

package/.localdev.env

@@ -17,6 +17,7 @@ AWS_ACCESS_KEY_ID=EMPTY
 AWS_REGION=us-east-1
 AWS_ENDPOINT=http://host.docker.internal:4566
 REGISTRAR_URL=http://localhost:3002
+VERIFICATION_SERVICE_ACTION_BASE_URL=http://localhost:3005
 LIB_URL=http://lib.localhost.test
 HOST_URL=http://localhost:3010
 YOTI_CLIENT_SDK_ID=024e10dd-fc2a-4352-b13e-ad5e3853d14a

package/.standalone.env

@@ -4,6 +4,7 @@ MONGO_URI=mongodb://localhost:27017/webwallet-dev
 AWS_ENDPOINT=http://localhost:4566
 REGISTRAR_URL=http://localhost:3002
 LIB_URL=http://lib.localhost.test
+VERIFICATION_SERVICE_ACTION_BASE_URL=https://devapi.verifymycreds.com/holder-api/org/did:web:devregistrar.velocitynetwork.foundation:d:rv0pybdkpp.example.com
 HOST_URL=http://localhost:3010
 AGENT_URL=http://localhost:3004
 SENTRY_DSN=https://883a3bd7c4254d7890fe0f34bd07726c@o460076.ingest.sentry.io/6234089

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-webwallet",
-  "version": "1.25.0-dev-build.1f73bb0fe",
+  "version": "1.25.0-dev-build.187d88673",
   "description": "Web Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -28,17 +28,17 @@
     "@fastify/autoload": "5.10.0",
     "@fastify/multipart": "~8.3.1",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/auth": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/common-functions": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/common-schemas": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/config": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/jwt": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/migrations": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/request": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/server-provider": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/vc-checks": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "1.25.0-dev-build.1f73bb0fe",
+    "@velocitycareerlabs/auth": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/common-functions": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/common-schemas": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/config": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/jwt": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/migrations": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/request": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/server-provider": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/vc-checks": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "1.25.0-dev-build.187d88673",
     "blueimp-md5": "2.19.0",
     "env-var": "^7.0.0",
     "fastify": "4.29.0",
@@ -51,8 +51,8 @@
   },
   "devDependencies": {
     "@spencejs/spence-factories": "0.10.2",
-    "@velocitycareerlabs/crypto": "1.25.0-dev-build.1f73bb0fe",
-    "@velocitycareerlabs/tests-helpers": "1.25.0-dev-build.1f73bb0fe",
+    "@velocitycareerlabs/crypto": "1.25.0-dev-build.187d88673",
+    "@velocitycareerlabs/tests-helpers": "1.25.0-dev-build.187d88673",
     "dotenv": "16.4.7",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
@@ -68,5 +68,5 @@
     "nodemon": "3.1.9",
     "prettier": "2.8.8"
   },
-  "gitHead": "ff01736586ad75645f8a3efe1bed102866b116d1"
+  "gitHead": "1d2d8df9d97a371200284e189b8cd3592fd4ee0d"
 }

package/src/config/config.js

@@ -47,6 +47,10 @@ module.exports = {
     .required()
     .asEnum(Object.values(VCLXVnfProtocolVersion)),
   libUrl: env.get('LIB_URL').required().asString(),
+  verificationServiceActionBaseUrl: env
+    .get('VERIFICATION_SERVICE_ACTION_BASE_URL')
+    .required()
+    .asString(),
   deepLinkProtocol: env.get('DEEP_LINK_PROTOCOL').required().asString(),
   vclVerificationVersion: env
     .get('VCL_VERIFICATION_VERSION')

package/src/controllers/disclosures/controller.js

@@ -1,3 +1,4 @@
+const newError = require('http-errors');
 const { jwtDecode } = require('@velocitycareerlabs/jwt');
 const {
   VCLPresentationSubmission,
@@ -6,6 +7,9 @@ const {
   VCLDidJwk,
 } = require('@velocitycareerlabs/vnf-nodejs-wallet-sdk');
 const { getAppConfig } = require('../../fetchers/career-wallet/get-app-config');
+const {
+  removeCredentials,
+} = require('../../fetchers/credverify/remove-credentials');
 
 /**
  * @param {import('fastify').FastifyInstance} fastify
@@ -163,6 +167,52 @@ const disclosureController = async (fastify) => {
       return { disclosures };
     }
   );
+
+  fastify.delete(
+    '/:disclosureId',
+    {
+      preValidation: fastify.verifyAccessToken(),
+      schema: fastify.autoSchema({
+        params: {
+          type: 'object',
+          properties: {
+            disclosureId: { type: 'string' },
+          },
+        },
+        response: {
+          204: { type: 'null' },
+        },
+      }),
+    },
+    async (req, reply) => {
+      const {
+        repos: { disclosures: disclosuresRepo },
+        params,
+        user,
+      } = req;
+      const disclosure = await disclosuresRepo.findOne({
+        filter: { _id: params.disclosureId, auth0UserId: user.sub },
+      });
+
+      if (!disclosure) {
+        throw newError.NotFound(`Disclosure ${params.credentialId} not found`);
+      }
+
+      await removeCredentials(
+        {
+          presentationId: disclosure.jti,
+          exchangeId: disclosure.presentation.exchange_id,
+        },
+        req
+      );
+
+      await disclosuresRepo.update(params.disclosureId, {
+        deletedAt: new Date(),
+      });
+
+      reply.code(204);
+    }
+  );
 };
 
 module.exports = disclosureController;

package/src/entities/disclosures/repos/disclosures.repo.js

@@ -23,9 +23,22 @@ module.exports = (app, _, next = () => {}) => {
         type: 1,
         createdAt: 1,
         updatedAt: 1,
+        deletedAt: 1,
       },
-      extensions: [autoboxIdsExtension],
+      extensions: [autoboxIdsExtension, filterDeletedDisclosuresExtension],
     },
     app
   );
 };
+
+const filterDeletedDisclosuresExtension = (parent) => {
+  return {
+    prepFilter: (filter) => {
+      return parent.prepFilter({
+        ...filter,
+        deletedAt: filter.deletedAt ?? { $exists: false },
+      });
+    },
+    extensions: parent.extensions.concat(['filterDeletedDisclosuresExtension']),
+  };
+};

package/src/fetchers/credverify/remove-credentials.js

@@ -0,0 +1,17 @@
+const removeCredentials = (
+  payload,
+  { verificationServiceActionFetch, config }
+) => {
+  return verificationServiceActionFetch
+    .post('remove-credentials', {
+      json: payload,
+      headers: {
+        Authorization: `Bearer ${config.careerWalletAdminAccessToken}`,
+      },
+    })
+    .json();
+};
+
+module.exports = {
+  removeCredentials,
+};

package/src/init-server.js

@@ -60,6 +60,18 @@ const initServer = (server) => {
     .addHook('preValidation', async (req) => {
       req.libFetch = server.baseLibFetch(req);
     })
+    .decorate(
+      'baseVerificationServiceActionFetch',
+      initRequest({
+        ...pick(['nodeEnv', 'requestTimeout', 'traceIdHeader'], server.config),
+        prefixUrl: server.config.verificationServiceActionBaseUrl,
+      })
+    )
+    .decorateRequest('verificationServiceActionFetch', null)
+    .addHook('preValidation', async (req) => {
+      req.verificationServiceActionFetch =
+        server.baseVerificationServiceActionFetch(req);
+    })
     .decorate(
       'baseCareerWalletFetch',
       initRequest({

package/test/disclosures-controller/{get-disclosures.test.js → disclosures.test.js}

@@ -1,6 +1,9 @@
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
 const nock = require('nock');
+const { mongoify } = require('@velocitycareerlabs/tests-helpers');
+const { ObjectId } = require('mongodb');
+const { nockRemoveCredentials } = require('../helpers/nock-remove-credentials');
 
 const buildFastify = require('../helpers/webwallet-build-fastify');
 const initDisclosuresFactory = require('../factories/disclosures');
@@ -24,9 +27,9 @@ jest.mock('@velocitycareerlabs/vnf-nodejs-wallet-sdk', () => {
   };
 });
 
-describe('Test Disclosures controller, get disclosures list', () => {
+let persistDisclosures;
+describe('Test Disclosures controller, get disclosures list, delete disclosure', () => {
   let fastify;
-  let persistDisclosures;
 
   beforeAll(async () => {
     fastify = buildFastify();
@@ -123,6 +126,46 @@ describe('Test Disclosures controller, get disclosures list', () => {
       expect(response.statusCode).toBe(401);
     });
   });
+
+  describe('DELETE /disclosures/:disclosureId - delete disclosure by id', () => {
+    it('should delete disclosure by id', async () => {
+      ({ persistDisclosures } = initDisclosuresFactory(fastify));
+      const disclosure = await persistDisclosures();
+      // eslint-disable-next-line no-console
+      console.log(disclosure);
+
+      const nockInstance = nock(
+        fastify.config.verificationServiceActionBaseUrl
+      );
+      nockRemoveCredentials(nockInstance);
+
+      const response = await fastify.injectJson({
+        method: 'DELETE',
+        url: `/disclosures/${disclosure._id}`,
+        headers: {
+          authorization: `Bearer ${auth0Token}`,
+        },
+      });
+
+      expect(response.statusCode).toBe(204);
+
+      expect(
+        await mongoDb()
+          .collection('disclosures')
+          .findOne({
+            _id: new ObjectId(disclosure._id),
+          })
+      ).toEqual(
+        mongoify({
+          ...disclosure,
+          presentation: expect.any(Object),
+          sharedCredentials: expect.any(Array),
+          updatedAt: expect.any(Date),
+          deletedAt: expect.any(Date),
+        })
+      );
+    });
+  });
 });
 
 const jwks = {

package/test/helpers/.env.test

@@ -4,6 +4,7 @@ OAUTH0_DOMAIN=https://localhost/
 OAUTH0_WEBAPP_CLIENT_ID=foo
 AUTH0_WEB_WALLET_AUDIENCE=foo
 LIB_URL=http://lib.localhost.test
+VERIFICATION_SERVICE_ACTION_BASE_URL=http://credverify.localhost.tes
 VCL_SDK_ENVIRONMENT=dev
 VCL_SDK_VNF_PROTOCOL_VERSION=2.0
 WEB_WALLET_BASE_URL=localhost:3000

package/test/helpers/nock-remove-credentials.js

@@ -0,0 +1,7 @@
+const nockRemoveCredentials = (nockInstance) => {
+  nockInstance.post('/remove-credentials').reply(204, {});
+};
+
+module.exports = {
+  nockRemoveCredentials,
+};