feat: updated the way we handle identity fetching

- added get-identity.js file; to do the actual fetching
- updated commands that required whoami.js
- lib/stars.js: small refactoring of promise chain
- lib/star.js: fixed missing comma

lib/access.js

@@ -10,7 +10,7 @@ const { prefix } = npm
 const { promisify } = require('util')
 const readPackageJson = promisify(require('read-package-json'))
 const usage = require('./utils/usage.js')
-const whoami = require('./whoami.js')
+const getIdentity = require('./utils/get-identity')
 
 module.exports = access
 
@@ -139,11 +139,9 @@ access['2fa-not-required'] = access.tfaNotRequired = ([pkg], opts) => {
 access['ls-packages'] = access.lsPackages = ([owner], opts) => {
   const getOwnerPromise = (owner)
     ? Promise.resolve(owner)
-    : new Promise((resolve, reject) => {
-      whoami([], true, (err) => err ? reject(err) : resolve())
-    })
+    : getIdentity(opts)
 
-  return getOwnerPromise.then(owner => {
+  return getOwnerPromise(owner).then(owner => {
     return libaccess.lsPackages(owner, opts)
   }).then(pkgs => {
     // TODO - print these out nicely (breaking change)

lib/deprecate.js

@@ -5,7 +5,7 @@ const fetch = require('npm-registry-fetch')
 const otplease = require('./utils/otplease.js')
 const npa = require('npm-package-arg')
 const semver = require('semver')
-const whoami = require('./whoami.js')
+const getItentity = require('./utils/get-identity')
 
 module.exports = deprecate
 
@@ -14,7 +14,7 @@ deprecate.usage = 'npm deprecate <pkg>[@<version>] <message>'
 deprecate.completion = function (opts, cb) {
   return Promise.resolve().then(() => {
     if (opts.conf.argv.remain.length > 2) { return }
-    return whoami([], true, () => {}).then(username => {
+    return getItentity(npm.flatOptions).then(username => {
       if (username) {
         // first, get a list of remote packages this user owns.
         // once we have a user account, then don't complete anything.

lib/owner.js

@@ -10,7 +10,7 @@ const { promisify } = require('util')
 const { packument } = require('pacote')
 const readLocalPkg = promisify(require('./utils/read-local-package.js'))
 const usage = require('./utils/usage')
-const whoami = promisify(require('./whoami.js'))
+const getIdentity = require('./utils/get-identity')
 
 owner.usage = usage(
   'owner',
@@ -30,7 +30,7 @@ owner.completion = function (opts, cb) {
   }
   Promise.resolve().then(() => {
     const opts = npm.flatOptions
-    return whoami([], true).then(username => {
+    return getIdentity(opts).then(username => {
       const un = encodeURIComponent(username)
       let byUser, theUser
       switch (argv[2]) {

lib/star.js

@@ -6,7 +6,7 @@ const npa = require('npm-package-arg')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
 const usage = require('./utils/usage.js')
-const whoami = require('./whoami.js')
+const getItentity = require('./utils/get-identity')
 
 star.usage = usage(
   'star',
@@ -31,7 +31,7 @@ function star (args, cb) {
     if (!using) s = u
     return Promise.all(args.map(npa).map(pkg => {
       return Promise.all([
-        whoami([pkg], true, () => {}),
+        getItentity(opts),
         fetch.json(pkg.escapedName, {
           ...opts,
           spec: pkg,
@@ -56,7 +56,7 @@ function star (args, cb) {
           log.verbose('star', 'unstarring', body)
         }
         return fetch.json(pkg.escapedName, {
-          ...opts
+          ...opts,
           spec: pkg,
           method: 'PUT',
           body

lib/stars.js

@@ -4,30 +4,29 @@ const npm = require('./npm.js')
 const fetch = require('npm-registry-fetch')
 const log = require('npmlog')
 const output = require('./utils/output.js')
-const whoami = require('./whoami.js')
+const getItentity = require('./utils/get-identity')
 
 stars.usage = 'npm stars [<user>]'
 
-const getUser = user => user ? Promise.resolve(user)
-  : whoami([], true, () => {})
+const getUser = (opts, user) => user
+  ? Promise.resolve(user)
+  : getItentity(opts)
 
 module.exports = stars
 function stars ([user], cb) {
   const opts = npm.flatOptions
-  return Promise.resolve().then(() => {
-    return getUser(user).then(usr => {
-      return fetch.json('/-/_view/starredByUser', {
-        ...opts,
-        // Note: key has to be JSON, for CouchDB legacy reasons, hence quoted
-        query: {key: `"${usr}"`}
-      })
-    }).then(data => data.rows).then(stars => {
-      if (stars.length === 0) {
-        log.warn('stars', 'user has not starred any packages.')
-      } else {
-        stars.forEach(s => output(s.value))
-      }
+  return getUser(opts, user).then(usr => {
+    return fetch.json('/-/_view/starredByUser', {
+      ...opts,
+      // Note: key has to be JSON, for CouchDB legacy reasons, hence quoted
+      query: {key: `"${usr}"`}
     })
+  }).then(data => data.rows).then(stars => {
+    if (stars.length === 0) {
+      log.warn('stars', 'user has not starred any packages.')
+    } else {
+      stars.forEach(s => output(s.value))
+    }
   }).catch(err => {
     if (err.code === 'ENEEDAUTH') {
       throw Object.assign(new Error("'npm stars' on your own user account requires auth"), {

lib/utils/get-identity.js

@@ -0,0 +1,43 @@
+'use strict'
+
+const npmFetch = require('npm-registry-fetch')
+const npm = require('../npm')
+
+const needsAuthError = (msg) =>
+  Object.assign(new Error(msg, { code: 'ENEEDAUTH' }))
+
+module.exports = async (opts = {}, spec = null) => {
+  const { registry } = opts
+  if (!registry) {
+    throw new Error('no default registry set')
+  }
+
+  // First, check if we have a user/pass-based auth
+  const creds = npm.config.getCredentialsByURI(registry)
+  const { username: usernameFromURI, token } = creds
+
+  if (usernameFromURI) {
+    // Found username; return it
+    return Promise.resolve(usernameFromURI)
+  } else if (token) {
+    // No username, but we have a token; fetch the username from registry
+    const registryData = await npmFetch.json('/-/whoami', {
+      ...opts,
+      spec
+    })
+    const { username: usernameFromRegistry } = registryData
+    // Retrieved username from registry; return it
+    if (usernameFromRegistry) {
+      return Promise.resolve(usernameFromRegistry)
+    } else {
+      // Didn't get username from registry; bad token
+      throw needsAuthError(
+        'Your auth token is no longer valid. Please login again.'
+      )
+    }
+  } else {
+    // At this point, if they have a credentials object, it doesn't have a
+    // token or auth in it. Probably just the default registry.
+    throw needsAuthError('This command requires you to be logged in.')
+  }
+}

lib/whoami.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const fetch = require('npm-registry-fetch')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
+const getIdentity = require('./utils/get-identity')
 
 module.exports = whoami
 
@@ -15,41 +15,11 @@ function whoami ([spec], silent, cb) {
     silent = false
   }
   const opts = npm.flatOptions
-  return Promise.resolve().then(() => {
-    // First, check if we have a user/pass-based auth
-    const registry = opts.registry
-    if (!registry) throw new Error('no default registry set')
-    return npm.config.getCredentialsByURI(registry)
-  }).then(({username, token}) => {
-    if (username) {
-      return username
-    } else if (token) {
-      return fetch.json('/-/whoami', {
-        ...opts,
-        spec
-      }).then(({username}) => {
-        if (username) {
-          return username
-        } else {
-          throw Object.assign(new Error(
-            'Your auth token is no longer valid. Please log in again.'
-          ), {code: 'ENEEDAUTH'})
-        }
-      })
-    } else {
-      // At this point, if they have a credentials object, it doesn't have a
-      // token or auth in it.  Probably just the default registry.
-      throw Object.assign(new Error(
-        'This command requires you to be logged in.'
-      ), {code: 'ENEEDAUTH'})
-    }
-  }).then(username => {
-    if (silent) {
-    } else if (opts.json) {
+  getIdentity(opts, spec).then(username => {
+    if (silent) {} else if (opts.json) {
       output(JSON.stringify(username))
     } else {
       output(username)
     }
-    return username
   }).then(() => cb(), cb)
 }