add support for DIDs that specify a port

CHANGELOG.md

@@ -1,3 +1,17 @@
+# NEXT
+
+## New Features
+
+- Proper handling of did:web identifiers including ports: `did:web:example.com%3A1234`
+
+## Bug Fixes
+
+None
+
+## Breaking Changes
+
+None
+
 # 3.1.1
 
 ## New Features

src/proofPoints.ts

@@ -687,11 +687,13 @@ class ProofPointRegistry {
     const parts = did.split(":");
     if (parts.length === 3) {
       // did:web:<x>
-      return `https://${parts[2]}/.well-known/did.json`;
+      const hostname = decodeURIComponent(parts[2]);
+      return `https://${hostname}/.well-known/did.json`;
     } else {
       // did:web:<a>:<b>:...:<z>
-      const path = parts.slice(2).join("/");
-      return `https://${path}/did.json`;
+      const hostname = decodeURIComponent(parts[2]);
+      const path = parts.slice(3).join("/");
+      return `https://${hostname}/${path}/did.json`;
     }
   }
 

test/proofPoints.js

@@ -54,7 +54,37 @@ contract("ProofPoints", () => {
             "type": "Secp256k1SignatureAuthentication2018",
             "publicKey": "did:web:example.com:subpath#owner"
         }]
-      }`
+      }`,
+      "https://example.com:1234/.well-known/did.json": `
+      {
+        "@context": "https://w3id.org/did/v1",
+        "id": "did:web:example.com%3A1234",
+        "publicKey": [{
+            "id": "did:web:example.com%3A1234#owner",
+            "type": "Secp256k1VerificationKey2018",
+            "owner": "did:web:example.com%3A1234",
+            "ethereumAddress": "${admin}"
+        }],
+        "authentication": [{
+            "type": "Secp256k1SignatureAuthentication2018",
+            "publicKey": "did:web:example.com%3A1234#owner"
+        }]
+      }`,
+      "https://example.com:1234/subpath/did.json": `
+      {
+        "@context": "https://w3id.org/did/v1",
+        "id": "did:web:example.com%3A1234:subpath",
+        "publicKey": [{
+            "id": "did:web:example.com%3A1234:subpath#owner",
+            "type": "Secp256k1VerificationKey2018",
+            "owner": "did:web:example.com%3A1234:subpath",
+            "ethereumAddress": "${admin}"
+        }],
+        "authentication": [{
+            "type": "Secp256k1SignatureAuthentication2018",
+            "publicKey": "did:web:example.com%3A1234:subpath#owner"
+        }]
+      }`,
     });
 
     subject = await ProofPointRegistry.deploy(
@@ -354,6 +384,30 @@ contract("ProofPoints", () => {
     expect(isValid).to.be.true;
   });
 
+  it("did:web issuer port", async () => {
+    const result = await subject.issue(
+      type,
+      "did:web:example.com%3A1234",
+      content
+    );
+    expect(result.proofPointObject.issuer).to.eq("did:web:example.com%3A1234");
+    const { isValid } = await subject.validate(result.proofPointObject);
+    expect(isValid).to.be.true;
+  });
+
+  it("did:web issuer port and subpath", async () => {
+    const result = await subject.issue(
+      type,
+      "did:web:example.com%3A1234:subpath",
+      content
+    );
+    expect(result.proofPointObject.issuer).to.eq(
+      "did:web:example.com%3A1234:subpath"
+    );
+    const { isValid } = await subject.validate(result.proofPointObject);
+    expect(isValid).to.be.true;
+  });
+
   it("did:web issuer wrong context", async () => {
     httpClient._responses["https://example.com/.well-known/did.json"] = `{
       "@context": "wrongContext",