@interop/did-web-resolver 2.2.1 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -83,7 +83,11 @@ function urlFromDid ({ did } = {}) {
83
83
  // const [didResource, query] = didUrl.split('?')
84
84
 
85
85
  // eslint-disable-next-line no-unused-vars
86
- const [_did, _web, urlNoProtocol] = didUrl.split(':');
86
+ const [_did, _web, urlNoProtocol, ...pathFragments] = didUrl.split(':');
87
+
88
+ if (urlNoProtocol.includes('/')) {
89
+ throw new TypeError(`Cannot construct url from did: "${did}". domain-name cannot contain a path.`)
90
+ }
87
91
 
88
92
  let parsedUrl;
89
93
  try {
@@ -94,11 +98,10 @@ function urlFromDid ({ did } = {}) {
94
98
  throw new TypeError(`Cannot construct url from did: "${did}".`)
95
99
  }
96
100
 
97
- if (!parsedUrl.pathname || parsedUrl.pathname === '/') {
101
+ if (pathFragments.length === 0) {
98
102
  parsedUrl.pathname = '/.well-known/did.json';
99
103
  } else {
100
- const pathFragments = parsedUrl.pathname.split('/');
101
- parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/');
104
+ parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/') + '/did.json';
102
105
  }
103
106
 
104
107
  if (hashFragment) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@interop/did-web-resolver",
3
3
  "description": "A did:web method Decentralized Identifier (DID) resolver for the did-io library.",
4
- "version": "2.2.1",
4
+ "version": "3.0.0",
5
5
  "author": {
6
6
  "name": "Dmitri Zagidulin",
7
7
  "url": "https://github.com/dmitrizagidulin/"
@@ -54,7 +54,11 @@ export function urlFromDid ({ did } = {}) {
54
54
  // const [didResource, query] = didUrl.split('?')
55
55
 
56
56
  // eslint-disable-next-line no-unused-vars
57
- const [_did, _web, urlNoProtocol] = didUrl.split(':')
57
+ const [_did, _web, urlNoProtocol, ...pathFragments] = didUrl.split(':')
58
+
59
+ if (urlNoProtocol.includes('/')) {
60
+ throw new TypeError(`Cannot construct url from did: "${did}". domain-name cannot contain a path.`)
61
+ }
58
62
 
59
63
  let parsedUrl
60
64
  try {
@@ -65,11 +69,10 @@ export function urlFromDid ({ did } = {}) {
65
69
  throw new TypeError(`Cannot construct url from did: "${did}".`)
66
70
  }
67
71
 
68
- if (!parsedUrl.pathname || parsedUrl.pathname === '/') {
72
+ if (pathFragments.length === 0) {
69
73
  parsedUrl.pathname = '/.well-known/did.json'
70
74
  } else {
71
- const pathFragments = parsedUrl.pathname.split('/')
72
- parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/')
75
+ parsedUrl.pathname = pathFragments.map(decodeURIComponent).join('/') + '/did.json'
73
76
  }
74
77
 
75
78
  if (hashFragment) {