feat(proofs): delete associated didcomm messages

Signed-off-by: Timo Glastra <[email protected]>
openwallet-foundation · Sep 8, 2022 · 95bdaa8 · 95bdaa8
1 parent f38ac05
commit 95bdaa8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/packages/core/src/modules/credentials/CredentialServiceOptions.ts b/packages/core/src/modules/credentials/CredentialServiceOptions.ts
@@ -128,6 +128,6 @@ export interface CredentialProtocolMsgReturnType<MessageType extends AgentMessag
 }
 
 export interface DeleteCredentialOptions {
-  deleteAssociatedCredentials: boolean
-  deleteAssociatedDidCommMessages: boolean
+  deleteAssociatedCredentials?: boolean
+  deleteAssociatedDidCommMessages?: boolean
 }
diff --git a/packages/core/src/modules/proofs/ProofService.ts b/packages/core/src/modules/proofs/ProofService.ts
@@ -21,6 +21,7 @@ import type {
   CreateProposalOptions,
   CreateRequestAsResponseOptions,
   CreateRequestOptions,
+  DeleteProofOptions,
   FormatRequestedCredentialReturn,
   FormatRetrievedCredentialOptions,
   GetRequestedCredentialsForProofRequestOptions,
@@ -216,6 +217,25 @@ export abstract class ProofService<PFs extends ProofFormat[] = ProofFormat[]> {
     })
   }
 
+  public async delete(
+    agentContext: AgentContext,
+    proofRecord: ProofRecord,
+    options?: DeleteProofOptions
+  ): Promise<void> {
+    await this.proofRepository.delete(agentContext, proofRecord)
+
+    const deleteAssociatedDidCommMessages = options?.deleteAssociatedDidCommMessages ?? true
+
+    if (deleteAssociatedDidCommMessages) {
+      const didCommMessages = await this.didCommMessageRepository.findByQuery(agentContext, {
+        associatedRecordId: proofRecord.id,
+      })
+      for (const didCommMessage of didCommMessages) {
+        await this.didCommMessageRepository.delete(agentContext, didCommMessage)
+      }
+    }
+  }
+
   public abstract getRequestedCredentialsForProofRequest(
     agentContext: AgentContext,
     options: GetRequestedCredentialsForProofRequestOptions

diff --git a/packages/core/src/modules/proofs/ProofsApi.ts b/packages/core/src/modules/proofs/ProofsApi.ts
@@ -20,6 +20,7 @@ import type {
   CreateProofRequestFromProposalOptions,
   FormatRequestedCredentialReturn,
   FormatRetrievedCredentialOptions,
+  DeleteProofOptions,
 } from './models/ProofServiceOptions'
 import type { ProofRecord } from './repository/ProofRecord'
 
@@ -510,9 +511,10 @@ export class ProofsApi<
    *
    * @param proofId the proof record id
    */
-  public async deleteById(proofId: string) {
+  public async deleteById(proofId: string, options?: DeleteProofOptions) {
     const proofRecord = await this.getById(proofId)
-    return await this.proofRepository.delete(this.agentContext, proofRecord)
+    const service = this.getService(proofRecord.protocolVersion)
+    return service.delete(this.agentContext, proofRecord, options)
   }
 
   /**

diff --git a/packages/core/src/modules/proofs/models/ProofServiceOptions.ts b/packages/core/src/modules/proofs/models/ProofServiceOptions.ts
@@ -71,3 +71,7 @@ export interface ProofRequestFromProposalOptions<PFs extends ProofFormat[]> {
   proofRecord: ProofRecord
   proofFormats: ProofFormatPayload<PFs, 'createProofRequestFromProposal'>
 }
+
+export interface DeleteProofOptions {
+  deleteAssociatedDidCommMessages?: boolean
+}