fix holder credential autocorrect credentialsubject.id (#3718)

Author: woutslakhorst

docs/pages/release_notes.rst

@@ -2,6 +2,16 @@
 Release notes
 #############
 
+***************
+Peanut (v6.0.9)
+***************
+
+Release date: 2025-02-26
+
+- `#3696 <https://github.com/nuts-foundation/nuts-node/issues/3696>`_: Fix holder credential usage when a subject has multiple DIDs.
+
+**Full Changelog**: https://github.com/nuts-foundation/nuts-node/compare/v6.0.8...v6.0.9
+
 ***************
 Peanut (v6.0.8)
 ***************

vcr/credential/util.go

@@ -136,6 +136,7 @@ func AutoCorrectSelfAttestedCredential(credential vc.VerifiableCredential, reque
 		}
 		if _, ok := credentialSubject[0]["id"]; !ok {
 			credentialSubject[0]["id"] = requester.String()
+			credential.CredentialSubject = make([]interface{}, 1)
 			credential.CredentialSubject[0] = credentialSubject[0]
 		}
 	}

vcr/credential/util_test.go

@@ -293,11 +293,23 @@ func TestAutoCorrectSelfAttestedCredential(t *testing.T) {
 	credential := vc.VerifiableCredential{
 		CredentialSubject: make([]interface{}, 1),
 	}
+
 	result := AutoCorrectSelfAttestedCredential(credential, requestor)
+
 	assert.Equal(t, requestor.URI(), result.Issuer)
 	assert.NotEqual(t, time.Time{}, result.IssuanceDate)
 	assert.NotEqual(t, "", result.ID.String())
 	assert.Equal(t, requestor.String(), result.CredentialSubject[0].(map[string]interface{})["id"])
+
+	t.Run("autocorrect for multiple DIDs does not skip credentialSubject.id", func(t *testing.T) {
+		altDID := did.MustParseDID("did:test:456")
+		subjectPointer := &credential.CredentialSubject
+
+		result = AutoCorrectSelfAttestedCredential(credential, altDID)
+
+		assert.NotEqual(t, subjectPointer, &result.CredentialSubject)
+		assert.Equal(t, altDID.String(), result.CredentialSubject[0].(map[string]interface{})["id"])
+	})
 }
 
 func TestFilterOnDIDMethod(t *testing.T) {