@interop/did-web-resolver 2.2.0 → 3.0.0

package/dist/DidWebResolver.js

@@ -8,6 +8,7 @@ var ed25519Context = require('ed25519-signature-2020-context');
 var x25519Context = require('x25519-key-agreement-2020-context');
 var didContext = require('did-context');
 var bnid = require('@digitalcredentials/bnid');
+var whatwgUrl = require('whatwg-url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -54,7 +55,7 @@ function didFromUrl ({ url } = {}) {
 
   let parsedUrl;
   try {
-    parsedUrl = new URL(url);
+    parsedUrl = new whatwgUrl.URL(url);
   } catch (error) {
     throw new TypeError(`Invalid url: "${url}".`)
   }
@@ -82,22 +83,25 @@ function urlFromDid ({ did } = {}) {
   // const [didResource, query] = didUrl.split('?')
 
   // eslint-disable-next-line no-unused-vars
-  const [_did, _web, urlNoProtocol] = didUrl.split(':');
+  const [_did, _web, urlNoProtocol, ...pathFragments] = didUrl.split(':');
+
+  if (urlNoProtocol.includes('/')) {
+    throw new TypeError(`Cannot construct url from did: "${did}". domain-name cannot contain a path.`)
+  }
 
   let parsedUrl;
   try {
     // URI-decode the url (in case it contained a port number,
     // for example, `did:web:localhost%3A8080`
-    parsedUrl = new URL('https://' + decodeURIComponent(urlNoProtocol));
+    parsedUrl = new whatwgUrl.URL('https://' + decodeURIComponent(urlNoProtocol));
   } catch (error) {
     throw new TypeError(`Cannot construct url from did: "${did}".`)
   }
 
-  if (!parsedUrl.pathname || parsedUrl.pathname === '/') {
+  if (pathFragments.length === 0) {
     parsedUrl.pathname = '/.well-known/did.json';
   } else {
-    const pathFragments = parsedUrl.pathname.split('/');
-    parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/');
+    parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/') + '/did.json';
   }
 
   if (hashFragment) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@interop/did-web-resolver",
   "description": "A did:web method Decentralized Identifier (DID) resolver for the did-io library.",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "author": {
     "name": "Dmitri Zagidulin",
     "url": "https://github.com/dmitrizagidulin/"
@@ -48,6 +48,7 @@
     "@digitalcredentials/http-client": "^1.2.2",
     "did-context": "^3.1.1",
     "ed25519-signature-2020-context": "^1.1.0",
+    "whatwg-url": "^11.0.0",
     "x25519-key-agreement-2020-context": "^1.0.0"
   },
   "devDependencies": {

package/src/DidWebResolver.js

@@ -4,6 +4,7 @@ import ed25519Context from 'ed25519-signature-2020-context'
 import x25519Context from 'x25519-key-agreement-2020-context'
 import didContext from 'did-context'
 import { decodeSecretKeySeed } from '@digitalcredentials/bnid'
+import { URL } from 'whatwg-url'
 
 const { VERIFICATION_RELATIONSHIPS } = didIo
 
@@ -53,7 +54,11 @@ export function urlFromDid ({ did } = {}) {
   // const [didResource, query] = didUrl.split('?')
 
   // eslint-disable-next-line no-unused-vars
-  const [_did, _web, urlNoProtocol] = didUrl.split(':')
+  const [_did, _web, urlNoProtocol, ...pathFragments] = didUrl.split(':')
+
+  if (urlNoProtocol.includes('/')) {
+    throw new TypeError(`Cannot construct url from did: "${did}". domain-name cannot contain a path.`)
+  }
 
   let parsedUrl
   try {
@@ -64,11 +69,10 @@ export function urlFromDid ({ did } = {}) {
     throw new TypeError(`Cannot construct url from did: "${did}".`)
   }
 
-  if (!parsedUrl.pathname || parsedUrl.pathname === '/') {
+  if (pathFragments.length === 0) {
     parsedUrl.pathname = '/.well-known/did.json'
   } else {
-    const pathFragments = parsedUrl.pathname.split('/')
-    parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/')
+    parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/') + '/did.json'
   }
 
   if (hashFragment) {