From 9eef638499c88689acb00d812c10f0407cb95c08 Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Fri, 18 Dec 2020 11:08:48 -0800
Subject: [PATCH] Pass full set of options to login helper functions

This fixes 'npm login --no-strict-ssl', as well as a host of other
options that one might want to set while logging in.

Reported by: @toddself
---
 lib/adduser.js      |  1 +
 test/lib/adduser.js | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/adduser.js b/lib/adduser.js
index 4b9fdf1f5f166..b6c3321745667 100644
--- a/lib/adduser.js
+++ b/lib/adduser.js
@@ -59,6 +59,7 @@ const adduser = async (args) => {
   log.notice('', `Log in on ${replaceInfo(registry)}`)
 
   const { message, newCreds } = await auth({
+    ...npm.flatOptions,
     creds,
     registry,
     scope,
diff --git a/test/lib/adduser.js b/test/lib/adduser.js
index 4e6a56fc199d6..36f59e0857902 100644
--- a/test/lib/adduser.js
+++ b/test/lib/adduser.js
@@ -9,21 +9,27 @@ const _flatOptions = {
   authType: 'legacy',
   registry: 'https://registry.npmjs.org/',
   scope: '',
+  fromFlatOptions: true,
 }
 
 let failSave = false
 let deletedConfig = {}
 let registryOutput = ''
 let setConfig = {}
-const authDummy = () => Promise.resolve({
-  message: 'success',
-  newCreds: {
-    username: 'u',
-    password: 'p',
-    email: 'u@npmjs.org',
-    alwaysAuth: false,
-  },
-})
+const authDummy = (options) => {
+  if (!options.fromFlatOptions)
+    throw new Error('did not pass full flatOptions to auth function')
+
+  return Promise.resolve({
+    message: 'success',
+    newCreds: {
+      username: 'u',
+      password: 'p',
+      email: 'u@npmjs.org',
+      alwaysAuth: false,
+    },
+  })
+}
 
 const deleteMock = (key, where) => {
   deletedConfig = {