fix: handle issue revocation list on the issuer

Signed-off-by: Nam Hoang <[email protected]>

packages/core-types/src/types/IRevocationList2020.ts

@@ -25,6 +25,6 @@ export interface IRevocationStore extends IPluginMethodMap {
  getRevocationData(
  args: IRevocationListDataArgs,
  req: RequestWithAgent
- ): Promise<{ revocationListFullUrlPath: string; indexCounter: number }>;
+ ): Promise<{ revocationListFullUrl: string; indexCounter: number }>;
  getRevocationListVC(revocationListFullUrlPath: string): Promise<any>;
 }

packages/encrypted-storage/src/encrypted-storage.ts

@@ -40,7 +40,6 @@ export class EncryptedStorage implements IAgentPlugin {
  args: IEncryptAndStoreDataArgs
  ): Promise<IEncrypteAndStoreDataResult> {
  const { data } = args;
- console.log('encryptAndStoreData', JSON.stringify(data, null, 2));
  const credentialHash = computeEntryHash(data);
  const key = generateEncryptionKey();
 

packages/encrypted-storage/src/identifier/encrypted-data-store.ts

@@ -26,7 +26,6 @@ export class EncryptedDataStore {
  credentialEncryptedData.credentialHash = credentialHash;
  credentialEncryptedData.encryptedDataId = result.id;
  credentialEncryptedData.decryptedKey = decryptedKey;
- console.log('credentialEncryptedData', credentialEncryptedData);
 
  await db
  .getRepository(CredentialEncryptedData)

packages/revocation-list-2020/src/identifier/revocation-list-2020-store.ts

@@ -1,5 +1,5 @@
 import { createCredential, createList } from '@transmute/vc-status-rl-2020';
-import { IRevocationListDataArgs } from '@vckit/core-types';
+import { IIdentifier, IRevocationListDataArgs } from '@vckit/core-types';
 import { OrPromise } from '@veramo/utils';
 import { DataSource } from 'typeorm';
 import {
@@ -43,6 +43,7 @@ export class RevocationDataStore {
  {
  credential: credentialList,
  ...rest,
+ proofFormat: 'lds',
  }
  );
 
@@ -54,28 +55,46 @@ export class RevocationDataStore {
 
  async getRevocationData(
  args: IRevocationListDataArgs
- ): Promise<{ revocationListFullUrlPath: string; indexCounter: number }> {
+ ): Promise<{ revocationListFullUrl: string; indexCounter: number }> {
  try {
  const {
  revocationListPath: revocationListUrlPath,
  revocationVCIssuer,
  bitStringLength,
  req,
  } = args;
+
+ let revocationVCIdentifier: IIdentifier;
+ try {
+ revocationVCIdentifier = (await req.agent?.execute('didManagerGet', {
+ did: revocationVCIssuer,
+ })) as IIdentifier;
+ } catch (e) {
+ throw new Error(
+ `invalid_argument: credential.issuer must be a DID managed by this agent. ${e}`
+ );
+ }
+ const revocationVCIssuerDid = revocationVCIdentifier.did.replaceAll(
+ ':',
+ '_'
+ );
+
+ const revocationListUrlPathByIssuer = `${revocationListUrlPath}/${revocationVCIssuerDid}`;
+
  const db = await getConnectedDb(this.dbConnection);
 
- let revocationData = await db
- .getRepository(RevocationData)
-  .findOne({ where: { revocationListUrlPath } });
+ let revocationData = await db.getRepository(RevocationData).findOne({
+ where: { revocationListUrlPath: revocationListUrlPathByIssuer },
+ });
 
  if (!revocationData) {
  revocationData = await db.getRepository(RevocationData).save({
- revocationListUrlPath,
+ revocationListUrlPath: revocationListUrlPathByIssuer,
  bitStringLength: Number(bitStringLength),
  });
  }
 
- const revocationListFullUrlPath = `/credentials/status/revocation-list-2020/${revocationData.listCounter}`;
+ const revocationListFullUrlPath = `/credentials/status/revocation-list-2020/${revocationVCIssuerDid}/${revocationData.listCounter}`;
 
  let revocationList = await db.getRepository(RevocationList).findOne({
  where: {
@@ -86,7 +105,7 @@ export class RevocationDataStore {
  // Not available - create one
  if (!revocationList) {
  revocationList = await this.createRevocationListVC(
- `${revocationListUrlPath}${revocationListFullUrlPath}`,
+ `${revocationListUrlPathByIssuer}${revocationListFullUrlPath}`,
  Number(bitStringLength),
  revocationVCIssuer,
  req
@@ -100,11 +119,12 @@ export class RevocationDataStore {
 
  await this.updateRevocationData({
  revocationData,
+ revocationVCIssuerDid,
  args,
  });
 
  return {
- revocationListFullUrlPath,
+ revocationListFullUrl: `${revocationListUrlPathByIssuer}${revocationListFullUrlPath}`,
  indexCounter: revocationData.indexCounter,
  };
  } catch (err) {
@@ -114,9 +134,11 @@ export class RevocationDataStore {
 
  async updateRevocationData({
  revocationData,
+ revocationVCIssuerDid,
  args,
  }: {
  revocationData: RevocationData;
+ revocationVCIssuerDid: string;
  args: IRevocationListDataArgs;
  }): Promise<void> {
  try {
@@ -138,10 +160,11 @@ export class RevocationDataStore {
  nextBitStringLength = Number(args.bitStringLength);
  }
 
- const revocationListFullUrlPath = `/credentials/status/revocation-list-2020/${nextList}`;
+ const revocationListFullUrlPath = `/credentials/status/revocation-list-2020/${revocationVCIssuerDid}/${nextList}`;
+ const revocationListUrlPathByIssuer = `${args.revocationListPath}/${revocationVCIssuerDid}`;
 
  const revocationList = await this.createRevocationListVC(
- `${args.revocationListPath}${revocationListFullUrlPath}`,
+ `${revocationListUrlPathByIssuer}${revocationListFullUrlPath}`,
  Number(args.bitStringLength),
  args.revocationVCIssuer,
  args.req

packages/revocation-list-2020/src/revocation-list-2020-middleware.ts

@@ -1,5 +1,5 @@
 import { RequestWithAgent } from '@vckit/core-types';
-import { asArray, processEntryToArray } from '@veramo/utils';
+import { asArray, extractIssuer, processEntryToArray } from '@veramo/utils';
 import {
  NextFunction,
  Request,
@@ -37,10 +37,12 @@ export function revocationList2020(args: {
  }
 
  try {
+ const revocationVCIssuer = extractIssuer(req.body.credential);
+
  const revocationData = await req.agent.execute('getRevocationData', {
  revocationListPath: args.revocationListPath,
  bitStringLength: args.bitStringLength,
- revocationVCIssuer: args.revocationVCIssuer,
+ revocationVCIssuer,
  req,
  });
 
@@ -60,10 +62,10 @@ export function revocationList2020(args: {
  }
 
  req.body.credential.credentialStatus = {
- id: `${args.revocationListPath}${revocationData.revocationListFullUrlPath}`,
+ id: revocationData.revocationListFullUrl,
  type: 'RevocationList2020Status',
  revocationListIndex: revocationData.indexCounter,
- revocationListCredential: `${args.revocationListPath}${revocationData.revocationListFullUrlPath}`,
+ revocationListCredential: revocationData.revocationListFullUrl,
  };
 
  next();

packages/revocation-list-2020/src/revocation-list-2020-router.ts

@@ -13,13 +13,15 @@ export function revocationList2020Router(): Router {
  const router = Router();
 
  // credentials/status/revocation-list-2020
- router.get('/:id', async (req: RequestWithAgent, res: Response) => {
- const { id } = req.params;
+ router.get('/:issuer/:id', async (req: RequestWithAgent, res: Response) => {
+ const { id, issuer } = req.params;
  const agent = req.agent;
  if (!agent) throw Error('Agent not available');
 
  try {
- const revocationListFullUrlPath = req.originalUrl;
+ const revocationListFullUrlPath = req.originalUrl.substring(
+ req.originalUrl.indexOf(issuer) + issuer.length
+ );
 
  const result = await agent.execute(
  'getRevocationListVC',

packages/revocation-list-2020/src/revocation-list-2020.ts

@@ -33,7 +33,7 @@ export class RevocationStatus2020 implements IAgentPlugin {
 
  async getRevocationData(
  args: IRevocationListDataArgs
- ): Promise<{ revocationListFullUrlPath: string; indexCounter: number }> {
+ ): Promise<{ revocationListFullUrl: string; indexCounter: number }> {
  const data = await this.store.getRevocationData(args);
 
  return data;