fix: remove unnecessary logging for webauthn auth

npm · Jun 24, 2022 · 6ba885f · 6ba885f
1 parent 0ce09f1
commit 6ba885f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/lib/auth/legacy.js b/lib/auth/legacy.js
@@ -2,6 +2,7 @@ const profile = require('npm-profile')
 const log = require('../utils/log-shim')
 const openUrlPrompt = require('../utils/open-url-prompt.js')
 const read = require('../utils/read-user-info.js')
+const replaceInfo = require('../utils/replace-info.js')
 
 const loginPrompter = async (creds) => {
   creds.username = await read.username('Username:', creds.username)
@@ -14,6 +15,10 @@ const loginPrompter = async (creds) => {
 const login = async (npm, opts) => {
   let res
 
+  if (opts.authType === 'legacy') {
+    log.notice('', `Log in on ${replaceInfo(opts.registry)}`)
+  }
+
   const requestOTP = async () => {
     const otp = await read.otp(
       'Enter one-time password: '

diff --git a/lib/auth/sso.js b/lib/auth/sso.js
@@ -12,6 +12,7 @@ const npmFetch = require('npm-registry-fetch')
 const log = require('../utils/log-shim')
 const openUrl = require('../utils/open-url.js')
 const otplease = require('../utils/otplease.js')
+const replaceInfo = require('../utils/replace-info.js')
 
 const pollForSession = ({ registry, token, opts }) => {
   log.info('adduser', 'Polling for validated SSO session')
@@ -39,6 +40,8 @@ const login = async (npm, { creds, registry, scope }) => {
   const opts = { ...npm.flatOptions, creds, registry, scope }
   const { ssoType } = opts
 
+  log.notice('', `Log in on ${replaceInfo(registry)}`)
+
   if (!ssoType) {
     throw new Error('Missing option: sso-type')
   }

diff --git a/lib/auth/webauthn.js b/lib/auth/webauthn.js
diff --git a/lib/commands/adduser.js b/lib/commands/adduser.js
@@ -1,9 +1,8 @@
 const log = require('../utils/log-shim.js')
-const replaceInfo = require('../utils/replace-info.js')
 const BaseCommand = require('../base-command.js')
 const authTypes = {
   legacy: require('../auth/legacy.js'),
-  webauthn: require('../auth/legacy.js'),
+  webauthn: require('../auth/webauthn.js'),
   oauth: require('../auth/oauth.js'),
   saml: require('../auth/saml.js'),
   sso: require('../auth/sso.js'),
@@ -28,8 +27,6 @@ class AddUser extends BaseCommand {
 
     log.disableProgress()
 
-    log.notice('', `Log in on ${replaceInfo(registry)}`)
-
     const { message, newCreds } = await auth(this.npm, {
       ...this.npm.flatOptions,
       creds,

diff --git a/test/lib/auth/sso.js b/test/lib/auth/sso.js
@@ -8,12 +8,17 @@ const _flatOptions = {
 const token = '24528a24f240'
 const SSO_URL = 'https://registry.npmjs.org/{SSO_URL}'
 const profile = {}
-const npmFetch = {}
+const npmFetch = {
+  cleanUrl: (s) => s
+}
 const sso = t.mock('../../../lib/auth/sso.js', {
   'proc-log': {
     info: (...msgs) => {
       log += msgs.join(' ') + '\n'
     },
+    notice: (...msgs) => {
+      log += msgs.join(' ') + '\n'
+    }
   },
   'npm-profile': profile,
   'npm-registry-fetch': npmFetch,
@@ -82,7 +87,7 @@ t.test('simple login', async (t) => {
 
   t.equal(
     log,
-    'adduser Polling for validated SSO session\nadduser Authorized user foo\n',
+    ' Log in on https://registry.npmjs.org/\nadduser Polling for validated SSO session\nadduser Authorized user foo\n',
     'should have correct logged info msg'
   )
 
@@ -220,7 +225,7 @@ t.test('scoped login', async (t) => {
 
   t.equal(
     log,
-    'adduser Polling for validated SSO session\nadduser Authorized user foo\n',
+    ' Log in on https://diff-registry.npmjs.org/\nadduser Polling for validated SSO session\nadduser Authorized user foo\n',
     'should have correct logged info msg'
   )