npm: Upgrade to 1.1.55

1 files changed, 20 insertions, 26 deletions

diff --git a/deps/npm/node_modules/npm-registry-client/lib/adduser.js b/deps/npm/node_modules/npm-registry-client/lib/adduser.js
index f940ca1ca5..7106e444d7 100644
--- a/deps/npm/node_modules/npm-registry-client/lib/adduser.js
+++ b/deps/npm/node_modules/npm-registry-client/lib/adduser.js
@@ -1,18 +1,12 @@
-
 module.exports = adduser
 
-var uuid = require("node-uuid")
-  , crypto
-
-try {
-} catch (ex) {}
+var crypto = require('crypto')
 
 function sha (s) {
   return crypto.createHash("sha1").update(s).digest("hex")
 }
 
 function adduser (username, password, email, cb) {
-  if (!crypto) crypto = require("crypto")
 
   password = ("" + (password || "")).trim()
   if (!password) return cb(new Error("No password supplied."))
@@ -27,7 +21,7 @@ function adduser (username, password, email, cb) {
     "Sorry, ':' chars are not allowed in passwords.\n"+
     "See <https://issues.apache.org/jira/browse/COUCHDB-969> for why."))
 
-  var salt = uuid()
+  var salt = crypto.randomBytes(30).toString('hex')
     , userobj =
       { name : username
       , salt : salt
@@ -41,18 +35,18 @@ function adduser (username, password, email, cb) {
 
   // pluck off any other username/password/token.  it needs to be the
   // same as the user we're becoming now.  replace them on error.
-  var pre = { username: this.username
-            , password: this.password
-            , auth: this.auth
-            , token: this.token }
-
-  this.token = null
+  var pre = { username: this.conf.get('username')
+            , password: this.conf.get('_password')
+            , auth: this.conf.get('_auth')
+            , token: this.conf.get('_token') }
+
+  this.conf.del('_token')
+  this.conf.del('username')
+  this.conf.del('_auth')
+  this.conf.del('_password')
   if (this.couchLogin) {
     this.couchLogin.token = null
   }
-  this.username = null
-  this.password = null
-  this.auth = null
 
   cb = done.call(this, cb, pre)
 
@@ -72,13 +66,13 @@ function adduser (username, password, email, cb) {
     , function (error, data, json, response) {
         // if it worked, then we just created a new user, and all is well.
         // but if we're updating a current record, then it'll 409 first
-        if (error && !this.auth) {
+        if (error && !this.conf.get('_auth')) {
           // must be trying to re-auth on a new machine.
           // use this info as auth
           var b = new Buffer(username + ":" + password)
-          this.auth = b.toString("base64")
-          this.username = username
-          this.password = password
+          this.conf.set('_auth', b.toString("base64"))
+          this.conf.set('username', username)
+          this.conf.set('_password', password)
         }
 
         if (!error || !response || response.statusCode !== 409) {
@@ -114,16 +108,16 @@ function done (cb, pre) {
     }
 
     // there was some kind of error, re-instate previous auth/token/etc.
-    this.token = pre.token
+    this.conf.set('_token', pre.token)
     if (this.couchLogin) {
-      this.couchLogin.token = this.token
+      this.couchLogin.token = pre.token
       if (this.couchLogin.tokenSet) {
         this.couchLogin.tokenSet(pre.token)
       }
     }
-    this.username = pre.username
-    this.password = pre.password
-    this.auth = pre.auth
+    this.conf.set('username', pre.username)
+    this.conf.set('_password', pre.password)
+    this.conf.set('_auth', pre.auth)
 
     this.log.verbose("adduser", "back", [error, data, json])
     if (!error) {