@pnpm/network.auth-header 2.0.6 → 2.2.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.
- package/LICENSE +1 -1
- package/lib/getAuthHeadersFromConfig.d.ts +1 -0
- package/lib/getAuthHeadersFromConfig.js +2 -1
- package/lib/getAuthHeadersFromConfig.js.map +1 -1
- package/lib/helpers/removePort.d.ts +3 -1
- package/lib/helpers/removePort.js +1 -3
- package/lib/helpers/removePort.js.map +1 -1
- package/lib/index.d.ts +2 -0
- package/lib/index.js +14 -3
- package/lib/index.js.map +1 -1
- package/package.json +2 -2
package/LICENSE
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
The MIT License (MIT)
|
|
2
2
|
|
|
3
3
|
Copyright (c) 2015-2016 Rico Sta. Cruz and other contributors
|
|
4
|
-
Copyright (c) 2016-
|
|
4
|
+
Copyright (c) 2016-2024 Zoltan Kochan and other contributors
|
|
5
5
|
|
|
6
6
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
of this software and associated documentation files (the "Software"), to deal
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getAuthHeadersFromConfig = void 0;
|
|
6
|
+
exports.loadToken = exports.getAuthHeadersFromConfig = void 0;
|
|
7
7
|
const error_1 = require("@pnpm/error");
|
|
8
8
|
const child_process_1 = require("child_process");
|
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
|
@@ -69,4 +69,5 @@ function loadToken(helperPath, settingName) {
|
|
|
69
69
|
}
|
|
70
70
|
return spawnResult.stdout.toString('utf8').trimEnd();
|
|
71
71
|
}
|
|
72
|
+
exports.loadToken = loadToken;
|
|
72
73
|
//# sourceMappingURL=getAuthHeadersFromConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuthHeadersFromConfig.js","sourceRoot":"","sources":["../src/getAuthHeadersFromConfig.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuC;AACvC,iDAAyC;AACzC,4CAAmB;AACnB,gDAAuB;AACvB,0DAAgC;AAEhC,SAAgB,wBAAwB,CACtC,EAAE,WAAW,EAAE,YAAY,EAG1B;IAED,MAAM,oBAAoB,GAA2B,EAAE,CAAA;IACvD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"getAuthHeadersFromConfig.js","sourceRoot":"","sources":["../src/getAuthHeadersFromConfig.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuC;AACvC,iDAAyC;AACzC,4CAAmB;AACnB,gDAAuB;AACvB,0DAAgC;AAEhC,SAAgB,wBAAwB,CACtC,EAAE,WAAW,EAAE,YAAY,EAG1B;IAED,MAAM,oBAAoB,GAA2B,EAAE,CAAA;IACvD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;QACrC,QAAQ,QAAQ,EAAE,CAAC;YACnB,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,oBAAoB,CAAC,GAAG,CAAC,GAAG,UAAU,KAAK,EAAE,CAAA;gBAC7C,SAAQ;YACV,CAAC;YACD,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,oBAAoB,CAAC,GAAG,CAAC,GAAG,SAAS,KAAK,EAAE,CAAA;gBAC5C,SAAQ;YACV,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,IAAI,GAAG,GAAG,YAAY,IAAI,WAAW,EAAE,CAAC;oBACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,GAAG,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;oBACxF,oBAAoB,CAAC,GAAG,CAAC,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAA;gBAC/F,CAAC;YACH,CAAC;QACD,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACxD,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;QACrC,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC/B,oBAAoB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAA;IACtG,IAAI,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;QAChC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAA;IACxF,CAAC;SAAM,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QACrC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,UAAU,WAAW,CAAC,YAAY,CAAC,EAAE,CAAA;IACxE,CAAC;SAAM,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE,CAAA;IAClE,CAAC;SAAM,IAAI,WAAW,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,oBAAoB,CAAC,QAAQ,CAAC,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAA;IACtI,CAAC;IACD,OAAO,oBAAoB,CAAA;AAC7B,CAAC;AA3CD,4DA2CC;AAED,SAAS,QAAQ,CAAE,GAAW;IAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IAClC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAA;AACpD,CAAC;AAED,SAAgB,SAAS,CAAE,UAAkB,EAAE,WAAmB;IAChE,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,iBAAS,CAAC,uBAAuB,EAAE,GAAG,WAAW,8CAA8C,CAAC,CAAA;IAC5G,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,yBAAS,EAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAE1D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,iBAAS,CAAC,2BAA2B,EAAE,kBAAkB,UAAU,sCAAsC,WAAW,eAAe,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACtL,CAAC;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;AACtD,CAAC;AAXD,8BAWC"}
|
|
@@ -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.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createGetAuthHeaderByURI = void 0;
|
|
6
|
+
exports.createGetAuthHeaderByURI = exports.loadToken = void 0;
|
|
7
7
|
const nerf_dart_1 = __importDefault(require("nerf-dart"));
|
|
8
8
|
const getAuthHeadersFromConfig_1 = require("./getAuthHeadersFromConfig");
|
|
9
|
+
Object.defineProperty(exports, "loadToken", { enumerable: true, get: function () { return getAuthHeadersFromConfig_1.loadToken; } });
|
|
9
10
|
const removePort_1 = require("./helpers/removePort");
|
|
10
11
|
function createGetAuthHeaderByURI(opts) {
|
|
11
12
|
const authHeaders = (0, getAuthHeadersFromConfig_1.getAuthHeadersFromConfig)({
|
|
@@ -13,7 +14,7 @@ function createGetAuthHeaderByURI(opts) {
|
|
|
13
14
|
userSettings: opts.userSettings ?? {},
|
|
14
15
|
});
|
|
15
16
|
if (Object.keys(authHeaders).length === 0)
|
|
16
|
-
return () =>
|
|
17
|
+
return (uri) => basicAuth(new URL(uri));
|
|
17
18
|
return getAuthHeaderByURI.bind(null, authHeaders, getMaxParts(Object.keys(authHeaders)));
|
|
18
19
|
}
|
|
19
20
|
exports.createGetAuthHeaderByURI = createGetAuthHeaderByURI;
|
|
@@ -27,6 +28,10 @@ function getAuthHeaderByURI(authHeaders, maxParts, uri) {
|
|
|
27
28
|
if (!uri.endsWith('/')) {
|
|
28
29
|
uri += '/';
|
|
29
30
|
}
|
|
31
|
+
const parsedUri = new URL(uri);
|
|
32
|
+
const basic = basicAuth(parsedUri);
|
|
33
|
+
if (basic)
|
|
34
|
+
return basic;
|
|
30
35
|
const nerfed = (0, nerf_dart_1.default)(uri);
|
|
31
36
|
const parts = nerfed.split('/');
|
|
32
37
|
for (let i = Math.min(parts.length, maxParts) - 1; i >= 3; i--) {
|
|
@@ -34,10 +39,16 @@ function getAuthHeaderByURI(authHeaders, maxParts, uri) {
|
|
|
34
39
|
if (authHeaders[key])
|
|
35
40
|
return authHeaders[key];
|
|
36
41
|
}
|
|
37
|
-
const urlWithoutPort = (0, removePort_1.removePort)(
|
|
42
|
+
const urlWithoutPort = (0, removePort_1.removePort)(parsedUri);
|
|
38
43
|
if (urlWithoutPort !== uri) {
|
|
39
44
|
return getAuthHeaderByURI(authHeaders, maxParts, urlWithoutPort);
|
|
40
45
|
}
|
|
41
46
|
return undefined;
|
|
42
47
|
}
|
|
48
|
+
function basicAuth(uri) {
|
|
49
|
+
if (!uri.username && !uri.password)
|
|
50
|
+
return undefined;
|
|
51
|
+
const auth64 = btoa(`${uri.username}:${uri.password}`);
|
|
52
|
+
return `Basic ${auth64}`;
|
|
53
|
+
}
|
|
43
54
|
//# 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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,yEAAgF;AAI9E,0FAJiC,oCAAS,OAIjC;AAHX,qDAAiD;AAMjD,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,CAAC;QACvB,GAAG,IAAI,GAAG,CAAA;IACZ,CAAC;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,CAAC;QAC/D,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;IAC/C,CAAC;IACD,MAAM,cAAc,GAAG,IAAA,uBAAU,EAAC,SAAS,CAAC,CAAA;IAC5C,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;QAC3B,OAAO,kBAAkB,CAAC,WAAW,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAA;IAClE,CAAC;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.2.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.2.0"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"nerf-dart": "1.0.0",
|