feat: Add BDD test for legacy-connection protocol (edge to edge through controller). Make a few refactoring (#3353)

- Add BDD test for legacy-connection protocol. Edge to edge case is fully implemented. Case through mediator is implemented partially (Only steps are added. Need to add .feature file to run test)
- Make a few refactoring

Signed-off-by: Abdulbois <abdulbois.tursunov@avast.com>

Signed-off-by: Abdulbois <abdulbois.tursunov@avast.com>

Author: Abdulbois

pkg/didcomm/protocol/legacyconnection/service.go

@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/google/uuid"
 
@@ -720,10 +719,6 @@ func (s *Service) requestMsgRecord(msg service.DIDCommMsg, ctx service.DIDCommCo
 		DIDCommVersion:          service.V1,
 	}
 
-	if !strings.HasPrefix(connRecord.TheirDID, "did") {
-		connRecord.TheirDID = "did:peer:" + connRecord.TheirDID
-	}
-
 	if err := s.connectionRecorder.SaveConnectionRecord(connRecord); err != nil {
 		return nil, err
 	}

pkg/didcomm/protocol/legacyconnection/states.go

@@ -375,7 +375,10 @@ func (ctx *context) handleInboundRequest(request *Request, options *options,
 	connRec.MyDID = responseDidDoc.ID
 	connRec.TheirDID = request.Connection.DID
 	connRec.TheirLabel = request.Label
-	connRec.RecipientKeys = destination.RecipientKeys
+
+	if len(responseDidDoc.Service) > 0 {
+		connRec.RecipientKeys = responseDidDoc.Service[0].RecipientKeys
+	}
 
 	accept, err := destination.ServiceEndpoint.Accept()
 	if err != nil {
@@ -605,7 +608,7 @@ func (ctx *context) getMyDIDDoc(pubDID string, routerConnections []string, servi
 }
 
 func (ctx *context) addRouterKeys(doc *did.Doc, routerConnections []string) error {
-	svc, ok := did.LookupService(doc, didCommServiceType)
+	svc, ok := did.LookupService(doc, legacyDIDCommServiceType)
 	if ok {
 		for _, recKey := range svc.RecipientKeys {
 			for _, connID := range routerConnections {

pkg/didcomm/protocol/legacyconnection/states_test.go

@@ -1215,8 +1215,10 @@ func TestGetDIDDocAndConnection(t *testing.T) {
 		require.NoError(t, err)
 		customKMS := newKMS(t, mockstorage.NewMockStoreProvider())
 		ctx := context{
-			kms:                customKMS,
-			vdRegistry:         &mockvdr.MockVDRegistry{CreateValue: mockdiddoc.GetMockDIDDoc(t, false)},
+			kms: customKMS,
+			vdRegistry: &mockvdr.MockVDRegistry{
+				CreateValue: mockdiddoc.GetLegacyInteropMockDIDDoc(t, "1234567abcdefg", []byte("key")),
+			},
 			connectionRecorder: connRec,
 			routeSvc: &mockroute.MockMediatorSvc{
 				Connections: []string{"xyz"},
@@ -1225,7 +1227,7 @@ func TestGetDIDDocAndConnection(t *testing.T) {
 			keyType:          kms.ED25519Type,
 			keyAgreementType: kms.X25519ECDHKWType,
 		}
-		didDoc, err := ctx.getMyDIDDoc("", []string{"xyz"}, didCommServiceType)
+		didDoc, err := ctx.getMyDIDDoc("", []string{"xyz"}, legacyDIDCommServiceType)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "did doc - add key to the router")
 		require.Nil(t, didDoc)

test/bdd/bddtests_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/issuecredential"
 	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/jwt"
 	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/ld"
+	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/legacyconnection"
 	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/mediator"
 	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/messaging"
 	"github.com/hyperledger/aries-framework-go/test/bdd/pkg/outofband"
@@ -219,5 +220,6 @@ func features() []feature {
 		waci.NewIssuanceDIDCommV1SDKSteps(),
 		waci.NewIssuanceDIDCommV2SDKSteps(),
 		walletjsonld.NewSDKSteps(),
+		legacyconnection.NewLegacyConnectionControllerSteps(),
 	}
 }

test/bdd/features/legacyconnection_e2e_controller.feature

@@ -0,0 +1,25 @@
+#
+# Copyright Avast Software. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Reference : https://github.com/hyperledger/aries-rfcs/tree/main/features/0160-connection-protocol
+
+@all
+@controller
+@legacyconnection_e2e_controller
+Feature: Establishing DIDComm V1 using Connection RFC-0160 protocol between the agents using controller API
+
+  Scenario: legacy connection e2e flow using controller api
+    Given "Alice" agent is running on "localhost" port "8081" with controller "https://localhost:8082"
+      And   "Bob" agent is running on "localhost" port "9081" with controller "https://localhost:9082"
+
+    When   "Alice" creates legacy invitation through controller with label "alice-agent"
+      And   "Bob" receives legacy invitation from "Alice" through controller
+      And   "Bob" approves connection invitation through controller
+      And   "Alice" approves connection request through controller
+      And   "Alice" waits for legacy post state event "completed" to web notifier
+      And   "Bob" waits for legacy post state event "completed" to web notifier
+
+    Then   "Alice" retrieves connection record through controller and validates that legacy connection state is "completed"
+      And   "Bob" retrieves connection record through controller and validates that legacy connection state is "completed"