@pnpm/network.auth-header 2.0.5 → 2.1.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.
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.removePort = void 0;
|
|
4
|
-
|
|
5
|
-
function removePort(originalUrl) {
|
|
6
|
-
const urlObj = new url_1.URL(originalUrl);
|
|
4
|
+
function removePort(urlObj) {
|
|
7
5
|
if (urlObj.port === '')
|
|
8
6
|
return urlObj.href;
|
|
9
7
|
urlObj.port = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removePort.js","sourceRoot":"","sources":["../../src/helpers/removePort.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"removePort.js","sourceRoot":"","sources":["../../src/helpers/removePort.ts"],"names":[],"mappings":";;;AAEA,SAAgB,UAAU,CAAE,MAAW;IACrC,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,IAAI,CAAA;IAC1C,MAAM,CAAC,IAAI,GAAG,EAAE,CAAA;IAChB,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAJD,gCAIC"}
|
package/lib/index.js
CHANGED
|
@@ -13,7 +13,7 @@ function createGetAuthHeaderByURI(opts) {
|
|
|
13
13
|
userSettings: opts.userSettings ?? {},
|
|
14
14
|
});
|
|
15
15
|
if (Object.keys(authHeaders).length === 0)
|
|
16
|
-
return () =>
|
|
16
|
+
return (uri) => basicAuth(new URL(uri));
|
|
17
17
|
return getAuthHeaderByURI.bind(null, authHeaders, getMaxParts(Object.keys(authHeaders)));
|
|
18
18
|
}
|
|
19
19
|
exports.createGetAuthHeaderByURI = createGetAuthHeaderByURI;
|
|
@@ -24,17 +24,30 @@ function getMaxParts(uris) {
|
|
|
24
24
|
}, 0);
|
|
25
25
|
}
|
|
26
26
|
function getAuthHeaderByURI(authHeaders, maxParts, uri) {
|
|
27
|
+
if (!uri.endsWith('/')) {
|
|
28
|
+
uri += '/';
|
|
29
|
+
}
|
|
30
|
+
const parsedUri = new URL(uri);
|
|
31
|
+
const basic = basicAuth(parsedUri);
|
|
32
|
+
if (basic)
|
|
33
|
+
return basic;
|
|
27
34
|
const nerfed = (0, nerf_dart_1.default)(uri);
|
|
28
35
|
const parts = nerfed.split('/');
|
|
29
36
|
for (let i = Math.min(parts.length, maxParts) - 1; i >= 3; i--) {
|
|
30
|
-
const key = `${parts.slice(0, i).join('/')}/`;
|
|
37
|
+
const key = `${parts.slice(0, i).join('/')}/`;
|
|
31
38
|
if (authHeaders[key])
|
|
32
39
|
return authHeaders[key];
|
|
33
40
|
}
|
|
34
|
-
const urlWithoutPort = (0, removePort_1.removePort)(
|
|
41
|
+
const urlWithoutPort = (0, removePort_1.removePort)(parsedUri);
|
|
35
42
|
if (urlWithoutPort !== uri) {
|
|
36
43
|
return getAuthHeaderByURI(authHeaders, maxParts, urlWithoutPort);
|
|
37
44
|
}
|
|
38
45
|
return undefined;
|
|
39
46
|
}
|
|
47
|
+
function basicAuth(uri) {
|
|
48
|
+
if (!uri.username && !uri.password)
|
|
49
|
+
return undefined;
|
|
50
|
+
const auth64 = btoa(`${uri.username}:${uri.password}`);
|
|
51
|
+
return `Basic ${auth64}`;
|
|
52
|
+
}
|
|
40
53
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,yEAAqE;AACrE,qDAAiD;AAEjD,SAAgB,wBAAwB,CACtC,IAGC;IAED,MAAM,WAAW,GAAG,IAAA,mDAAwB,EAAC;QAC3C,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;KACtC,CAAC,CAAA;IACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,yEAAqE;AACrE,qDAAiD;AAEjD,SAAgB,wBAAwB,CACtC,IAGC;IAED,MAAM,WAAW,GAAG,IAAA,mDAAwB,EAAC;QAC3C,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;KACtC,CAAC,CAAA;IACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1F,OAAO,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;AAC1F,CAAC;AAZD,4DAYC;AAED,SAAS,WAAW,CAAE,IAAc;IAClC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;QACnC,OAAO,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;IAClC,CAAC,EAAE,CAAC,CAAC,CAAA;AACP,CAAC;AAED,SAAS,kBAAkB,CAAE,WAAmC,EAAE,QAAgB,EAAE,GAAW;IAC7F,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtB,GAAG,IAAI,GAAG,CAAA;KACX;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;IAClC,IAAI,KAAK;QAAE,OAAO,KAAK,CAAA;IACvB,MAAM,MAAM,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC/B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9D,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;QAC7C,IAAI,WAAW,CAAC,GAAG,CAAC;YAAE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAA;KAC9C;IACD,MAAM,cAAc,GAAG,IAAA,uBAAU,EAAC,SAAS,CAAC,CAAA;IAC5C,IAAI,cAAc,KAAK,GAAG,EAAE;QAC1B,OAAO,kBAAkB,CAAC,WAAW,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAA;KACjE;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,SAAS,CAAE,GAAQ;IAC1B,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAA;IACpD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IACtD,OAAO,SAAS,MAAM,EAAE,CAAA;AAC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/network.auth-header",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Gets the authorization header for the given URI",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/network/auth-header#readme",
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"safe-buffer": "5.2.1",
|
|
27
|
-
"@pnpm/network.auth-header": "2.0
|
|
27
|
+
"@pnpm/network.auth-header": "2.1.0"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"nerf-dart": "1.0.0",
|