whoami: Don't crash if we don't have a username

The 'credentials' var will always be truthy, because there's
always *some* registry URI.

See also npm/npmconf#40

1 files changed, 9 insertions, 10 deletions

diff --git a/lib/whoami.js b/lib/whoami.js
index 654c539e6..b33f93743 100644
--- a/lib/whoami.js
+++ b/lib/whoami.js
@@ -18,23 +18,22 @@ function whoami (args, silent, cb) {
   if (credentials) {
     if (credentials.username) {
       if (!silent) console.log(credentials.username)
-      process.nextTick(cb.bind(this, null, credentials.username))
+      return process.nextTick(cb.bind(this, null, credentials.username))
     }
     else if (credentials.token) {
-      npm.registry.whoami(registry, function (er, username) {
+      return npm.registry.whoami(registry, function (er, username) {
         if (er) return cb(er)
 
         if (!silent) console.log(username)
         cb(null, username)
       })
     }
-    else {
-      process.nextTick(cb.bind(this, new Error("credentials without username or token")))
-    }
-  }
-  else {
-    var msg = "Not authed.  Run 'npm adduser'"
-    if (!silent) console.log(msg)
-      process.nextTick(cb.bind(this, null, msg))
   }
+
+  // At this point, if they have a credentials object, it doesn't
+  // have a token or auth in it.  Probably just the default
+  // registry.
+  var msg = "Not authed.  Run 'npm adduser'"
+  if (!silent) console.log(msg)
+  process.nextTick(cb.bind(this, null, msg))
 }