feat: generic attachment handler

fixed fct declaration and henceforth tests Co-authored-by: annelein <anneleinvanreijen@gmail.com> Signed-off-by: morrieinmaas <moritz@animo.id>
openwallet-foundation · Dec 15, 2021 · 5dd353b · 5dd353b
1 parent 92acbb6
commit 5dd353b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/packages/core/src/decorators/attachment/Attachment.ts b/packages/core/src/decorators/attachment/Attachment.ts
@@ -47,13 +47,13 @@ export class AttachmentData {
     }
   }
 
-  public getDataAsJson = () => {
-    if (this.base64 !== null && typeof this.base64 === 'string') {
+  public getDataAsJson<T>(): T {
+    if (this.base64 && typeof this.base64 === 'string') {
       return JsonEncoder.fromBase64(this.base64)
-    } else if (this.json !== null) {
-      return this.json
+    } else if (this.json) {
+      return this.json as T
     } else {
-      throw new AriesFrameworkError('No data available.')
+      throw new AriesFrameworkError('No attachment data found in `json` or `base64` data fields.')
     }
   }
 

diff --git a/packages/core/src/modules/credentials/messages/IssueCredentialMessage.ts b/packages/core/src/modules/credentials/messages/IssueCredentialMessage.ts
@@ -48,8 +48,8 @@ export class IssueCredentialMessage extends AgentMessage {
     const attachment = this.credentialAttachments.find((attachment) => attachment.id === INDY_CREDENTIAL_ATTACHMENT_ID)
 
     // Extract credential from attachment
-    const credentialJson = attachment ? attachment.data.getDataAsJson() : null
+    const credentialJson = attachment?.data?.getDataAsJson()
 
-    return credentialJson
+    return credentialJson as Cred
   }
 }
diff --git a/packages/core/src/modules/credentials/messages/OfferCredentialMessage.ts b/packages/core/src/modules/credentials/messages/OfferCredentialMessage.ts
@@ -63,8 +63,8 @@ export class OfferCredentialMessage extends AgentMessage {
     const attachment = this.offerAttachments.find((attachment) => attachment.id === INDY_CREDENTIAL_OFFER_ATTACHMENT_ID)
 
     // Extract credential offer from attachment
-    const credentialOfferJson = attachment ? attachment.data.getDataAsJson() : null
+    const credentialOfferJson = attachment?.data?.getDataAsJson()
 
-    return credentialOfferJson
+    return credentialOfferJson as CredOffer
   }
 }
diff --git a/packages/core/src/modules/credentials/messages/RequestCredentialMessage.ts b/packages/core/src/modules/credentials/messages/RequestCredentialMessage.ts
@@ -49,8 +49,8 @@ export class RequestCredentialMessage extends AgentMessage {
       (attachment) => attachment.id === INDY_CREDENTIAL_REQUEST_ATTACHMENT_ID
     )
     // Extract proof request from attachment
-    const credentialReqJson = attachment ? attachment.data.getDataAsJson() : null
+    const credentialReqJson = attachment?.data?.getDataAsJson()
 
-    return credentialReqJson
+    return credentialReqJson as CredReq
   }
 }
diff --git a/packages/core/src/modules/proofs/messages/PresentationMessage.ts b/packages/core/src/modules/proofs/messages/PresentationMessage.ts
@@ -60,13 +60,8 @@ export class PresentationMessage extends AgentMessage {
   public get indyProof(): IndyProof | null {
     const attachment = this.presentationAttachments.find((attachment) => attachment.id === INDY_PROOF_ATTACHMENT_ID)
 
-    // Return null if attachment is not found
-    if (!attachment?.data?.base64) {
-      return null
-    }
-
-    const proofJson = JsonEncoder.fromBase64(attachment.data.base64)
+    const proofJson = attachment?.data?.getDataAsJson()
 
-    return proofJson
+    return proofJson as IndyProof
   }
 }
diff --git a/packages/core/src/modules/proofs/messages/RequestPresentationMessage.ts b/packages/core/src/modules/proofs/messages/RequestPresentationMessage.ts
@@ -58,7 +58,7 @@ export class RequestPresentationMessage extends AgentMessage {
       (attachment) => attachment.id === INDY_PROOF_REQUEST_ATTACHMENT_ID
     )
     // Extract proof request from attachment
-    const proofRequestJson = attachment ? attachment.data.getDataAsJson() : null
+    const proofRequestJson = attachment?.data?.getDataAsJson()
     const proofRequest = JsonTransformer.fromJSON(proofRequestJson, ProofRequest)
 
     return proofRequest