@microsoft/yarn-plugin-ado-auth 0.2.2 → 0.2.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/lib/tokenCache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenCache.d.ts","sourceRoot":"","sources":["../src/tokenCache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,KAAK,EAGX,MAAM,eAAe,CAAC;AAKvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAKvD;;;GAGG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,KAAK,CAAgD;gBAG3D,aAAa,EAAE,aAAa,EAC5B,UAAU,GAAE,OAAO,iBAAqC;IAQ1D;;;;OAIG;IACH,QAAQ,CACN,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,KAAK,GACZ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS;IAOvC;;;;;;;OAOG;YACW,UAAU;
|
|
1
|
+
{"version":3,"file":"tokenCache.d.ts","sourceRoot":"","sources":["../src/tokenCache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,KAAK,EAGX,MAAM,eAAe,CAAC;AAKvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAKvD;;;GAGG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,KAAK,CAAgD;gBAG3D,aAAa,EAAE,aAAa,EAC5B,UAAU,GAAE,OAAO,iBAAqC;IAQ1D;;;;OAIG;IACH,QAAQ,CACN,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,KAAK,GACZ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS;IAOvC;;;;;;;OAOG;YACW,UAAU;IAqDxB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAY5B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAW7B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;CAuBjC"}
|
package/lib/tokenCache.js
CHANGED
|
@@ -37,12 +37,14 @@ export class TokenCache {
|
|
|
37
37
|
*/
|
|
38
38
|
async fetchToken(registry, ident) {
|
|
39
39
|
const configuration = this.configuration;
|
|
40
|
+
let token = null;
|
|
40
41
|
await StreamReport.start({ configuration, stdout: process.stdout }, async (report) => {
|
|
41
42
|
const prettyRegistry = formatUtils.pretty(configuration, registry, formatUtils.Type.URL);
|
|
42
43
|
// first see if a token is set via .yarnrc, either hardcoded or via environment variable
|
|
43
44
|
const authConfig = this.getAuthConfiguration(registry, ident);
|
|
44
45
|
const tokenFromYarnrc = getConfigString(authConfig, "npmAuthToken");
|
|
45
46
|
if (tokenFromYarnrc) {
|
|
47
|
+
token = tokenFromYarnrc;
|
|
46
48
|
this.cache[registry] = tokenFromYarnrc;
|
|
47
49
|
report.reportInfo(null, `Authenticated to: ${prettyRegistry} (via configuration)`);
|
|
48
50
|
return;
|
|
@@ -52,14 +54,14 @@ export class TokenCache {
|
|
|
52
54
|
throw new Error(`Could not determine organization from registry URL: ${registry}`);
|
|
53
55
|
}
|
|
54
56
|
const pat = await generateNpmrcPat(organization, registry, false, this.azureAuthPath);
|
|
57
|
+
token = pat;
|
|
55
58
|
this.cache[registry] = pat;
|
|
56
59
|
report.reportInfo(null, `Authenticated to: ${prettyRegistry} (via ADO CLI)`);
|
|
57
60
|
});
|
|
58
|
-
|
|
59
|
-
if (pat == null) {
|
|
61
|
+
if (token == null) {
|
|
60
62
|
throw new Error(`Failed to authenticate to: ${registry}`);
|
|
61
63
|
}
|
|
62
|
-
return
|
|
64
|
+
return token;
|
|
63
65
|
}
|
|
64
66
|
/**
|
|
65
67
|
* Get the authentication configuration for the given registry and ident. This code was
|
package/lib/tokenCache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenCache.js","sourceRoot":"","sources":["../src/tokenCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAgB,MAAM,YAAY,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB;;;GAGG;AACH,MAAM,OAAO,UAAU;IAMrB,YACE,aAA4B,EAC5B,aAAuC,iBAAiB;QAJlD,UAAK,GAA6C,EAAE,CAAC;QAM3D,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,oBAAoB,IAAI,EAAE,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,kBAAkB,IAAI,iBAAiB,EAAE,CAAC;IAC1E,CAAC;IAED;;;;OAIG;IACH,QAAQ,CACN,QAAgB,EAChB,KAAa;QAEb,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,KAAa;QACtD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,MAAM,YAAY,CAAC,KAAK,CACtB,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EACzC,KAAK,EAAE,MAAM,EAAE,EAAE;YACf,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CACvC,aAAa,EACb,QAAQ,EACR,WAAW,CAAC,IAAI,CAAC,GAAG,CACrB,CAAC;YACF,wFAAwF;YACxF,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC9D,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YACpE,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC;gBACvC,MAAM,CAAC,UAAU,CACf,IAAI,EACJ,qBAAqB,cAAc,sBAAsB,CAC1D,CAAC;gBACF,OAAO;YACT,CAAC;YAED,MAAM,YAAY,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;YAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,uDAAuD,QAAQ,EAAE,CAClE,CAAC;YACJ,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,IAAI,CAAC,aAAa,CACnB,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;YAC3B,MAAM,CAAC,UAAU,CACf,IAAI,EACJ,qBAAqB,cAAc,gBAAgB,CACpD,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,
|
|
1
|
+
{"version":3,"file":"tokenCache.js","sourceRoot":"","sources":["../src/tokenCache.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/yarn-plugin-ado-auth",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.3",
|
|
4
4
|
"description": "Yarn plugin to enable Azure DevOps authentication for private npm registries.",
|
|
5
5
|
"repository": "https://github.com/microsoft/ado-npm-auth",
|
|
6
6
|
"license": "MIT",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"eslint": "eslint ."
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@microsoft/ado-npm-auth-lib": "^0.10.
|
|
24
|
+
"@microsoft/ado-npm-auth-lib": "^0.10.1"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@microsoft/eslint-plugin-sdl": "^1.1.0",
|