From d5975b63f4ff458d3c6b857c8abd1e55989e44a2 Mon Sep 17 00:00:00 2001
From: Krishna Waske <krishna.waske@ayanworks.com>
Date: Wed, 28 Aug 2024 20:32:15 +0530
Subject: [PATCH 1/4] fix: duplicate offer being created on issuers side while
 negotiating offer

Signed-off-by: Krishna Waske <krishna.waske@ayanworks.com>
---
 .../src/modules/credentials/protocol/v2/V2CredentialProtocol.ts  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
index 82b19132cb..8d5c69ee5d 100644
--- a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
+++ b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
@@ -177,7 +177,6 @@ export class V2CredentialProtocol<CFs extends CredentialFormatService[] = Creden
     let credentialRecord = await this.findByProperties(messageContext.agentContext, {
       threadId: proposalMessage.threadId,
       role: CredentialRole.Issuer,
-      connectionId: connection?.id,
     })
 
     const formatServices = this.getFormatServicesFromMessage(proposalMessage.formats)

From 3a8f8f51464c3f755e92bf50e27ce3c732b40330 Mon Sep 17 00:00:00 2001
From: Krishna Waske <krishna.waske@ayanworks.com>
Date: Tue, 3 Sep 2024 11:53:07 +0530
Subject: [PATCH 2/4] fix: negotiating Offer by asserting connectionId and
 association

Signed-off-by: Krishna Waske <krishna.waske@ayanworks.com>
---
 .../protocol/v2/V2CredentialProtocol.ts            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
index 8d5c69ee5d..9e6228f17e 100644
--- a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
+++ b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
@@ -186,6 +186,20 @@ export class V2CredentialProtocol<CFs extends CredentialFormatService[] = Creden
 
     // credential record already exists
     if (credentialRecord) {
+      // Assert
+      await connectionService.assertConnectionOrOutOfBandExchange(messageContext, {
+        expectedConnectionId: credentialRecord.connectionId,
+      })
+
+      //  This makes sure to associate the connectionId
+      if (!credentialRecord?.connectionId) {
+        await connectionService.matchIncomingMessageToRequestMessageInOutOfBandExchange(messageContext, {
+          expectedConnectionId: credentialRecord?.connectionId,
+        })
+
+        credentialRecord.connectionId = connection?.id
+      }
+
       const proposalCredentialMessage = await didCommMessageRepository.findAgentMessage(messageContext.agentContext, {
         associatedRecordId: credentialRecord.id,
         messageClass: V2ProposeCredentialMessage,

From 8dd2310f01b758a619037467d980396180efbde8 Mon Sep 17 00:00:00 2001
From: Krishna Waske <krishna.waske@ayanworks.com>
Date: Tue, 3 Sep 2024 15:07:33 +0530
Subject: [PATCH 3/4] fix: remove duplicate assertion

Signed-off-by: Krishna Waske <krishna.waske@ayanworks.com>
---
 .../modules/credentials/protocol/v2/V2CredentialProtocol.ts  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
index 9e6228f17e..6bfca066ed 100644
--- a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
+++ b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
@@ -186,11 +186,6 @@ export class V2CredentialProtocol<CFs extends CredentialFormatService[] = Creden
 
     // credential record already exists
     if (credentialRecord) {
-      // Assert
-      await connectionService.assertConnectionOrOutOfBandExchange(messageContext, {
-        expectedConnectionId: credentialRecord.connectionId,
-      })
-
       //  This makes sure to associate the connectionId
       if (!credentialRecord?.connectionId) {
         await connectionService.matchIncomingMessageToRequestMessageInOutOfBandExchange(messageContext, {

From 0a4544103ee443180b284dc6ddaca62a229522e2 Mon Sep 17 00:00:00 2001
From: Krishna Waske <krishna.waske@ayanworks.com>
Date: Thu, 5 Sep 2024 12:47:43 +0530
Subject: [PATCH 4/4] chore: fix sequence for connection association

Signed-off-by: Krishna Waske <krishna.waske@ayanworks.com>
---
 .../protocol/v2/V2CredentialProtocol.ts        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
index 6bfca066ed..a3e855cb0f 100644
--- a/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
+++ b/packages/core/src/modules/credentials/protocol/v2/V2CredentialProtocol.ts
@@ -186,15 +186,6 @@ export class V2CredentialProtocol<CFs extends CredentialFormatService[] = Creden
 
     // credential record already exists
     if (credentialRecord) {
-      //  This makes sure to associate the connectionId
-      if (!credentialRecord?.connectionId) {
-        await connectionService.matchIncomingMessageToRequestMessageInOutOfBandExchange(messageContext, {
-          expectedConnectionId: credentialRecord?.connectionId,
-        })
-
-        credentialRecord.connectionId = connection?.id
-      }
-
       const proposalCredentialMessage = await didCommMessageRepository.findAgentMessage(messageContext.agentContext, {
         associatedRecordId: credentialRecord.id,
         messageClass: V2ProposeCredentialMessage,
@@ -215,6 +206,15 @@ export class V2CredentialProtocol<CFs extends CredentialFormatService[] = Creden
         expectedConnectionId: credentialRecord.connectionId,
       })
 
+      // This makes sure that the sender of the incoming message is authorized to do so.
+      if (!credentialRecord?.connectionId) {
+        await connectionService.matchIncomingMessageToRequestMessageInOutOfBandExchange(messageContext, {
+          expectedConnectionId: credentialRecord?.connectionId,
+        })
+
+        credentialRecord.connectionId = connection?.id
+      }
+
       await this.credentialFormatCoordinator.processProposal(messageContext.agentContext, {
         credentialRecord,
         formatServices,