@verii/server-credentialagent 1.0.0-pre.1752076816 → 1.0.0-pre.1754289942

package/migrate-mongo.config.js

@@ -31,6 +31,7 @@ const config = {
   migrationsDir: 'migrations',
   changelogCollectionName: 'changelog',
   migrationFileExtension: '.js',
+  moduleSystem: 'commonjs',
 };
 
 module.exports = config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/server-credentialagent",
-  "version": "1.0.0-pre.1752076816",
+  "version": "1.0.0-pre.1754289942",
   "description": "Credential Agent application",
   "main": "src/index.js",
   "repository": "https://github.com/LFDT-Verii/core",
@@ -8,8 +8,8 @@
     "node": ">=22.11.0"
   },
   "scripts": {
-    "test": "jest ./test --config ./jest.config.js --runInBand --coverage",
-    "test:e2e": "jest ./e2e/org-registration-and-issuing.e2e.test.js --config ./jest.config.js --runInBand",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest ./test --config ./jest.config.js --runInBand --coverage",
+    "test:e2e": "NODE_OPTIONS=--experimental-vm-modules jest ./e2e/org-registration-and-issuing.e2e.test.js --config ./jest.config.js --runInBand",
     "start": "node src/main.js",
     "start:dev": "node --throw-deprecation src/standalone.js",
     "start-operator": "node src/main-operator.js",
@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "@fastify/autoload": "^6.0.0",
+    "@fastify/cors": "^11.0.1",
     "@fastify/helmet": "^13.0.0",
     "@fastify/routes": "^6.0.0",
     "@fastify/sensible": "^6.0.0",
@@ -37,33 +38,33 @@
     "@fastify/view": "^11.0.0",
     "@spencejs/spence-factories": "^0.10.2",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@verii/auth": "1.0.0-pre.1752076816",
-    "@verii/base-contract-io": "1.0.0-pre.1752076816",
-    "@verii/blockchain-functions": "1.0.0-pre.1752076816",
-    "@verii/common-fetchers": "1.0.0-pre.1752076816",
-    "@verii/common-functions": "1.0.0-pre.1752076816",
-    "@verii/common-schemas": "1.0.0-pre.1752076816",
-    "@verii/config": "1.0.0-pre.1752076816",
-    "@verii/contract-permissions": "1.0.0-pre.1752076816",
-    "@verii/crypto": "1.0.0-pre.1752076816",
-    "@verii/csv-parser": "1.0.0-pre.1752076816",
-    "@verii/db-kms": "1.0.0-pre.1752076816",
-    "@verii/did-doc": "1.0.0-pre.1752076816",
-    "@verii/fastify-plugins": "1.0.0-pre.1752076816",
-    "@verii/jwt": "1.0.0-pre.1752076816",
-    "@verii/metadata-registration": "1.0.0-pre.1752076816",
-    "@verii/organizations-registry": "1.0.0-pre.1752076816",
-    "@verii/request": "1.0.0-pre.1752076816",
-    "@verii/rest-queries": "1.0.0-pre.1752076816",
-    "@verii/server-provider": "1.0.0-pre.1752076816",
-    "@verii/spencer-mongo-extensions": "1.0.0-pre.1752076816",
-    "@verii/test-regexes": "1.0.0-pre.1752076816",
-    "@verii/validation": "1.0.0-pre.1752076816",
-    "@verii/vc-checks": "1.0.0-pre.1752076816",
-    "@verii/velocity-issuing": "1.0.0-pre.1752076816",
-    "@verii/verifiable-credentials": "1.0.0-pre.1752076816",
+    "@verii/auth": "1.0.0-pre.1754289942",
+    "@verii/base-contract-io": "1.0.0-pre.1754289942",
+    "@verii/blockchain-functions": "1.0.0-pre.1754289942",
+    "@verii/common-fetchers": "1.0.0-pre.1754289942",
+    "@verii/common-functions": "1.0.0-pre.1754289942",
+    "@verii/common-schemas": "1.0.0-pre.1754289942",
+    "@verii/config": "1.0.0-pre.1754289942",
+    "@verii/contract-permissions": "1.0.0-pre.1754289942",
+    "@verii/crypto": "1.0.0-pre.1754289942",
+    "@verii/csv-parser": "1.0.0-pre.1754289942",
+    "@verii/db-kms": "1.0.0-pre.1754289942",
+    "@verii/did-doc": "1.0.0-pre.1754289942",
+    "@verii/fastify-plugins": "1.0.0-pre.1754289942",
+    "@verii/jwt": "1.0.0-pre.1754289942",
+    "@verii/metadata-registration": "1.0.0-pre.1754289942",
+    "@verii/organizations-registry": "1.0.0-pre.1754289942",
+    "@verii/request": "1.0.0-pre.1754289942",
+    "@verii/rest-queries": "1.0.0-pre.1754289942",
+    "@verii/server-provider": "1.0.0-pre.1754289942",
+    "@verii/spencer-mongo-extensions": "1.0.0-pre.1754289942",
+    "@verii/test-regexes": "1.0.0-pre.1754289942",
+    "@verii/validation": "1.0.0-pre.1754289942",
+    "@verii/vc-checks": "1.0.0-pre.1754289942",
+    "@verii/velocity-issuing": "1.0.0-pre.1754289942",
+    "@verii/verifiable-credentials": "1.0.0-pre.1754289942",
     "ajv": "8.17.1",
-    "canonicalize": "^2.0.0",
+    "canonicalize": "^2.1.0",
     "date-fns": "~3.6.0",
     "env-var": "~7.5.0",
     "eth-url-parser": "~1.0.3",
@@ -73,19 +74,19 @@
     "http-errors": "~2.0.0",
     "jsonpath-plus": "^10.3.0",
     "lodash": "^4.17.21",
-    "mongodb": "~6.16.0",
+    "mongodb": "~6.17.0",
     "nanoid": "~3.3.1",
     "nock": "14.0.5",
     "qr-image": "~3.2.0"
   },
   "devDependencies": {
     "@spencejs/spence-config": "0.10.2",
-    "@verii/endpoints-organizations-registrar": "1.0.0-pre.1752076816",
-    "@verii/sample-data": "1.0.0-pre.1752076816",
+    "@verii/endpoints-organizations-registrar": "1.0.0-pre.1754289942",
+    "@verii/sample-data": "1.0.0-pre.1754289942",
     "@verii/test-regexes": "0.5.0-build",
-    "@verii/tests-helpers": "1.0.0-pre.1752076816",
+    "@verii/tests-helpers": "1.0.0-pre.1754289942",
     "cheerio": "1.1.0",
-    "dotenv": "16.5.0",
+    "dotenv": "16.6.1",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-config-prettier": "8.10.0",
@@ -104,5 +105,5 @@
     "prettier": "2.8.8",
     "qs": "6.14.0"
   },
-  "gitHead": "5885ce94149cc0102b2bc9cde18834293174bfaf"
+  "gitHead": "772b121fb3eb2ee0077a1b5c9eec3281215e9e9f"
 }

package/src/controllers/holder/issue/get-credential-manifest/controller.js

@@ -15,6 +15,7 @@
  */
 
 /* eslint-disable camelcase */
+const cors = require('@fastify/cors');
 const { isEmpty, map, compact } = require('lodash/fp');
 const newError = require('http-errors');
 const { getCredentialTypeDescriptor } = require('@verii/common-fetchers');
@@ -38,6 +39,7 @@ const {
 
 const credentialManifestController = async (fastify) => {
   fastify
+    .register(cors, { origin: true })
     .register(ensureTenantDefaultIssuingDisclosureIdPlugin)
     .register(ensureDisclosureConfigurationTypePlugin)
     .register(ensureDisclosureActivePlugin)

package/src/controllers/operator/tenants/_tenantId/controller-v0.8.js

@@ -153,13 +153,9 @@ const tenantController = async (fastify) => {
       await repos.vendorUserIdMappings
         .collection()
         .deleteMany({ tenantId: tenant._id });
-      await repos.revocationListAllocations.collection().deleteMany({
-        tenantId: tenant._id,
-      });
+      await repos.allocations.collection().deleteMany({ tenantId: tenant._id });
       await repos.offers.collection().deleteMany({ 'issuer.id': tenant.did });
-
       await repos.tenants.delUsingFilter({ filter: { did: tenant.did } });
-
       await repos.groups.deleteTenant(tenant.did);
 
       reply.code(204);

package/src/controllers/operator/tenants/_tenantId/keys/controller-v0.8.js

@@ -16,12 +16,11 @@
 
 const { isEmpty, some, map } = require('lodash/fp');
 const newError = require('http-errors');
-const { KeyPurposes } = require('@verii/crypto');
+const { KeyEncodings, KeyPurposes } = require('@verii/crypto');
 const { resolveDid } = require('@verii/common-fetchers');
 
 const {
   addPrimaryAddressToTenant,
-  KeyEncodings,
   validateDidDocKeys,
 } = require('../../../../../entities');
 

package/src/entities/allocations/index.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2023 Velocity Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = {
+  ...require('./repos'),
+};

package/src/entities/allocations/repos/index.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2023 Velocity Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = {
+  metadataListAllocationPlugin: require('./repo'),
+};

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

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2023 Velocity Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const {
+  repoFactory,
+  autoboxIdsExtension,
+} = require('@spencejs/spence-mongo-repos');
+const { multitenantExtension } = require('@verii/spencer-mongo-extensions');
+
+module.exports = (app, options, next = () => {}) => {
+  next();
+  return repoFactory(
+    {
+      name: 'allocations',
+      entityName: 'allocation',
+      defaultProjection: {
+        _id: 1,
+        currentListId: 1,
+        freeIndexes: 1,
+        entityName: 1,
+        createdAt: 1,
+        updatedAt: 1,
+      },
+      extensions: [autoboxIdsExtension, multitenantExtension()],
+    },
+    app
+  );
+};

package/src/entities/index.js

@@ -15,6 +15,7 @@
  */
 
 module.exports = {
+  ...require('./allocations'),
   ...require('./common'),
   ...require('./credentials'),
   ...require('./deep-links'),
@@ -23,11 +24,9 @@ module.exports = {
   ...require('./feeds'),
   ...require('./keys'),
   ...require('./notifications'),
-  ...require('./metadata-list-allocations'),
   ...require('./offers'),
   ...require('./presentations'),
   ...require('./groups'),
-  ...require('./revocation-list-allocations'),
   ...require('./schemas'),
   ...require('./tenants'),
   ...require('./tokens'),

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

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-const KeyAlgorithms = {
-  SECP256K1: 'SECP256K1',
-};
-
-const KeyEncodings = {
-  HEX: 'hex',
-  JWK: 'jwk',
-};
-
 const KeyErrorMessages = {
   UNRECOGNIZED_PURPOSE_DETECTED: 'Unrecognized purpose detected',
   DUPLICATE_PURPOSE_DETECTED: 'Duplicate key purposes detected',
@@ -30,8 +21,4 @@ const KeyErrorMessages = {
   UNRECOGNIZED_ENCODING: 'Unrecognized encoding',
 };
 
-module.exports = {
-  KeyAlgorithms,
-  KeyEncodings,
-  KeyErrorMessages,
-};
+module.exports = { KeyErrorMessages };

package/src/entities/keys/domains/validate-key.js

@@ -16,12 +16,8 @@
 
 const { all, includes, values, uniq } = require('lodash/fp');
 const newError = require('http-errors');
-const { KeyPurposes } = require('@verii/crypto');
-const {
-  KeyErrorMessages,
-  KeyAlgorithms,
-  KeyEncodings,
-} = require('./constants');
+const { KeyPurposes, KeyAlgorithms, KeyEncodings } = require('@verii/crypto');
+const { KeyErrorMessages } = require('./constants');
 
 const validKeyPurposes = values(KeyPurposes);
 

package/src/entities/keys/factories/key-factory.js

@@ -15,11 +15,15 @@
  */
 
 const { register } = require('@spencejs/spence-factories');
-const { KeyPurposes, generateKeyPair } = require('@verii/crypto');
+const {
+  KeyPurposes,
+  KeyAlgorithms,
+  KeyEncodings,
+  generateKeyPair,
+} = require('@verii/crypto');
 const { ObjectId } = require('mongodb');
 const { defaultRepoOptions, kmsRepo } = require('@verii/db-kms');
 const { initTenantFactory } = require('../../tenants');
-const { KeyAlgorithms, KeyEncodings } = require('../domains');
 const { agentKmsOptions } = require('../../../plugins/kms-plugin');
 
 const initKeysFactory = (app) => {

package/src/entities/offers/orchestrators/create-verifiable-credentials.js

@@ -91,7 +91,10 @@ const doIssueVerifiableCredentials = async (
   const credentialTypesMap = await loadCredentialTypesMap(offers, context);
 
   // eslint-disable-next-line better-mutation/no-mutation
-  context.allocationListQueries = mongoAllocationListQueries(mongoDb());
+  context.allocationListQueries = mongoAllocationListQueries(
+    mongoDb(),
+    'allocations'
+  );
 
   return issueVelocityVerifiableCredentials(
     offers,

package/test/holder/credential-manifest-controller.test.js

@@ -586,9 +586,13 @@ describe('get credential manifests', () => {
             'CurrentEmploymentPosition',
           ],
         }),
+        headers: {
+          origin: 'foo',
+        },
       });
 
       expect(response.statusCode).toEqual(200);
+      expect(response.headers['access-control-allow-origin']).toEqual('foo');
       expect(response.json).toEqual({
         issuing_request: expect.any(String),
       });

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

@@ -198,8 +198,7 @@ describe('e2e issuing tests', () => {
     await mongoDb().collection('exchanges').deleteMany({});
     await mongoDb().collection('offers').deleteMany({});
     await mongoDb().collection('vendorUserIdMappings').deleteMany({});
-    await mongoDb().collection('metadataListAllocations').deleteMany({});
-    await mongoDb().collection('revocationListAllocations').deleteMany({});
+    await mongoDb().collection('allocations').deleteMany({});
 
     disclosure = await persistDisclosure({
       tenant,
@@ -276,24 +275,26 @@ describe('e2e issuing tests', () => {
     );
 
     const metadataListAllocation = await mongoDb()
-      .collection('metadataListAllocations')
-      .findOne();
+      .collection('allocations')
+      .findOne({ entityName: 'metadataListAllocations' });
     expect(metadataListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
+      entityName: 'metadataListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
       updatedAt: expect.any(Date),
     });
     const revocationListAllocation = await mongoDb()
-      .collection('revocationListAllocations')
-      .findOne();
+      .collection('allocations')
+      .findOne({ entityName: 'revocationListAllocations' });
     expect(revocationListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
+      entityName: 'revocationListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
@@ -329,24 +330,26 @@ describe('e2e issuing tests', () => {
     );
 
     const metadataListAllocation = await mongoDb()
-      .collection('metadataListAllocations')
-      .findOne();
+      .collection('allocations')
+      .findOne({ entityName: 'metadataListAllocations' });
     expect(metadataListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
+      entityName: 'metadataListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
       updatedAt: expect.any(Date),
     });
     const revocationListAllocation = await mongoDb()
-      .collection('revocationListAllocations')
-      .findOne();
+      .collection('allocations')
+      .findOne({ entityName: 'revocationListAllocations' });
     expect(revocationListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
+      entityName: 'revocationListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
@@ -382,24 +385,26 @@ describe('e2e issuing tests', () => {
     );
 
     const metadataListAllocation = await mongoDb()
-      .collection('metadataListAllocations')
-      .findOne();
+      .collection('allocations')
+      .findOne({ entityName: 'metadataListAllocations' });
     expect(metadataListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
+      entityName: 'metadataListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),
       updatedAt: expect.any(Date),
     });
     const revocationListAllocation = await mongoDb()
-      .collection('revocationListAllocations')
-      .findOne();
+      .collection('allocations')
+      .findOne({ entityName: 'revocationListAllocations' });
     expect(revocationListAllocation).toEqual({
       _id: expect.any(ObjectId),
       createdAt: expect.any(Date),
       currentListId: expect.any(Number),
+      entityName: 'revocationListAllocations',
       freeIndexes: expect.any(Array),
       operatorAddress: toEthereumAddress(operatorKeyPair.publicKey),
       tenantId: new ObjectId(tenant._id),

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

@@ -91,6 +91,7 @@ const mockAddRevocationListSigned = jest.fn();
 const mockLookupPrimary = jest.fn();
 const mockInitPermissions = jest.fn();
 jest.mock('@verii/metadata-registration', () => ({
+  ...jest.requireActual('@verii/metadata-registration'),
   initRevocationRegistry: () => ({
     addRevocationListSigned: mockAddRevocationListSigned,
   }),
@@ -3035,6 +3036,7 @@ describe('Holder Issuing Test Suite', () => {
         },
         issuer: {
           id: tenant.did,
+          type: ['Issuer'],
           name: 'mock',
           image: 'mock',
           badProperty: 'should be ignored',
@@ -4128,7 +4130,7 @@ describe('Holder Issuing Test Suite', () => {
           tenant,
           exchange,
           user,
-          issuer: { image: 'image', name: 'name' },
+          issuer: { type: 'Brand', image: 'image', name: 'name' },
         })
       );
       nock(mockVendorUrl)
@@ -4160,6 +4162,7 @@ describe('Holder Issuing Test Suite', () => {
               tenant,
             }),
             issuer: {
+              type: 'Brand',
               image: 'image',
               name: 'name',
               id: tenant.did,

package/test/operator/keys-controller-v0.8.test.js

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-// eslint-disable-next-line import/order
 const nock = require('nock');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { ObjectId } = require('mongodb');
@@ -27,7 +25,7 @@ const { errorResponseMatcher, mongoify } = require('@verii/tests-helpers');
 const { hexFromJwk, jwkFromSecp256k1Key } = require('@verii/jwt');
 const { rootPrivateKey } = require('@verii/sample-data');
 const { toEthereumAddress } = require('@verii/blockchain-functions');
-const { KeyPurposes, generateKeyPair } = require('@verii/crypto');
+const { KeyPurposes, KeyEncodings, generateKeyPair } = require('@verii/crypto');
 const {
   deployTestPermissionsContract,
 } = require('@verii/contract-permissions/test/helpers/deploy-test-permissions-contract');
@@ -40,7 +38,6 @@ const {
   initTenantFactory,
   initKeysFactory,
   tenantRepoPlugin,
-  KeyEncodings,
 } = require('../../src/entities');
 const {
   generatePrimaryAndAddOperatorToPrimary,

package/test/operator/offers-controller-v0.8.test.js

@@ -1052,7 +1052,7 @@ describe('vendor offer management', () => {
       );
     });
 
-    it('/offers should 200 and have issuer with bad property in the issuer', async () => {
+    it('/offers should 200 and have issuer with additional property in the issuer', async () => {
       await nockRegistrarAppSchemaName({
         schemaName: 'past-employment-position',
         credentialType: 'PastEmploymentPosition',
@@ -1060,18 +1060,16 @@ describe('vendor offer management', () => {
       });
 
       const offer = await newVendorOffer({ tenant, exchange });
+      const issuer = {
+        id: tenant.did,
+        name: 'image',
+        image: 'http://image.com',
+        additionalProperty: 'additionalProperty',
+      };
       const response = await fastify.injectJson({
         method: 'POST',
         url: exchangeOffersUrl({ tenant, exchange }, ''),
-        payload: {
-          ...offer,
-          issuer: {
-            id: tenant.did,
-            name: 'image',
-            image: 'http://image.com',
-            badProperty: 'badProperty',
-          },
-        },
+        payload: { ...offer, issuer },
       });
 
       expect(response.statusCode).toEqual(200);
@@ -1083,11 +1081,7 @@ describe('vendor offer management', () => {
         },
         exchangeId,
         id: expect.stringMatching(OBJECT_ID_FORMAT),
-        issuer: {
-          id: tenant.did,
-          name: 'image',
-          image: 'http://image.com',
-        },
+        issuer,
         updatedAt: expect.stringMatching(ISO_DATETIME_FORMAT),
         createdAt: expect.stringMatching(ISO_DATETIME_FORMAT),
       });
@@ -1140,11 +1134,7 @@ describe('vendor offer management', () => {
           createdAt: expect.any(Date),
           updatedAt: expect.any(Date),
           exchangeId,
-          issuer: {
-            id: tenant.did,
-            name: 'image',
-            image: 'http://image.com',
-          },
+          issuer,
         })
       );
     });

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

@@ -60,6 +60,7 @@ const mockAddRevocationListSigned = jest.fn();
 const mockGetRevokeUrl = jest.fn();
 
 jest.mock('@verii/metadata-registration', () => ({
+  ...jest.requireActual('@verii/metadata-registration'),
   initRevocationRegistry: () => ({
     addRevocationListSigned: mockAddRevocationListSigned,
   }),
@@ -329,7 +330,12 @@ describe('vc-api credentials endpoints', () => {
           })
         );
         expect(mockAddCredentialMetadataEntry.mock.calls).toEqual([
-          [expect.any(Object), expect.any(String), 'did:ion:cao'],
+          [
+            expect.any(Object),
+            expect.any(String),
+            'did:ion:cao',
+            'cosekey:aes-256-gcm',
+          ],
         ]);
       });
 
@@ -724,8 +730,8 @@ describe('vc-api credentials endpoints', () => {
               'payload.vc.credentialSubject.type': 'AchievementSubject',
               'payload.vc.credentialSubject.@context': undefined,
               'payload.vc.credentialSchema': {
-                id: 'https://imsglobal.org/schemas/open-badge-v3.0-schema.json',
-                type: 'JsonSchemaValidator2018',
+                type: '1EdTechJsonSchemaValidator2019',
+                id: 'http://example.com/schema.json',
               },
             },
           })