fix: add DIDcommv1 flag

Signed-off-by: Firas Qutishat <[email protected]>

pkg/db/rp/models.go

@@ -18,7 +18,7 @@ type Tenant struct {
 	Scopes               []string
 	RequiresBlindedRoute bool
 	SupportsWACI         bool
-	IsDIDCommV2          bool
+	IsDIDCommV1          bool
 	LinkedWalletURL      string
 }
 

pkg/profile/issuer/profile.go

@@ -51,7 +51,7 @@ type ProfileData struct {
 	IssuerID                    string            `json:"issuerID,omitempty"`
 	CMStyle                     cm.Styles         `json:"styles,omitempty"`
 	PublicDID                   string            `json:"publicDID,omitempty"`
-	IsDIDCommV2                 bool              `json:"isDIDCommV2,omitempty"`
+	IsDIDCommV1                 bool              `json:"isDIDCommV1,omitempty"`
 }
 
 // OIDCClientParams optional set of oidc client parameters that the issuer may set, for static client registration.

pkg/restapi/issuer/operation/models.go

@@ -28,7 +28,7 @@ type ProfileDataRequest struct {
 	OIDCClientParams            *OIDCClientParams `json:"oidcParams,omitempty"`
 	CredentialScopes            []string          `json:"scopes,omitempty"`
 	LinkedWalletURL             string            `json:"linkedWallet,omitempty"`
-	IsDIDCommV2                 bool              `json:"isDIDCommV2,omitempty"`
+	IsDIDCommV1                 bool              `json:"isDIDCommV1,omitempty"`
 	// Issuer ID identifies who is the issuer of the credential manifests being issued.
 	IssuerID string `json:"issuerID,omitempty"`
 	// CMStyle represents an entity styles object as defined in credential manifest spec.

pkg/restapi/issuer/operation/operations.go

@@ -401,10 +401,10 @@ func (o *Operation) createIssuerProfileHandler( // nolint:funlen,gocyclo,cyclop
 
 	var err error
 
-	if data.IsDIDCommV2 {
-		newDidDoc, err = o.publicDIDCreator.CreateV2()
-	} else {
+	if data.IsDIDCommV1 {
 		newDidDoc, err = o.publicDIDCreator.Create()
+	} else {
+		newDidDoc, err = o.publicDIDCreator.CreateV2()
 	}
 
 	if err != nil {
@@ -1063,28 +1063,28 @@ func (o *Operation) createTxn( // nolint:funlen
 ) (string, error) {
 	var invBytes []byte
 
-	if profile.IsDIDCommV2 { // nolint:nestif
-		invitationV2, err := o.oobV2Client.CreateInvitation(
-			outofbandv2.WithFrom(profile.PublicDID),
-			outofbandv2.WithLabel("issuer"),
-			outofbandv2.WithGoal("", oobGoalCode),
-		)
+	if profile.IsDIDCommV1 { // nolint:nestif
+		invitationV1, err := o.oobClient.CreateInvitation(nil, outofband.WithLabel("issuer"),
+			outofband.WithGoal("", oobGoalCode))
 		if err != nil {
 			return "", fmt.Errorf("failed to create invitation : %w", err)
 		}
 
-		invBytes, err = json.Marshal(invitationV2)
+		invBytes, err = json.Marshal(invitationV1)
 		if err != nil {
 			return "", fmt.Errorf("marshal invitation: %w", err)
 		}
 	} else {
-		invitationV1, err := o.oobClient.CreateInvitation(nil, outofband.WithLabel("issuer"),
-			outofband.WithGoal("", oobGoalCode))
+		invitationV2, err := o.oobV2Client.CreateInvitation(
+			outofbandv2.WithFrom(profile.PublicDID),
+			outofbandv2.WithLabel("issuer"),
+			outofbandv2.WithGoal("", oobGoalCode),
+		)
 		if err != nil {
 			return "", fmt.Errorf("failed to create invitation : %w", err)
 		}
 
-		invBytes, err = json.Marshal(invitationV1)
+		invBytes, err = json.Marshal(invitationV2)
 		if err != nil {
 			return "", fmt.Errorf("marshal invitation: %w", err)
 		}
@@ -2302,6 +2302,6 @@ func mapProfileReqToData(data *ProfileDataRequest, didDoc *did.Doc) (*issuer.Pro
 		IssuerID:                    data.IssuerID,
 		CMStyle:                     data.CMStyle,
 		PublicDID:                   didDoc.ID,
-		IsDIDCommV2:                 data.IsDIDCommV2,
+		IsDIDCommV1:                 data.IsDIDCommV1,
 	}, nil
 }

pkg/restapi/issuer/operation/operations_test.go

@@ -571,7 +571,7 @@ func TestCreateProfile(t *testing.T) {
 			SecretExpiry: 0,
 		}
 
-		vReq.IsDIDCommV2 = true
+		vReq.IsDIDCommV1 = false
 
 		vReqBytes, err := json.Marshal(vReq)
 		require.NoError(t, err)
@@ -589,7 +589,7 @@ func TestCreateProfile(t *testing.T) {
 		require.Equal(t, vReq.SupportsAssuranceCredential, profileRes.SupportsAssuranceCredential)
 		require.Equal(t, vReq.IssuerID, profileRes.IssuerID)
 		require.Equal(t, vReq.SupportsWACI, profileRes.SupportsWACI)
-		require.Equal(t, vReq.IsDIDCommV2, profileRes.IsDIDCommV2)
+		require.Equal(t, vReq.IsDIDCommV1, profileRes.IsDIDCommV1)
 	})
 
 	t.Run("create profile - success with default oidc", func(t *testing.T) {
@@ -1311,7 +1311,7 @@ func TestValidateWalletResponse(t *testing.T) {
 
 	data := createProfileData(profileID)
 	data.URL = callbackURL
-	data.IsDIDCommV2 = true
+	data.IsDIDCommV1 = false
 
 	err = c.profileStore.SaveProfile(data)
 	require.NoError(t, err)

pkg/restapi/issuer/operation/support_test.go

@@ -190,6 +190,7 @@ func createProfileData(profileID string) *issuer.ProfileData {
 		PresentationSigningKey:      "did:example:123xyz#key-1",
 		SupportsWACI:                false,
 		IssuerID:                    uuid.New().String(),
+		IsDIDCommV1:                 true,
 	}
 }
 

pkg/restapi/rp/operation/models.go

@@ -40,7 +40,7 @@ type CreateRPTenantRequest struct {
 	RequiresBlindedRoute bool     `json:"requiresBlindedRoute"`
 	SupportsWACI         bool     `json:"supportsWACI"`
 	LinkedWalletURL      string   `json:"linkedWalletURL"`
-	IsDIDCommV2          bool     `json:"isDIDCommV2"`
+	IsDIDCommV1          bool     `json:"isDIDCommV1"`
 }
 
 // CreateRPTenantResponse API response body to register an RP tenant.
@@ -52,7 +52,7 @@ type CreateRPTenantResponse struct {
 	RequiresBlindedRoute bool     `json:"requiresBlindedRoute"`
 	SupportsWACI         bool     `json:"supportsWACI"`
 	LinkedWalletURL      string   `json:"linkedWalletURL"`
-	IsDIDCommV2          bool     `json:"isDIDCommV2"`
+	IsDIDCommV1          bool     `json:"isDIDCommV1"`
 }
 
 // HandleCHAPIResponse is the input message to the chapiResponseHandler handler.