fix: handling of diddoc content as string (#2028)

Signed-off-by: Daniel Bluhm <dbluhm@pm.me>
openwallet-foundation · Sep 12, 2024 · de7d359 · de7d359
1 parent 4c1108c
commit de7d359
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/indy-vdr/src/dids/__tests__/IndyVdrIndyDidResolver.test.ts b/packages/indy-vdr/src/dids/__tests__/IndyVdrIndyDidResolver.test.ts
@@ -34,7 +34,7 @@ describe('IndyVdrIndyDidResolver', () => {
             did: 'LjgpST2rjsoxYegQDRm7EL',
             verkey: 'E6D1m3eERqCueX4ZgMCY14B4NceAr6XP2HyVqt55gDhu',
             role: 'ENDORSER',
-            diddocContent: didIndyLjgpST2rjsoxYegQDRm7ELdiddocContent,
+            diddocContent: JSON.stringify(didIndyLjgpST2rjsoxYegQDRm7ELdiddocContent),
           }),
         },
       }

diff --git a/packages/indy-vdr/src/dids/didIndyUtil.ts b/packages/indy-vdr/src/dids/didIndyUtil.ts
@@ -271,7 +271,14 @@ export async function buildDidDocument(agentContext: AgentContext, pool: IndyVdr
     }
     return builder.build()
   } else {
-    // Combine it with didDoc (TODO: Check if diddocContent is returned as a JSON object or a string)
-    return combineDidDocumentWithJson(builder.build(), nym.diddocContent)
+    // Combine it with didDoc
+    let diddocContent
+    try {
+      diddocContent = JSON.parse(nym.diddocContent) as Record<string, unknown>
+    } catch (error) {
+      agentContext.config.logger.error(`Nym diddocContent is not a valid json string: ${diddocContent}`)
+      throw new IndyVdrError(`Nym diddocContent failed to parse as JSON: ${error}`)
+    }
+    return combineDidDocumentWithJson(builder.build(), diddocContent)
   }
 }
diff --git a/packages/indy-vdr/src/dids/didSovUtil.ts b/packages/indy-vdr/src/dids/didSovUtil.ts
@@ -25,7 +25,7 @@ export interface GetNymResponseData {
   verkey: string
   role: string
   alias?: string
-  diddocContent?: Record<string, unknown>
+  diddocContent?: string
 }
 
 export const FULL_VERKEY_REGEX = /^[1-9A-HJ-NP-Za-km-z]{43,44}$/