fix(proofs): add missing goal_code to options

Signed-off-by: NB-Karim <[email protected]>

Author: NB-KarimStekelenburg

packages/core/src/modules/proofs/protocol/v2/messages/V2PresentationMessage.ts

@@ -13,6 +13,7 @@ export interface V2PresentationMessageOptions {
   id?: string
   goalCode?: string
   comment?: string
+  willConfirm?: boolean
   attachmentInfo: ProofAttachmentFormat[]
 }
 
@@ -23,6 +24,7 @@ export class V2PresentationMessage extends AgentMessage {
       this.id = options.id ?? uuid()
       this.comment = options.comment
       this.goalCode = options.goalCode
+      this.willConfirm = options.willConfirm ?? false
 
       for (const entry of options.attachmentInfo) {
         this.addPresentationsAttachment(entry)

packages/core/src/modules/proofs/protocol/v2/messages/V2ProposalPresentationMessage.ts

@@ -1,20 +1,21 @@
-import type { ProofFormatSpec } from '../../../formats/models/ProofFormatServiceOptions'
+import type { ProofAttachmentFormat } from '../../../formats/models/ProofFormatServiceOptions'
 
 import { Expose, Type } from 'class-transformer'
-import { Equals, IsArray, IsInstance, IsOptional, IsString, ValidateNested } from 'class-validator'
+import { Equals, IsArray, IsBoolean, IsInstance, IsOptional, IsString, ValidateNested } from 'class-validator'
 
 import { AgentMessage } from '../../../../../agent/AgentMessage'
 import { uuid } from '../../../../../utils/uuid'
+import { ProofFormatSpec } from '../../../formats/models/ProofFormatServiceOptions'
 import { PresentationPreview } from '../../v1/models/PresentationPreview'
 
 import { Attachment } from 'packages/core/src/decorators/attachment/Attachment'
 
 export interface V2ProposePresentationMessageOptions {
   id?: string
-  formats: ProofFormatSpec
-  filtersAttach: Attachment[]
   comment?: string
-  presentationProposal: PresentationPreview
+  goalCode?: string
+  willConfirm?: boolean
+  attachmentInfo: ProofAttachmentFormat[]
 }
 
 export class V2ProposalPresentationMessage extends AgentMessage {
@@ -23,40 +24,48 @@ export class V2ProposalPresentationMessage extends AgentMessage {
     if (options) {
       this.id = options.id ?? uuid()
       this.comment = options.comment
-      this.presentationProposal = options.presentationProposal
-      this.formats = options.formats
-      this.filtersAttach = options.filtersAttach
+      this.goalCode = options.goalCode
+      this.willConfirm = options.willConfirm ?? false
+
+      for (const entry of options.attachmentInfo) {
+        this.addProposalsAttachment(entry)
+      }
     }
   }
 
+  public addProposalsAttachment(attachment: ProofAttachmentFormat) {
+    this.formats.push(attachment.format)
+    this.proposalsAttach.push(attachment.attachment)
+  }
+
   @Equals(V2ProposalPresentationMessage.type)
   public readonly type = V2ProposalPresentationMessage.type
-  public static readonly type = `https://didcomm.org/${PRES_20_PROPOSAL}`
-
-  @Expose({ name: 'filters~attach' })
-  @Type(() => Attachment)
-  @IsArray()
-  @ValidateNested({
-    each: true,
-  })
-  @IsInstance(Attachment, { each: true })
-  public filtersAttach!: Attachment[]
+  public static readonly type = `https://didcomm.org/present-proof/2.0/propose-presentation`
 
-  /**
-   * Provides some human readable information about the proposed presentation.
-   */
   @IsString()
   @IsOptional()
   public comment?: string
 
-  /**
-   * Represents the presentation example that prover wants to provide.
-   */
-  @Expose({ name: 'presentation_proposal' })
-  @Type(() => PresentationPreview)
-  @ValidateNested()
-  @IsInstance(PresentationPreview)
-  public presentationProposal!: PresentationPreview
+  @Expose({ name: 'goal_code' })
+  @IsString()
+  @IsOptional()
+  public goalCode?: string
+
+  @Expose({ name: 'will_confirm' })
+  @IsBoolean()
+  public willConfirm = false
+
+  @Expose({ name: 'formats' })
+  @Type(() => ProofFormatSpec)
+  @IsArray()
+  @ValidateNested({ each: true })
+  @IsInstance(ProofFormatSpec, { each: true })
+  public formats!: ProofFormatSpec[]
 
-  public formats!: ProofFormatSpec
+  @Expose({ name: 'proposals~attach' })
+  @Type(() => Attachment)
+  @IsArray()
+  @ValidateNested({ each: true })
+  @IsInstance(Attachment, { each: true })
+  public proposalsAttach!: Attachment[]
 }

packages/core/src/modules/proofs/protocol/v2/messages/V2RequestPresentationMessage.ts

@@ -11,8 +11,9 @@ import { uuid } from 'packages/core/src/utils/uuid'
 
 export interface V2RequestPresentationMessageOptions {
   id?: string
-  goalCode?: string
   comment?: string
+  goalCode?: string
+  willConfirm?: boolean
   attachmentInfo: ProofAttachmentFormat[]
 }
 
@@ -23,16 +24,17 @@ export class V2RequestPresentationMessage extends AgentMessage {
       this.id = options.id ?? uuid()
       this.comment = options.comment
       this.goalCode = options.goalCode
+      this.willConfirm = options.willConfirm ?? false
 
       for (const entry of options.attachmentInfo) {
-        this.addProposalsAttachment(entry)
+        this.addRequestPresentationsAttachment(entry)
       }
     }
   }
 
-  public addProposalsAttachment(attachment: ProofAttachmentFormat) {
+  public addRequestPresentationsAttachment(attachment: ProofAttachmentFormat) {
     this.formats.push(attachment.format)
-    this.proposalsAttach.push(attachment.attachment)
+    this.requestPresentationsAttach.push(attachment.attachment)
   }
 
   @Equals(V2RequestPresentationMessage.type)
@@ -59,10 +61,10 @@ export class V2RequestPresentationMessage extends AgentMessage {
   @IsInstance(ProofFormatSpec, { each: true })
   public formats!: ProofFormatSpec[]
 
-  @Expose({ name: 'proposals~attach' })
+  @Expose({ name: 'request_presentations~attach' })
   @Type(() => Attachment)
   @IsArray()
   @ValidateNested({ each: true })
   @IsInstance(Attachment, { each: true })
-  public proposalsAttach!: Attachment[]
+  public requestPresentationsAttach!: Attachment[]
 }