Adds support for npm-notice during OTP requests

yarnpkg · Mar 31, 2022 · 5b2ac04 · 5b2ac04
1 parent 751c895
commit 5b2ac04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/errors.js b/src/errors.js
@@ -34,4 +34,11 @@ export class ResponseError extends Error {
   responseCode: number;
 }
 
-export class OneTimePasswordError extends Error {}
+export class OneTimePasswordError extends Error {
+  constructor(notice: string) {
+    super();
+    this.notice = notice;
+  }
+
+  notice: string;
+}
diff --git a/src/registries/npm-registry.js b/src/registries/npm-registry.js
@@ -191,6 +191,10 @@ export default class NpmRegistry extends Registry {
         }
 
         this.reporter.info(this.reporter.lang('twoFactorAuthenticationEnabled'));
+        if (error.notice) {
+          this.reporter.info(error.notice);
+        }
+
         this.otp = await getOneTimePassword(this.reporter);
 
         this.requestManager.clearCache();

diff --git a/src/util/request-manager.js b/src/util/request-manager.js
@@ -440,9 +440,8 @@ export default class RequestManager {
 
         if (res.statusCode === 401 && res.headers['www-authenticate']) {
           const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
-
           if (authMethods.indexOf('otp') !== -1) {
-            reject(new OneTimePasswordError());
+            reject(new OneTimePasswordError(res.headers['npm-notice']));
             return;
           }
         }