Fixes auth

Author: arcanis

packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts

@@ -292,8 +292,8 @@ export const startPackageServer = (): Promise<string> => {
 
       const {username} = parsedRequest;
       const otp = request.headers['npm-otp'];
-      const user = validLogins[username];
 
+      const user = validLogins[username];
       if (!user)
         return processError(response, 401, `Unauthorized`);
 
@@ -452,7 +452,7 @@ export const startPackageServer = (): Promise<string> => {
             const {authorization} = req.headers;
             if (authorization != null) {
               if (!validAuthorizations.includes(authorization)) {
-                sendError(res, 403, `Forbidden`);
+                sendError(res, 401, `Invalid token`);
                 return;
               }
             } else if (needsAuth(parsedRequest)) {

packages/plugin-npm-cli/sources/commands/npm/login.ts

@@ -103,20 +103,17 @@ async function getCredentials(prompt: any) {
     };
   }
 
-  const {username, password} = await prompt([
-    {
-      type: `input`,
-      name: `username`,
-      message: `Username:`,
-      validate: (input: string) => validateRequiredInput(input, `Username`),
-    },
-    {
-      type: `password`,
-      name: `password`,
-      message: `Password:`,
-      validate: (input: string) => validateRequiredInput(input, `Password`),
-    },
-  ]);
+  const {username, password} = await prompt([{
+    type: `input`,
+    name: `username`,
+    message: `Username:`,
+    validate: (input: string) => validateRequiredInput(input, `Username`),
+  }, {
+    type: `password`,
+    name: `password`,
+    message: `Password:`,
+    validate: (input: string) => validateRequiredInput(input, `Password`),
+  }]);
 
   return {
     name: username,

packages/plugin-npm-cli/sources/commands/npm/publish.ts

@@ -82,8 +82,8 @@ export default class NpmPublishCommand extends BaseCommand {
         } catch (error) {
           if (error.name !== `HTTPError`) {
             throw error;
-          } else if (error.statusCode !== 404) {
-            throw new ReportError(MessageName.NETWORK_ERROR, `The remote server answered with HTTP ${error.statusCode} ${error.statusMessage}`);
+          } else if (error.response.statusCode !== 404) {
+            throw new ReportError(MessageName.NETWORK_ERROR, `The remote server answered with HTTP ${error.response.statusCode} ${error.response.statusMessage}`);
           }
         }
       }
@@ -109,14 +109,14 @@ export default class NpmPublishCommand extends BaseCommand {
             json: true,
           });
         } catch (error) {
-          if (error.name === `HTTPError`) {
-            const message = error.body && error.body.error
-              ? error.body.error
-              : `The remote server answered with HTTP ${error.statusCode} ${error.statusMessage}`;
+          if (error.name !== `HTTPError`) {
+            throw error;
+          } else {
+            const message = error.response.body && error.body.response.error
+              ? error.response.body.error
+              : `The remote server answered with HTTP ${error.response.statusCode} ${error.response.statusMessage}`;
 
             report.reportError(MessageName.NETWORK_ERROR, message);
-          } else {
-            throw error;
           }
         }
       });

packages/plugin-npm-cli/sources/commands/npm/whoami.ts

@@ -59,7 +59,9 @@ export default class NpmWhoamiCommand extends BaseCommand {
 
         report.reportInfo(MessageName.UNNAMED, response.username);
       } catch (err) {
-        if (err.statusCode === 401 || err.statusCode === 403) {
+        if (err.name !== `HTTPError`) {
+          throw err;
+        } else if (err.response.statusCode === 401 || err.response.statusCode === 403) {
           report.reportError(MessageName.AUTHENTICATION_INVALID, `Authentication failed - your credentials may have expired`);
         } else {
           report.reportError(MessageName.AUTHENTICATION_INVALID, err.toString());

packages/plugin-npm/sources/npmHttpUtils.ts

@@ -133,9 +133,11 @@ async function askForOtp() {
 }
 
 function isOtpError(error: any) {
-  try {
-    const authMethods = error.headers['www-authenticate'].split(/,\s*/).map((s: string) => s.toLowerCase());
+  if (error.name !== `HTTPError`)
+    return false;
 
+  try {
+    const authMethods = error.response.headers['www-authenticate'].split(/,\s*/).map((s: string) => s.toLowerCase());
     return authMethods.includes('otp');
   } catch (e) {
     return false;