ado-npm-auth 0.1.2 → 0.1.3
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/README.md +25 -0
- package/dist/ado-npm-auth.cjs +10632 -1892
- package/lib/.tsbuildinfo +1 -1
- package/lib/{npmrc → ado}/make-ado-request.d.ts +1 -1
- package/lib/ado/make-ado-request.d.ts.map +1 -0
- package/lib/{npmrc → ado}/make-ado-request.js +3 -2
- package/lib/ado/make-ado-request.js.map +1 -0
- package/lib/args.d.ts +7 -0
- package/lib/args.d.ts.map +1 -0
- package/lib/args.js +28 -0
- package/lib/args.js.map +1 -0
- package/lib/azureauth/ado.d.ts.map +1 -1
- package/lib/azureauth/ado.js +3 -7
- package/lib/azureauth/ado.js.map +1 -1
- package/lib/azureauth/azureauth-command.d.ts +6 -3
- package/lib/azureauth/azureauth-command.d.ts.map +1 -1
- package/lib/azureauth/azureauth-command.js +12 -6
- package/lib/azureauth/azureauth-command.js.map +1 -1
- package/lib/azureauth/is-azureauth-installed.d.ts.map +1 -1
- package/lib/azureauth/is-azureauth-installed.js +3 -2
- package/lib/azureauth/is-azureauth-installed.js.map +1 -1
- package/lib/azureauth/is-azureauth-installed.test.js +5 -2
- package/lib/azureauth/is-azureauth-installed.test.js.map +1 -1
- package/lib/cli.d.ts +2 -1
- package/lib/cli.d.ts.map +1 -1
- package/lib/cli.js +58 -11
- package/lib/cli.js.map +1 -1
- package/lib/fileProvider.d.ts +35 -0
- package/lib/fileProvider.d.ts.map +1 -0
- package/lib/fileProvider.js +78 -0
- package/lib/fileProvider.js.map +1 -0
- package/lib/npmrc/generate-npmrc-pat.d.ts.map +1 -1
- package/lib/npmrc/generate-npmrc-pat.js +2 -2
- package/lib/npmrc/generate-npmrc-pat.js.map +1 -1
- package/lib/npmrc/npmrcFileProvider.d.ts +12 -0
- package/lib/npmrc/npmrcFileProvider.d.ts.map +1 -0
- package/lib/npmrc/npmrcFileProvider.js +148 -0
- package/lib/npmrc/npmrcFileProvider.js.map +1 -0
- package/lib/telemetry/index.d.ts.map +1 -1
- package/lib/telemetry/index.js +1 -2
- package/lib/telemetry/index.js.map +1 -1
- package/lib/utils/encoding.d.ts +13 -0
- package/lib/utils/encoding.d.ts.map +1 -0
- package/lib/utils/encoding.js +15 -0
- package/lib/utils/encoding.js.map +1 -0
- package/lib/utils/exec.d.ts +0 -1
- package/lib/utils/exec.d.ts.map +1 -1
- package/lib/utils/get-feed-without-protocol.d.ts +0 -2
- package/lib/utils/get-feed-without-protocol.d.ts.map +1 -1
- package/lib/utils/get-feed-without-protocol.js +0 -2
- package/lib/utils/get-feed-without-protocol.js.map +1 -1
- package/lib/utils/get-feed-without-protocol.test.js.map +1 -1
- package/lib/utils/get-organization-from-feed-url.d.ts.map +1 -1
- package/lib/utils/get-organization-from-feed-url.js +8 -5
- package/lib/utils/get-organization-from-feed-url.js.map +1 -1
- package/lib/utils/get-organization-from-feed-url.test.js +1 -1
- package/lib/utils/get-organization-from-feed-url.test.js.map +1 -1
- package/lib/utils/partition.d.ts +2 -0
- package/lib/utils/partition.d.ts.map +1 -0
- package/lib/utils/partition.js +15 -0
- package/lib/utils/partition.js.map +1 -0
- package/lib/utils/request.d.ts +0 -1
- package/lib/utils/request.d.ts.map +1 -1
- package/lib/utils/request.js +10 -2
- package/lib/utils/request.js.map +1 -1
- package/lib/yarnrc/yarnrcFileProvider.d.ts +29 -0
- package/lib/yarnrc/yarnrcFileProvider.d.ts.map +1 -0
- package/lib/yarnrc/yarnrcFileProvider.js +81 -0
- package/lib/yarnrc/yarnrcFileProvider.js.map +1 -0
- package/package.json +14 -8
- package/dist/ado-auto-auth.cjs +0 -39047
- package/lib/npmrc/base64.d.ts +0 -7
- package/lib/npmrc/base64.d.ts.map +0 -1
- package/lib/npmrc/base64.js +0 -7
- package/lib/npmrc/base64.js.map +0 -1
- package/lib/npmrc/check-tokens.d.ts +0 -11
- package/lib/npmrc/check-tokens.d.ts.map +0 -1
- package/lib/npmrc/check-tokens.js +0 -31
- package/lib/npmrc/check-tokens.js.map +0 -1
- package/lib/npmrc/get-repo-npmrc-ado-orgs.d.ts +0 -12
- package/lib/npmrc/get-repo-npmrc-ado-orgs.d.ts.map +0 -1
- package/lib/npmrc/get-repo-npmrc-ado-orgs.js +0 -49
- package/lib/npmrc/get-repo-npmrc-ado-orgs.js.map +0 -1
- package/lib/npmrc/get-user-pat.d.ts +0 -14
- package/lib/npmrc/get-user-pat.d.ts.map +0 -1
- package/lib/npmrc/get-user-pat.js +0 -33
- package/lib/npmrc/get-user-pat.js.map +0 -1
- package/lib/npmrc/is-valid-pat.d.ts +0 -2
- package/lib/npmrc/is-valid-pat.d.ts.map +0 -1
- package/lib/npmrc/is-valid-pat.js +0 -59
- package/lib/npmrc/is-valid-pat.js.map +0 -1
- package/lib/npmrc/make-ado-request.d.ts.map +0 -1
- package/lib/npmrc/make-ado-request.js.map +0 -1
- package/lib/npmrc/npmrc.d.ts +0 -15
- package/lib/npmrc/npmrc.d.ts.map +0 -1
- package/lib/npmrc/npmrc.js +0 -22
- package/lib/npmrc/npmrc.js.map +0 -1
- package/lib/npmrc/pat.d.ts +0 -13
- package/lib/npmrc/pat.d.ts.map +0 -1
- package/lib/npmrc/pat.js +0 -32
- package/lib/npmrc/pat.js.map +0 -1
- package/lib/npmrc/set-npmrc-pat.d.ts +0 -16
- package/lib/npmrc/set-npmrc-pat.d.ts.map +0 -1
- package/lib/npmrc/set-npmrc-pat.js +0 -109
- package/lib/npmrc/set-npmrc-pat.js.map +0 -1
|
@@ -3,11 +3,7 @@ let memo = undefined;
|
|
|
3
3
|
export const clearMemo = () => {
|
|
4
4
|
memo = void 0;
|
|
5
5
|
};
|
|
6
|
-
|
|
7
|
-
* Get the executable path of azureauth command
|
|
8
|
-
* @returns { string } the string of the executable command to run azureauth
|
|
9
|
-
*/
|
|
10
|
-
export const npxAzureAuthCommand = [
|
|
6
|
+
const npxAzureAuthCommand = [
|
|
11
7
|
"npm",
|
|
12
8
|
"exec",
|
|
13
9
|
"--silent",
|
|
@@ -15,10 +11,20 @@ export const npxAzureAuthCommand = [
|
|
|
15
11
|
"azureauth",
|
|
16
12
|
"--",
|
|
17
13
|
];
|
|
14
|
+
const npxEnv = {
|
|
15
|
+
...process.env,
|
|
16
|
+
// Use the version from the public registry to avoid a cycle
|
|
17
|
+
npm_config_registry: "https://registry.npmjs.org",
|
|
18
|
+
};
|
|
19
|
+
/**
|
|
20
|
+
* Get the executable path of azureauth command
|
|
21
|
+
* @returns the string of the executable command to run azureauth, and any
|
|
22
|
+
* necessary environment variables if using npx
|
|
23
|
+
*/
|
|
18
24
|
export const azureAuthCommand = () => {
|
|
19
25
|
if (!memo) {
|
|
20
26
|
memo = isWsl() ? ["azureauth.exe"] : npxAzureAuthCommand;
|
|
21
27
|
}
|
|
22
|
-
return memo;
|
|
28
|
+
return { command: memo, env: npxEnv };
|
|
23
29
|
};
|
|
24
30
|
//# sourceMappingURL=azureauth-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureauth-command.js","sourceRoot":"","sources":["../../src/azureauth/azureauth-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,IAAI,IAAI,GAAyB,SAAS,CAAC;AAE3C,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE;IAC5B,IAAI,GAAG,KAAK,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"azureauth-command.js","sourceRoot":"","sources":["../../src/azureauth/azureauth-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,IAAI,IAAI,GAAyB,SAAS,CAAC;AAE3C,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE;IAC5B,IAAI,GAAG,KAAK,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAa;IACpC,KAAK;IACL,MAAM;IACN,UAAU;IACV,OAAO;IACP,WAAW;IACX,IAAI;CACL,CAAC;AACF,MAAM,MAAM,GAAG;IACb,GAAG,OAAO,CAAC,GAAG;IACd,4DAA4D;IAC5D,mBAAmB,EAAE,4BAA4B;CAClD,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAG9B,EAAE;IACF,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3D,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;AACxC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-azureauth-installed.d.ts","sourceRoot":"","sources":["../../src/azureauth/is-azureauth-installed.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS,YAErB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAAa,
|
|
1
|
+
{"version":3,"file":"is-azureauth-installed.d.ts","sourceRoot":"","sources":["../../src/azureauth/is-azureauth-installed.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS,YAErB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAAa,OAAO,CAAC,OAAO,CAiB5D,CAAC"}
|
|
@@ -10,9 +10,10 @@ export const clearMemo = () => {
|
|
|
10
10
|
*/
|
|
11
11
|
export const isAzureAuthInstalled = async () => {
|
|
12
12
|
if (memo === undefined) {
|
|
13
|
-
const command =
|
|
13
|
+
const { command: authCommand, env } = azureAuthCommand();
|
|
14
|
+
const command = `${authCommand.join(" ")} --version`;
|
|
14
15
|
try {
|
|
15
|
-
const result = await exec(command);
|
|
16
|
+
const result = await exec(command, { env });
|
|
16
17
|
// version must be >=0.8.0.0
|
|
17
18
|
const [, minor] = result.stdout.split(".");
|
|
18
19
|
memo = parseInt(minor) >= 8;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-azureauth-installed.js","sourceRoot":"","sources":["../../src/azureauth/is-azureauth-installed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,IAAI,IAAI,GAAwB,SAAS,CAAC;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE;IAC5B,IAAI,GAAG,KAAK,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,IAAsB,EAAE;IAC/D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,gBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"is-azureauth-installed.js","sourceRoot":"","sources":["../../src/azureauth/is-azureauth-installed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,IAAI,IAAI,GAAwB,SAAS,CAAC;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE;IAC5B,IAAI,GAAG,KAAK,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,IAAsB,EAAE;IAC/D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,gBAAgB,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC;QAErD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAC5C,4BAA4B;YAC5B,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,0BAA0B;YAC1B,IAAI,GAAG,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -8,12 +8,13 @@ vi.mock("../utils/is-wsl.js", async () => {
|
|
|
8
8
|
isWsl: vi.fn(),
|
|
9
9
|
};
|
|
10
10
|
});
|
|
11
|
-
vi.mock(
|
|
11
|
+
vi.mock("../utils/exec.js", async () => {
|
|
12
12
|
return {
|
|
13
13
|
exec: vi.fn(),
|
|
14
14
|
};
|
|
15
15
|
});
|
|
16
16
|
beforeEach(() => {
|
|
17
|
+
vi.clearAllMocks();
|
|
17
18
|
clearAuthMemo();
|
|
18
19
|
clearMemo();
|
|
19
20
|
});
|
|
@@ -45,7 +46,9 @@ test("when azure auth is installed on windows", async () => {
|
|
|
45
46
|
vi.mocked(utils.isWsl).mockReturnValue(true);
|
|
46
47
|
const azureAuthInstalled = await isAzureAuthInstalled();
|
|
47
48
|
expect(vi.mocked(exec)).toBeCalled();
|
|
48
|
-
expect(vi.mocked(exec)).toBeCalledWith("azureauth.exe --version"
|
|
49
|
+
expect(vi.mocked(exec)).toBeCalledWith("azureauth.exe --version", {
|
|
50
|
+
env: expect.any(Object),
|
|
51
|
+
});
|
|
49
52
|
expect(azureAuthInstalled).toBe(true);
|
|
50
53
|
});
|
|
51
54
|
//# sourceMappingURL=is-azureauth-installed.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-azureauth-installed.test.js","sourceRoot":"","sources":["../../src/azureauth/is-azureauth-installed.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAE5C,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IACvC,OAAO;QACL,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;KACf,
|
|
1
|
+
{"version":3,"file":"is-azureauth-installed.test.js","sourceRoot":"","sources":["../../src/azureauth/is-azureauth-installed.test.ts"],"names":[],"mappings":"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"}
|
package/lib/cli.d.ts
CHANGED
package/lib/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAa,MAAM,WAAW,CAAC;AAO5C,eAAO,MAAM,GAAG,SAAgB,IAAI,KAAG,OAAO,CAAC,IAAI,GAAG,OAAO,CA8F5D,CAAC"}
|
package/lib/cli.js
CHANGED
|
@@ -2,22 +2,68 @@ import { isSupportedPlatformAndArchitecture } from "./azureauth/is-supported-pla
|
|
|
2
2
|
import { isCodespaces } from "./utils/is-codespaces.js";
|
|
3
3
|
import { logTelemetry } from "./telemetry/index.js";
|
|
4
4
|
import { arch, platform } from "os";
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
import { parseArgs } from "./args.js";
|
|
6
|
+
import { NpmrcFileProvider } from "./npmrc/npmrcFileProvider.js";
|
|
7
|
+
import { defaultEmail, defaultUser } from "./fileProvider.js";
|
|
8
|
+
import { generateNpmrcPat } from "./npmrc/generate-npmrc-pat.js";
|
|
9
|
+
import { partition } from "./utils/partition.js";
|
|
10
|
+
import { YarnRcFileProvider } from "./yarnrc/yarnrcFileProvider.js";
|
|
11
|
+
export const run = async (args) => {
|
|
12
|
+
const fileProviders = [
|
|
13
|
+
new NpmrcFileProvider(args.configFile),
|
|
14
|
+
new YarnRcFileProvider(args.configFile),
|
|
15
|
+
];
|
|
16
|
+
const validatedFeeds = [];
|
|
17
|
+
if (args.doValidCheck || args.skipAuth) {
|
|
18
|
+
for (const fileProvider of fileProviders) {
|
|
19
|
+
if (await fileProvider.isSupportedInRepo()) {
|
|
20
|
+
validatedFeeds.push(...(await fileProvider.validateAllUsedFeeds()));
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
const invalidFeeds = validatedFeeds.filter((feed) => !feed.isValid);
|
|
25
|
+
const invalidFeedCount = invalidFeeds.length;
|
|
26
|
+
if (args.doValidCheck && invalidFeedCount == 0) {
|
|
11
27
|
return null;
|
|
12
28
|
}
|
|
13
|
-
if (skipAuth &&
|
|
14
|
-
logTelemetry({ success: false, automaticSuccess: false, error: "invalid token" }, true);
|
|
15
|
-
console.log(
|
|
29
|
+
if (args.skipAuth && invalidFeedCount != 0) {
|
|
30
|
+
logTelemetry({ success: false, automaticSuccess: false, error: "invalid token(s)" }, true);
|
|
31
|
+
console.log(invalidFeedCount == 1
|
|
32
|
+
? "❌ Your token is invalid."
|
|
33
|
+
: `❌ ${invalidFeedCount} tokens are invalid.`);
|
|
16
34
|
return false;
|
|
17
35
|
}
|
|
18
36
|
try {
|
|
19
37
|
console.log("🔑 Authenticating to package feed...");
|
|
20
|
-
|
|
38
|
+
const adoOrgs = new Set();
|
|
39
|
+
for (const adoOrg of invalidFeeds.map((feed) => feed.feed.adoOrganization)) {
|
|
40
|
+
adoOrgs.add(adoOrg);
|
|
41
|
+
}
|
|
42
|
+
// get a token for each feed
|
|
43
|
+
const organizationPatMap = {};
|
|
44
|
+
for (const adoOrg of adoOrgs) {
|
|
45
|
+
organizationPatMap[adoOrg] = await generateNpmrcPat(adoOrg, false);
|
|
46
|
+
}
|
|
47
|
+
// Update the pat in the invalid feeds.
|
|
48
|
+
for (const invalidFeed of invalidFeeds) {
|
|
49
|
+
const feed = invalidFeed.feed;
|
|
50
|
+
const authToken = organizationPatMap[feed.adoOrganization];
|
|
51
|
+
if (!authToken) {
|
|
52
|
+
console.log(`❌ Failed to obtain pat for ${feed.registry} via ${invalidFeed.fileProvider.id}`);
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
feed.authToken = authToken;
|
|
56
|
+
if (!feed.email) {
|
|
57
|
+
feed.email = defaultEmail;
|
|
58
|
+
}
|
|
59
|
+
if (!feed.userName) {
|
|
60
|
+
feed.userName = defaultUser;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
const invalidFeedsByProvider = partition(invalidFeeds, (feed) => feed.fileProvider);
|
|
64
|
+
for (const [fileProvider, updatedFeeds] of invalidFeedsByProvider) {
|
|
65
|
+
await fileProvider.writeWorspaceRegistries(updatedFeeds.map((updatedFeed) => updatedFeed.feed));
|
|
66
|
+
}
|
|
21
67
|
return true;
|
|
22
68
|
}
|
|
23
69
|
catch (error) {
|
|
@@ -40,7 +86,8 @@ if (!isSupportedPlatformAndArchitecture()) {
|
|
|
40
86
|
logTelemetry({ success: false, error: errorMessage }, true);
|
|
41
87
|
process.exit(0);
|
|
42
88
|
}
|
|
43
|
-
const
|
|
89
|
+
const args = parseArgs(process.argv);
|
|
90
|
+
const result = await run(args);
|
|
44
91
|
if (result === null) {
|
|
45
92
|
// current auth is valid, do nothing
|
|
46
93
|
logTelemetry({ success: true });
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,uDAAuD,CAAC;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,uDAAuD,CAAC;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAQ,SAAS,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,IAAU,EAA2B,EAAE;IAC/D,MAAM,aAAa,GAAG;QACpB,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC;KACxC,CAAC;IAEF,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,IAAI,MAAM,YAAY,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBAC3C,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpE,MAAM,gBAAgB,GAAG,YAAY,CAAC,MAAM,CAAC;IAE7C,IAAI,IAAI,CAAC,YAAY,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;QAC3C,YAAY,CACV,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,EACtE,IAAI,CACL,CAAC;QACF,OAAO,CAAC,GAAG,CACT,gBAAgB,IAAI,CAAC;YACnB,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,KAAK,gBAAgB,sBAAsB,CAChD,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QAEpD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,GAAG,CACnC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CACpC,EAAE,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAED,4BAA4B;QAC5B,MAAM,kBAAkB,GAA2B,EAAE,CAAC;QACtD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,kBAAkB,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrE,CAAC;QAED,uCAAuC;QACvC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;YAE9B,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC3D,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CACT,8BAA8B,IAAI,CAAC,QAAQ,QAAQ,WAAW,CAAC,YAAY,CAAC,EAAE,EAAE,CACjF,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YAC5B,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,MAAM,sBAAsB,GAAG,SAAS,CACtC,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAC5B,CAAC;QACF,KAAK,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,sBAAsB,EAAE,CAAC;YAClE,MAAM,YAAY,CAAC,uBAAuB,CACxC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CACpD,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,YAAY,CACV;YACE,OAAO,EAAE,KAAK;YACd,gBAAgB,EAAE,KAAK;YACvB,KAAK,EAAG,KAAe,CAAC,OAAO;SAChC,EACD,IAAI,CACL,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,IAAI,YAAY,EAAE,EAAE,CAAC;IACnB,2BAA2B;IAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,IAAI,CAAC,kCAAkC,EAAE,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAG,YAAY,QAAQ,EAAE,qBAAqB,IAAI,EAAE,8CAA8C,CAAC;IACrH,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAErC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;AAE/B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;IACpB,oCAAoC;IACpC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;AACnD,CAAC;KAAM,IAAI,MAAM,EAAE,CAAC;IAClB,+BAA+B;IAC/B,oBAAoB;IACpB,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;AACvD,CAAC;KAAM,CAAC;IACN,0CAA0C;IAC1C,yCAAyC;IACzC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IAExD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Default user to be used in the .npmrc
|
|
3
|
+
*/
|
|
4
|
+
export declare const defaultUser = "me";
|
|
5
|
+
/**
|
|
6
|
+
* Default email to be used in the .npmrc
|
|
7
|
+
*/
|
|
8
|
+
export declare const defaultEmail = "me@example.com";
|
|
9
|
+
export interface Feed {
|
|
10
|
+
registry: string;
|
|
11
|
+
adoOrganization: string;
|
|
12
|
+
userName?: string;
|
|
13
|
+
email?: string;
|
|
14
|
+
authToken?: string;
|
|
15
|
+
}
|
|
16
|
+
export type ValidatedFeed = {
|
|
17
|
+
feed: Feed;
|
|
18
|
+
isValid: boolean;
|
|
19
|
+
fileProvider: FileProvider;
|
|
20
|
+
};
|
|
21
|
+
export declare abstract class FileProvider {
|
|
22
|
+
id: string;
|
|
23
|
+
workspaceFileName: string;
|
|
24
|
+
workspaceFilePath: string;
|
|
25
|
+
userFilePath: string;
|
|
26
|
+
feeds: Map<string, Feed>;
|
|
27
|
+
constructor(id: string, workspaceFileName: string, configFile?: string);
|
|
28
|
+
isSupportedInRepo(): Promise<boolean>;
|
|
29
|
+
validateAllUsedFeeds(): Promise<ValidatedFeed[]>;
|
|
30
|
+
abstract prepUserFile(): Promise<void>;
|
|
31
|
+
abstract getUserFeeds(): Promise<Map<string, Feed>>;
|
|
32
|
+
abstract getWorkspaceRegistries(): Promise<string[]>;
|
|
33
|
+
abstract writeWorspaceRegistries(feedsToPatch: Iterable<Feed>): Promise<void>;
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=fileProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fileProvider.d.ts","sourceRoot":"","sources":["../src/fileProvider.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,eAAO,MAAM,WAAW,OAAO,CAAC;AAEhC;;GAEG;AACH,eAAO,MAAM,YAAY,mBAAmB,CAAC;AAE7C,MAAM,WAAW,IAAI;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,8BAAsB,YAAY;IAOvB,EAAE,EAAE,MAAM;IACV,iBAAiB,EAAE,MAAM;IAP3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IAErB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,iBAAiB,EAAE,MAAM,EAChC,UAAU,CAAC,EAAE,MAAM;IAiBR,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAuC7D,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IACtC,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnD,QAAQ,CAAC,sBAAsB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IACpD,QAAQ,CAAC,uBAAuB,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9E"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { getWorkspaceRoot } from "workspace-tools";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import fs from "node:fs/promises";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { homedir } from "node:os";
|
|
6
|
+
import { getOrganizationFromFeedUrl } from "./utils/get-organization-from-feed-url.js";
|
|
7
|
+
import { makeADORequest } from "./ado/make-ado-request.js";
|
|
8
|
+
/**
|
|
9
|
+
* Default user to be used in the .npmrc
|
|
10
|
+
*/
|
|
11
|
+
export const defaultUser = "me";
|
|
12
|
+
/**
|
|
13
|
+
* Default email to be used in the .npmrc
|
|
14
|
+
*/
|
|
15
|
+
export const defaultEmail = "me@example.com";
|
|
16
|
+
export class FileProvider {
|
|
17
|
+
constructor(id, workspaceFileName, configFile) {
|
|
18
|
+
this.id = id;
|
|
19
|
+
this.workspaceFileName = workspaceFileName;
|
|
20
|
+
let workspaceFilePath = undefined;
|
|
21
|
+
if (configFile && path.basename(configFile) === this.workspaceFileName) {
|
|
22
|
+
workspaceFilePath = path.resolve(configFile);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
const workspaceRoot = getWorkspaceRoot(process.cwd()) || "";
|
|
26
|
+
workspaceFilePath = join(workspaceRoot, this.workspaceFileName);
|
|
27
|
+
}
|
|
28
|
+
this.workspaceFilePath = workspaceFilePath;
|
|
29
|
+
const userHome = process.env["HOME"] || process.env["USERPROFILE"] || homedir() || "";
|
|
30
|
+
this.userFilePath = join(userHome, workspaceFileName);
|
|
31
|
+
this.feeds = new Map();
|
|
32
|
+
}
|
|
33
|
+
async isSupportedInRepo() {
|
|
34
|
+
try {
|
|
35
|
+
await fs.access(this.workspaceFilePath);
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
async validateAllUsedFeeds() {
|
|
43
|
+
await this.prepUserFile();
|
|
44
|
+
const result = [];
|
|
45
|
+
const workspaceRegistries = await this.getWorkspaceRegistries();
|
|
46
|
+
const userFeeds = await this.getUserFeeds();
|
|
47
|
+
// check each feed for validity
|
|
48
|
+
for (const registry of workspaceRegistries) {
|
|
49
|
+
const feed = userFeeds.get(registry);
|
|
50
|
+
if (feed) {
|
|
51
|
+
let feedIsValid = true;
|
|
52
|
+
try {
|
|
53
|
+
await makeADORequest({
|
|
54
|
+
password: feed.authToken || "",
|
|
55
|
+
organization: feed.adoOrganization,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
catch (e) {
|
|
59
|
+
feedIsValid = false;
|
|
60
|
+
}
|
|
61
|
+
result.push({ feed: feed, isValid: feedIsValid, fileProvider: this });
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
// No representation of the token in the users config file.
|
|
65
|
+
result.push({
|
|
66
|
+
feed: {
|
|
67
|
+
registry: registry,
|
|
68
|
+
adoOrganization: getOrganizationFromFeedUrl(registry),
|
|
69
|
+
},
|
|
70
|
+
isValid: false,
|
|
71
|
+
fileProvider: this,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return result;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=fileProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fileProvider.js","sourceRoot":"","sources":["../src/fileProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-npmrc-pat.d.ts","sourceRoot":"","sources":["../../src/npmrc/generate-npmrc-pat.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate-npmrc-pat.d.ts","sourceRoot":"","sources":["../../src/npmrc/generate-npmrc-pat.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,gBAAgB,iBACb,MAAM,uBAEnB,OAAO,CAAC,MAAM,CAkBhB,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { hostname } from "os";
|
|
2
2
|
import { adoPat } from "../azureauth/ado.js";
|
|
3
|
+
import { toBase64 } from "../utils/encoding.js";
|
|
3
4
|
/**
|
|
4
5
|
* Generates a valid ADO PAT, scoped for vso.packaging in the given ado organization, 30 minute timeout
|
|
5
6
|
* @returns { string } a valid ADO PAT
|
|
@@ -16,8 +17,7 @@ export const generateNpmrcPat = async (organization, encode = false) => {
|
|
|
16
17
|
});
|
|
17
18
|
const rawToken = pat.token;
|
|
18
19
|
if (encode) {
|
|
19
|
-
|
|
20
|
-
return Buffer.from(rawToken).toString("base64");
|
|
20
|
+
return toBase64(rawToken);
|
|
21
21
|
}
|
|
22
22
|
return rawToken;
|
|
23
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-npmrc-pat.js","sourceRoot":"","sources":["../../src/npmrc/generate-npmrc-pat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAkB,MAAM,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-npmrc-pat.js","sourceRoot":"","sources":["../../src/npmrc/generate-npmrc-pat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAkB,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAAoB,EACpB,MAAM,GAAG,KAAK,EACG,EAAE;IACnB,MAAM,IAAI,GAAG,GAAG,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC;QACvB,UAAU,EAAE,GAAG,IAAI,aAAa;QAChC,YAAY;QACZ,WAAW,EAAE,GAAG,IAAI,YAAY;QAChC,KAAK,EAAE,CAAC,eAAe,CAAC;QACxB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAI,GAAsB,CAAC,KAAK,CAAC;IAE/C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Feed, FileProvider } from "../fileProvider.js";
|
|
2
|
+
export declare class NpmrcFileProvider extends FileProvider {
|
|
3
|
+
constructor(configFile?: string);
|
|
4
|
+
prepUserFile(): Promise<void>;
|
|
5
|
+
getWorkspaceRegistries(): Promise<string[]>;
|
|
6
|
+
getUserFeeds(): Promise<Map<string, Feed>>;
|
|
7
|
+
patchUserNpmRcFile(newLinesByRegistryAndField: Map<string, string>): Promise<string[]>;
|
|
8
|
+
toRegistryAndFunctionKey(registry: string, field: string): string;
|
|
9
|
+
writeWorspaceRegistries(feedsToPatch: Iterable<Feed>): Promise<void>;
|
|
10
|
+
processNpmRcFile(npmrcFilePath: string, handleFeedConfig: (line: string, registry: string, field: string, value: string) => string | void, handleOtherLine?: (line: string) => string | void): Promise<string[]>;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=npmrcFileProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npmrcFileProvider.d.ts","sourceRoot":"","sources":["../../src/npmrc/npmrcFileProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,IAAI,EACJ,YAAY,EACb,MAAM,oBAAoB,CAAC;AAQ5B,qBAAa,iBAAkB,SAAQ,YAAY;gBACrC,UAAU,CAAC,EAAE,MAAM;IAIhB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB7B,sBAAsB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IA4C3C,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IA+BnD,kBAAkB,CACtB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,OAAO,CAAC,MAAM,EAAE,CAAC;IA0BpB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAIlD,uBAAuB,CACpC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC;IA4BV,gBAAgB,CACpB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,CAChB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,KACV,MAAM,GAAG,IAAI,EAClB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAChD,OAAO,CAAC,MAAM,EAAE,CAAC;CA6BrB"}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import Config from "@npmcli/config";
|
|
2
|
+
import { defaultEmail, defaultUser, FileProvider, } from "../fileProvider.js";
|
|
3
|
+
import fs from "node:fs/promises";
|
|
4
|
+
import { EOL } from "node:os";
|
|
5
|
+
import { getOrganizationFromFeedUrl } from "../utils/get-organization-from-feed-url.js";
|
|
6
|
+
import { getFeedWithoutProtocol } from "../utils/get-feed-without-protocol.js";
|
|
7
|
+
import { fromBase64, toBase64 } from "../utils/encoding.js";
|
|
8
|
+
import path from "node:path";
|
|
9
|
+
export class NpmrcFileProvider extends FileProvider {
|
|
10
|
+
constructor(configFile) {
|
|
11
|
+
super("NpmRc", ".npmrc", configFile);
|
|
12
|
+
}
|
|
13
|
+
async prepUserFile() {
|
|
14
|
+
try {
|
|
15
|
+
const npmrcContent = await fs.readFile(this.userFilePath, "utf-8");
|
|
16
|
+
// remove the entry for registries in the user-level .npmrc
|
|
17
|
+
const updatedNpmrcContent = npmrcContent
|
|
18
|
+
.split(EOL)
|
|
19
|
+
.filter((line) => !line.includes("registry="))
|
|
20
|
+
.join(EOL);
|
|
21
|
+
await fs.writeFile(this.userFilePath, updatedNpmrcContent);
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
// user npmrc does not exist so make an empty one
|
|
25
|
+
await fs.writeFile(this.userFilePath, "");
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
async getWorkspaceRegistries() {
|
|
29
|
+
var _a;
|
|
30
|
+
let config;
|
|
31
|
+
try {
|
|
32
|
+
config = new Config({
|
|
33
|
+
npmPath: this.workspaceFilePath,
|
|
34
|
+
argv: [
|
|
35
|
+
"<dummy_node>", // pnpm code always slices the first two arv arguments
|
|
36
|
+
"<dummy_pnpm_js>", // pnpm code always slices the first two arv arguments
|
|
37
|
+
// This is to ensure that the parser picks up the selected .npmrc file
|
|
38
|
+
// as the built-in logic for finding the .npmrc file is not resiliant
|
|
39
|
+
// for repo's that are of mixed languages i.e. js + cpp + C# etc.
|
|
40
|
+
// The assumption is that the .npmrc file is next to a node_modules or package.json
|
|
41
|
+
// file which in large mono-repo's at is not always the case.
|
|
42
|
+
`--prefix=${path.dirname(this.workspaceFilePath)}`,
|
|
43
|
+
],
|
|
44
|
+
shorthands: {},
|
|
45
|
+
definitions: {}, // needed so we can access random feed names
|
|
46
|
+
});
|
|
47
|
+
await config.load();
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
if (error instanceof TypeError && error.message.includes("Invalid URL")) {
|
|
51
|
+
throw new Error("Registry URL missing or invalid");
|
|
52
|
+
}
|
|
53
|
+
throw new Error("Error loading .npmrc");
|
|
54
|
+
}
|
|
55
|
+
// @npmcli/config does not have a normal way to display all keys
|
|
56
|
+
// so we use this ugly access instead
|
|
57
|
+
const projectNpmrcKeys = Object.keys((((_a = config.data) === null || _a === void 0 ? void 0 : _a.get("project")) || {})["data"] || {});
|
|
58
|
+
// find any and all keys which are a registry
|
|
59
|
+
const registries = projectNpmrcKeys.filter((key) => key.includes("registry"));
|
|
60
|
+
return registries
|
|
61
|
+
.map((registry) => config.get(registry, "project"))
|
|
62
|
+
.map((feed) => getFeedWithoutProtocol(feed));
|
|
63
|
+
}
|
|
64
|
+
async getUserFeeds() {
|
|
65
|
+
const result = new Map();
|
|
66
|
+
await this.processNpmRcFile(this.userFilePath, (_, registry, field, value) => {
|
|
67
|
+
let feed = result.get(registry);
|
|
68
|
+
if (!feed) {
|
|
69
|
+
feed = {
|
|
70
|
+
registry: registry,
|
|
71
|
+
adoOrganization: getOrganizationFromFeedUrl(registry),
|
|
72
|
+
};
|
|
73
|
+
result.set(feed.registry, feed);
|
|
74
|
+
}
|
|
75
|
+
switch (field) {
|
|
76
|
+
case "_password":
|
|
77
|
+
feed.authToken = fromBase64(value).trim();
|
|
78
|
+
break;
|
|
79
|
+
case "username":
|
|
80
|
+
feed.userName = value;
|
|
81
|
+
break;
|
|
82
|
+
case "email":
|
|
83
|
+
feed.email = value;
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
return result;
|
|
88
|
+
}
|
|
89
|
+
async patchUserNpmRcFile(newLinesByRegistryAndField) {
|
|
90
|
+
const linesToAdd = new Set(newLinesByRegistryAndField.values());
|
|
91
|
+
const npmrcLines = await this.processNpmRcFile(this.userFilePath, (line, registry, field, _value) => {
|
|
92
|
+
const newLine = newLinesByRegistryAndField.get(this.toRegistryAndFunctionKey(registry, field));
|
|
93
|
+
if (newLine !== undefined) {
|
|
94
|
+
linesToAdd.delete(newLine);
|
|
95
|
+
return newLine;
|
|
96
|
+
}
|
|
97
|
+
return line;
|
|
98
|
+
}, (line) => line);
|
|
99
|
+
for (const lineToAdd of linesToAdd) {
|
|
100
|
+
npmrcLines.push(lineToAdd);
|
|
101
|
+
}
|
|
102
|
+
return npmrcLines;
|
|
103
|
+
}
|
|
104
|
+
toRegistryAndFunctionKey(registry, field) {
|
|
105
|
+
return `//${registry}:${field}=`;
|
|
106
|
+
}
|
|
107
|
+
async writeWorspaceRegistries(feedsToPatch) {
|
|
108
|
+
const newLinesByRegistryAndField = new Map();
|
|
109
|
+
// Build a map with registry and feed with the updated line for value.
|
|
110
|
+
for (var feedToPatch of feedsToPatch) {
|
|
111
|
+
newLinesByRegistryAndField.set(this.toRegistryAndFunctionKey(feedToPatch.registry, "username"), `//${feedToPatch.registry}:username=${feedToPatch.userName || defaultUser}`);
|
|
112
|
+
newLinesByRegistryAndField.set(this.toRegistryAndFunctionKey(feedToPatch.registry, "email"), `//${feedToPatch.registry}:email=${feedToPatch.email || defaultEmail}`);
|
|
113
|
+
newLinesByRegistryAndField.set(this.toRegistryAndFunctionKey(feedToPatch.registry, "_password"), `//${feedToPatch.registry}:_password=${toBase64(feedToPatch.authToken)}`);
|
|
114
|
+
}
|
|
115
|
+
const npmrcLines = await this.patchUserNpmRcFile(newLinesByRegistryAndField);
|
|
116
|
+
await fs.writeFile(this.userFilePath, npmrcLines.join(EOL), {
|
|
117
|
+
encoding: "utf-8",
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
async processNpmRcFile(npmrcFilePath, handleFeedConfig, handleOtherLine) {
|
|
121
|
+
const npmrc = await fs.readFile(npmrcFilePath, {
|
|
122
|
+
encoding: "utf8",
|
|
123
|
+
});
|
|
124
|
+
const npmrcLines = npmrc.split("\n").map((line) => line.trim());
|
|
125
|
+
const resultLines = [];
|
|
126
|
+
for (const line of npmrcLines) {
|
|
127
|
+
const slashColonIndex = line.indexOf("/:");
|
|
128
|
+
if (line.startsWith("//") && slashColonIndex >= 2) {
|
|
129
|
+
const registry = line.substring(2, slashColonIndex + 1);
|
|
130
|
+
const remainder = line.substring(slashColonIndex + 2);
|
|
131
|
+
const field = remainder.substring(0, remainder.indexOf("="));
|
|
132
|
+
const value = remainder.substring(remainder.indexOf("=") + 1);
|
|
133
|
+
const newLine = handleFeedConfig(line, registry, field, value);
|
|
134
|
+
if (newLine) {
|
|
135
|
+
resultLines.push(newLine);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
else if (handleOtherLine) {
|
|
139
|
+
const newLine = handleOtherLine(line);
|
|
140
|
+
if (newLine) {
|
|
141
|
+
resultLines.push(newLine);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return resultLines;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=npmrcFileProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npmrcFileProvider.js","sourceRoot":"","sources":["../../src/npmrc/npmrcFileProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IACvE,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,oBACN;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,UACO,OAAO,WACN,eAAe,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IACvE,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,oBACN;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,UACO,OAAO,WACN,eAAe,SAmBzB,CAAC"}
|
package/lib/telemetry/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { platform, arch } from "os";
|
|
2
2
|
import { isWsl } from "../utils/is-wsl.js";
|
|
3
|
-
;
|
|
4
3
|
/**
|
|
5
4
|
* Logs an node-azure-auth event to telemetry.
|
|
6
5
|
*/
|
|
@@ -8,7 +7,7 @@ export const logTelemetry = (inputProperties, flush, client) => {
|
|
|
8
7
|
const outputProperties = new Map();
|
|
9
8
|
outputProperties.set("success", inputProperties.success ? "true" : "false");
|
|
10
9
|
outputProperties.set("automaticSuccess", inputProperties.automaticSuccess ? "true" : "false");
|
|
11
|
-
outputProperties.set("error", inputProperties.error
|
|
10
|
+
outputProperties.set("error", inputProperties.error || "");
|
|
12
11
|
outputProperties.set("platform", isWsl() ? "wsl" : platform());
|
|
13
12
|
outputProperties.set("arch", arch());
|
|
14
13
|
if (client) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAe3C;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,eAIC,EACD,KAAe,EACf,MAAwB,EACxB,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACnD,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC5E,gBAAgB,CAAC,GAAG,CAClB,kBAAkB,EAClB,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CACpD,CAAC;IACF,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAC3D,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/D,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAErC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;QAErD,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Create a base64 encoded string from a string
|
|
3
|
+
* @param {string} input
|
|
4
|
+
* @returns {string}
|
|
5
|
+
*/
|
|
6
|
+
export declare function toBase64(input: string | undefined): string;
|
|
7
|
+
/**
|
|
8
|
+
* Decode a base64 encoded string
|
|
9
|
+
* @param {string} base64string
|
|
10
|
+
* @returns
|
|
11
|
+
*/
|
|
12
|
+
export declare const fromBase64: (base64string: string) => string;
|
|
13
|
+
//# sourceMappingURL=encoding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../../src/utils/encoding.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAE1D;AAED;;;;GAIG;AACH,eAAO,MAAM,UAAU,iBAAkB,MAAM,WACO,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Create a base64 encoded string from a string
|
|
3
|
+
* @param {string} input
|
|
4
|
+
* @returns {string}
|
|
5
|
+
*/
|
|
6
|
+
export function toBase64(input) {
|
|
7
|
+
return Buffer.from(input || "").toString("base64");
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Decode a base64 encoded string
|
|
11
|
+
* @param {string} base64string
|
|
12
|
+
* @returns
|
|
13
|
+
*/
|
|
14
|
+
export const fromBase64 = (base64string) => Buffer.from(base64string, "base64").toString("utf8");
|
|
15
|
+
//# sourceMappingURL=encoding.js.map
|