WithoutURL must also copy DecodedID (#78)

nuts-foundation · Jul 25, 2023 · bfa0515 · bfa0515
1 parent 3f17c03
commit bfa0515
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/did/did.go b/did/did.go
@@ -130,8 +130,9 @@ func (d DID) URI() ssi.URI {
 // WithoutURL returns a copy of the DID without URL parts (fragment, query, path).
 func (d DID) WithoutURL() DID {
 	return DID{
-		Method: d.Method,
-		ID:     d.ID,
+		Method:    d.Method,
+		ID:        d.ID,
+		DecodedID: d.DecodedID,
 	}
 }
 

diff --git a/did/did_test.go b/did/did_test.go
@@ -460,9 +460,16 @@ func TestError(t *testing.T) {
 }
 
 func TestDID_WithoutURL(t *testing.T) {
-	id := MustParseDIDURL("did:example:123/path?key=value#fragment").WithoutURL()
-	assert.Equal(t, "did:example:123", id.String())
-	assert.Empty(t, id.Path)
-	assert.Empty(t, id.Fragment)
-	assert.Empty(t, id.Query)
+	t.Run("with encoded ID", func(t *testing.T) {
+		id := MustParseDIDURL("did:example:123%20/path?key=value#fragment").WithoutURL()
+		assert.Equal(t, "did:example:123%20", id.String())
+		assert.Equal(t, "123 ", id.DecodedID)
+		assert.Empty(t, id.Path)
+		assert.Empty(t, id.Fragment)
+		assert.Empty(t, id.Query)
+	})
+	t.Run("equalness", func(t *testing.T) {
+		id := MustParseDIDURL("did:example:123/path?key=value#fragment").WithoutURL()
+		assert.True(t, MustParseDID("did:example:123").Equals(id))
+	})
 }