feat: update did-discover-provider to search by DID likeness in addit…

…ion to name
decentralized-identity · May 31, 2022 · 3696a7a · 3696a7a
1 parent 92b793e
commit 3696a7a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/__tests__/shared/didDiscovery.ts b/__tests__/shared/didDiscovery.ts
@@ -107,9 +107,9 @@ export default (testContext: {
 
       const byDIDFragmentResult = await agent.discoverDid({ query: identifier.did.substring(3, identifier.did.length - 3)})
       expect(byDIDFragmentResult.results).toHaveLength(1)
-      expect(byDIDFragmentResult.results[0].matches).toHaveLength(1)
+      expect(byDIDFragmentResult.results[0].matches).toHaveLength(2)
 
-      expect(byDIDFragmentResult.results[0].matches[0]).toEqual({
+      expect(byDIDFragmentResult.results[0].matches[1]).toEqual({
         did: identifier.did,
         metaData: {
           alias: 'bob'

diff --git a/packages/data-store/src/did-discovery-provider.ts b/packages/data-store/src/did-discovery-provider.ts
@@ -15,15 +15,32 @@ export class DataStoreDiscoveryProvider implements AbstractDidDiscoveryProvider
   ): Promise<IDIDDiscoveryProviderResult> {
     const matches: IDIDDiscoverMatch[] = []
 
-    const credentials = await context.agent.dataStoreORMGetVerifiableCredentialsByClaims({
+    const credentialsByName = await context.agent.dataStoreORMGetVerifiableCredentialsByClaims({
       where: [
         { column: 'type', value: ['name'] },
         { column: 'value', value: [`%${args.query}%`], op: 'Like' },
         { column: 'credentialType', value: ['VerifiableCredential,Profile'] },
       ],
     })
 
-    credentials.forEach((vc) => {
+    credentialsByName.forEach((vc) => {
+      matches.push({
+        did: vc.verifiableCredential.credentialSubject.id as string,
+        metaData: {
+          verifiableCredential: vc.verifiableCredential,
+        },
+      })
+    })
+
+    const credentialsByDID = await context.agent.dataStoreORMGetVerifiableCredentialsByClaims({
+      where: [
+        { column: 'type', value: ['name'] },
+        { column: 'subject', value: [`%${args.query}%`], op: 'Like' },
+        { column: 'credentialType', value: ['VerifiableCredential,Profile'] },
+      ],
+    })
+
+    credentialsByDID.forEach((vc) => {
       matches.push({
         did: vc.verifiableCredential.credentialSubject.id as string,
         metaData: {