feat: sort requested credentials (#1839)

Signed-off-by: wadeking98 <[email protected]>
openwallet-foundation · Apr 26, 2024 · b46c7fa · b46c7fa
1 parent 9c3b950
commit b46c7fa
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 6 deletions.
diff --git a/packages/anoncreds/src/anoncreds-rs/__tests__/AnonCredsRsServices.test.ts b/packages/anoncreds/src/anoncreds-rs/__tests__/AnonCredsRsServices.test.ts
@@ -205,6 +205,8 @@ describe('AnonCredsRsServices', () => {
       revocationRegistryId: null,
       credentialRevocationId: null,
       methodName: 'inMemory',
+      createdAt: expect.any(Date),
+      updatedAt: expect.any(Date),
     })
 
     const proofRequest: AnonCredsProofRequest = {
@@ -410,6 +412,8 @@ describe('AnonCredsRsServices', () => {
       revocationRegistryId: null,
       credentialRevocationId: null,
       methodName: 'inMemory',
+      createdAt: expect.any(Date),
+      updatedAt: expect.any(Date),
     })
 
     const proofRequest: AnonCredsProofRequest = {

diff --git a/packages/anoncreds/src/anoncreds-rs/__tests__/helpers.ts b/packages/anoncreds/src/anoncreds-rs/__tests__/helpers.ts
@@ -174,6 +174,8 @@ export async function createCredentialForHolder(options: {
     methodName: 'inMemory',
     credentialRevocationId: null,
     revocationRegistryId: null,
+    createdAt: new Date('2024-01-01T00:00:00Z'),
+    updatedAt: new Date('2024-01-01T00:00:00Z'),
   }
   const returnObj = {
     credential: w3cJsonLdCredential,

diff --git a/packages/anoncreds/src/formats/__tests__/legacy-indy-format-services.test.ts b/packages/anoncreds/src/formats/__tests__/legacy-indy-format-services.test.ts
@@ -314,6 +314,8 @@ describe('Legacy indy format services', () => {
       revocationRegistryId: null,
       credentialRevocationId: null,
       methodName: 'inMemory',
+      createdAt: expect.any(Date),
+      updatedAt: expect.any(Date),
     })
 
     expect(holderCredentialRecord.metadata.data).toEqual({

diff --git a/packages/anoncreds/src/models/internal.ts b/packages/anoncreds/src/models/internal.ts
@@ -8,6 +8,8 @@ export interface AnonCredsCredentialInfo {
   revocationRegistryId: string | null
   credentialRevocationId: string | null
   methodName: string
+  createdAt: Date
+  updatedAt: Date
   linkSecretId: string
 }
 

diff --git a/packages/anoncreds/src/utils/__tests__/sortRequestedCredentialsMatches.test.ts b/packages/anoncreds/src/utils/__tests__/sortRequestedCredentialsMatches.test.ts
@@ -2,26 +2,29 @@ import type { AnonCredsCredentialInfo, AnonCredsRequestedAttributeMatch } from '
 
 import { sortRequestedCredentialsMatches } from '../sortRequestedCredentialsMatches'
 
-const credentialInfo = {} as unknown as AnonCredsCredentialInfo
+const credentialInfo = {
+  updatedAt: new Date('2024-01-01T00:00:00Z'),
+  createdAt: new Date('2024-01-01T00:00:00Z'),
+} as unknown as AnonCredsCredentialInfo
 
 const credentials: AnonCredsRequestedAttributeMatch[] = [
   {
     credentialId: '1',
     revealed: true,
     revoked: true,
-    credentialInfo,
+    credentialInfo: { ...credentialInfo, updatedAt: new Date('2024-01-01T00:00:01Z') },
   },
   {
     credentialId: '2',
     revealed: true,
     revoked: undefined,
-    credentialInfo,
+    credentialInfo: { ...credentialInfo, updatedAt: new Date('2024-01-01T00:00:01Z') },
   },
   {
     credentialId: '3',
     revealed: true,
     revoked: false,
-    credentialInfo,
+    credentialInfo: { ...credentialInfo, updatedAt: new Date('2024-01-01T00:00:01Z') },
   },
   {
     credentialId: '4',

diff --git a/packages/anoncreds/src/utils/sortRequestedCredentialsMatches.ts b/packages/anoncreds/src/utils/sortRequestedCredentialsMatches.ts
@@ -9,7 +9,6 @@ import type { AnonCredsRequestedAttributeMatch, AnonCredsRequestedPredicateMatch
 export function sortRequestedCredentialsMatches<
   Requested extends Array<AnonCredsRequestedAttributeMatch> | Array<AnonCredsRequestedPredicateMatch>
 >(credentials: Requested) {
-  const staySame = 0
   const credentialGoUp = -1
   const credentialGoDown = 1
 
@@ -18,7 +17,8 @@ export function sortRequestedCredentialsMatches<
 
   return credentialsClone.sort((credential, compareTo) => {
     // Nothing needs to happen if values are the same
-    if (credential.revoked === compareTo.revoked) return staySame
+    if (credential.revoked === compareTo.revoked)
+      return compareTo.credentialInfo.updatedAt.getTime() - credential.credentialInfo.updatedAt.getTime()
 
     // Undefined always is at the top
     if (credential.revoked === undefined) return credentialGoUp

diff --git a/packages/anoncreds/src/utils/w3cAnonCredsUtils.ts b/packages/anoncreds/src/utils/w3cAnonCredsUtils.ts
@@ -69,6 +69,8 @@ function anonCredsCredentialInfoFromW3cRecord(w3cCredentialRecord: W3cCredential
     revocationRegistryId: anonCredsTags.anonCredsRevocationRegistryId ?? null,
     methodName: anonCredsCredentialMetadata.methodName,
     linkSecretId: anonCredsCredentialMetadata.linkSecretId,
+    createdAt: w3cCredentialRecord.createdAt,
+    updatedAt: w3cCredentialRecord.updatedAt ?? w3cCredentialRecord.createdAt,
   }
 }
 
@@ -89,6 +91,8 @@ function anonCredsCredentialInfoFromAnonCredsRecord(
     revocationRegistryId: anonCredsCredentialRecord.credential.rev_reg_id ?? null,
     methodName: anonCredsCredentialRecord.methodName,
     linkSecretId: anonCredsCredentialRecord.linkSecretId,
+    createdAt: anonCredsCredentialRecord.createdAt,
+    updatedAt: anonCredsCredentialRecord.updatedAt ?? anonCredsCredentialRecord.createdAt,
   }
 }
 

diff --git a/packages/anoncreds/tests/anoncreds-flow.test.ts b/packages/anoncreds/tests/anoncreds-flow.test.ts
@@ -373,6 +373,8 @@ async function anonCredsFlowTest(options: { issuerId: string; revocable: boolean
     revocationRegistryId: revocable ? revocationRegistryDefinitionId : null,
     credentialRevocationId: revocable ? '1' : null,
     methodName: 'inMemory',
+    createdAt: expect.any(Date),
+    updatedAt: expect.any(Date),
   })
 
   const expectedCredentialMetadata = revocable

diff --git a/packages/anoncreds/tests/data-integrity-flow-anoncreds.test.ts b/packages/anoncreds/tests/data-integrity-flow-anoncreds.test.ts
@@ -403,6 +403,8 @@ async function anonCredsFlowTest(options: { issuerId: string; revocable: boolean
     revocationRegistryId: revocable ? revocationRegistryDefinitionId : null,
     credentialRevocationId: revocable ? '1' : null,
     methodName: 'inMemory',
+    createdAt: expect.any(Date),
+    updatedAt: expect.any(Date),
   })
 
   const expectedCredentialMetadata = revocable

diff --git a/packages/anoncreds/tests/indy-flow.test.ts b/packages/anoncreds/tests/indy-flow.test.ts
@@ -303,6 +303,8 @@ describe('Legacy indy format services using anoncreds-rs', () => {
       credentialRevocationId: null,
       methodName: 'inMemory',
       linkSecretId: 'linkSecretId',
+      createdAt: expect.any(Date),
+      updatedAt: expect.any(Date),
     })
 
     expect(holderCredentialRecord.metadata.data).toEqual({