Do not check if a 2FA token is required when on other registries (#288)

* Do not check if a 2FA token is required when on other registries * Create purple-parrots-sin.md * Fix soem other cases
changesets · Mar 5, 2020 · 2adfe66 · 2adfe66
1 parent ca934d7
commit 2adfe66
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/.changeset/purple-parrots-sin.md b/.changeset/purple-parrots-sin.md
@@ -0,0 +1,5 @@
+---
+"@changesets/cli": patch
+---
+
+Stop running `npm profile get` when using non-npm registries
diff --git a/packages/cli/src/commands/publish/npm-utils.ts b/packages/cli/src/commands/publish/npm-utils.ts
@@ -41,13 +41,8 @@ export async function getTokenIsRequired() {
     env: Object.assign({}, process.env, envOverride)
   });
   let json = JSON.parse(result.stdout.toString());
-  if (json.error) {
-    error(
-      `an error occurred while running \`npm profile get\`: ${json.error.code}`
-    );
-    error(json.error.summary);
-    if (json.error.summary) error(json.error.summary);
-    throw new ExitError(1);
+  if (json.error || !json.tfa || !json.tfa.mode) {
+    return false;
   }
   return json.tfa.mode === "auth-and-writes";
 }

diff --git a/packages/cli/src/commands/publish/publishPackages.ts b/packages/cli/src/commands/publish/publishPackages.ts
@@ -27,10 +27,25 @@ export default async function publishPackages({
     otp === undefined
       ? {
           token: null,
-          isRequired: isCI
-            ? Promise.resolve(false)
-            : // note: we're not awaiting this here, we want this request to happen in parallel with getUnpublishedPackages
-              npmUtils.getTokenIsRequired()
+          isRequired:
+            isCI ||
+            publicPackages.some(
+              x =>
+                x.config.publishConfig &&
+                (x.config.publishConfig as any).registry &&
+                (x.config.publishConfig as any).registry !==
+                  "https://registry.npmjs.org" &&
+                (x.config.publishConfig as any).registry !==
+                  "https://registry.yarnpkg.com"
+            ) ||
+            (process.env.npm_config_registry !== undefined &&
+              process.env.npm_config_registry !==
+                "https://registry.npmjs.org" &&
+              process.env.npm_config_registry !==
+                "https://registry.yarnpkg.com")
+              ? Promise.resolve(false)
+              : // note: we're not awaiting this here, we want this request to happen in parallel with getUnpublishedPackages
+                npmUtils.getTokenIsRequired()
         }
       : {
           token: otp,