This reverts commit fd92a3e87f
.
It turns out that wombot proxy will return who is logged in, but does so regardless of
if the users token is currently active. Since we cannot rely on `npm whoami` to
determine the login state, we revert to our previous state of assuming new login is
needed.
PR Close #42917
This commit is contained in:
parent
1d9d02696e
commit
69d4ebffa9
|
@ -7513,9 +7513,21 @@ class ReleaseTool {
|
||||||
* @returns a boolean indicating whether the user is logged into NPM.
|
* @returns a boolean indicating whether the user is logged into NPM.
|
||||||
*/
|
*/
|
||||||
_verifyNpmLoginState() {
|
_verifyNpmLoginState() {
|
||||||
var _a;
|
var _a, _b;
|
||||||
return tslib.__awaiter(this, void 0, void 0, function* () {
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
||||||
const registry = `NPM at the ${(_a = this._config.publishRegistry) !== null && _a !== void 0 ? _a : 'default NPM'} registry`;
|
const registry = `NPM at the ${(_a = this._config.publishRegistry) !== null && _a !== void 0 ? _a : 'default NPM'} registry`;
|
||||||
|
// TODO(josephperrott): remove wombat specific block once wombot allows `npm whoami` check to
|
||||||
|
// check the status of the local token in the .npmrc file.
|
||||||
|
if ((_b = this._config.publishRegistry) === null || _b === void 0 ? void 0 : _b.includes('wombat-dressing-room.appspot.com')) {
|
||||||
|
info('Unable to determine NPM login state for wombat proxy, requiring login now.');
|
||||||
|
try {
|
||||||
|
yield npmLogin(this._config.publishRegistry);
|
||||||
|
}
|
||||||
|
catch (_c) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (yield npmIsLoggedIn(this._config.publishRegistry)) {
|
if (yield npmIsLoggedIn(this._config.publishRegistry)) {
|
||||||
debug(`Already logged into ${registry}.`);
|
debug(`Already logged into ${registry}.`);
|
||||||
return true;
|
return true;
|
||||||
|
@ -7527,7 +7539,7 @@ class ReleaseTool {
|
||||||
try {
|
try {
|
||||||
yield npmLogin(this._config.publishRegistry);
|
yield npmLogin(this._config.publishRegistry);
|
||||||
}
|
}
|
||||||
catch (_b) {
|
catch (_d) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -183,6 +183,17 @@ export class ReleaseTool {
|
||||||
*/
|
*/
|
||||||
private async _verifyNpmLoginState(): Promise<boolean> {
|
private async _verifyNpmLoginState(): Promise<boolean> {
|
||||||
const registry = `NPM at the ${this._config.publishRegistry ?? 'default NPM'} registry`;
|
const registry = `NPM at the ${this._config.publishRegistry ?? 'default NPM'} registry`;
|
||||||
|
// TODO(josephperrott): remove wombat specific block once wombot allows `npm whoami` check to
|
||||||
|
// check the status of the local token in the .npmrc file.
|
||||||
|
if (this._config.publishRegistry?.includes('wombat-dressing-room.appspot.com')) {
|
||||||
|
info('Unable to determine NPM login state for wombat proxy, requiring login now.');
|
||||||
|
try {
|
||||||
|
await npmLogin(this._config.publishRegistry);
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (await npmIsLoggedIn(this._config.publishRegistry)) {
|
if (await npmIsLoggedIn(this._config.publishRegistry)) {
|
||||||
debug(`Already logged into ${registry}.`);
|
debug(`Already logged into ${registry}.`);
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue