diff options
author | Forrest L Norvell <forrest@npmjs.com> | 2015-03-27 03:56:05 -0700 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2015-03-30 14:34:39 -0700 |
commit | f166cdecf161dd3feb2870dd7f022f046dca2ed2 (patch) | |
tree | 9227c6b8f729cf090ab726bdfa77c2d203f75497 /deps/npm/node_modules/npm-registry-client/lib/adduser.js | |
parent | 73de13511d2cccec6852579b8a5beeb5aa423e1b (diff) | |
download | android-node-v8-f166cdecf161dd3feb2870dd7f022f046dca2ed2.tar.gz android-node-v8-f166cdecf161dd3feb2870dd7f022f046dca2ed2.tar.bz2 android-node-v8-f166cdecf161dd3feb2870dd7f022f046dca2ed2.zip |
deps: upgrade npm to 2.7.4
Diffstat (limited to 'deps/npm/node_modules/npm-registry-client/lib/adduser.js')
-rw-r--r-- | deps/npm/node_modules/npm-registry-client/lib/adduser.js | 82 |
1 files changed, 41 insertions, 41 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 5f4abc8efd..bf0a048578 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/adduser.js +++ b/deps/npm/node_modules/npm-registry-client/lib/adduser.js @@ -1,45 +1,45 @@ module.exports = adduser -var url = require("url") -var assert = require("assert") +var url = require('url') +var assert = require('assert') function adduser (uri, params, cb) { - assert(typeof uri === "string", "must pass registry URI to adduser") + assert(typeof uri === 'string', 'must pass registry URI to adduser') assert( - params && typeof params === "object", - "must pass params to adduser" + params && typeof params === 'object', + 'must pass params to adduser' ) - assert(typeof cb === "function", "must pass callback to adduser") + assert(typeof cb === 'function', 'must pass callback to adduser') - assert(params.auth && typeof params.auth, "must pass auth to adduser") + assert(params.auth && typeof params.auth, 'must pass auth to adduser') var auth = params.auth - assert(typeof auth.username === "string", "must include username in auth") - assert(typeof auth.password === "string", "must include password in auth") - assert(typeof auth.email === "string", "must include email in auth") + assert(typeof auth.username === 'string', 'must include username in auth') + assert(typeof auth.password === 'string', 'must include password in auth') + assert(typeof auth.email === 'string', 'must include email in auth') // normalize registry URL - if (uri.slice(-1) !== "/") uri += "/" + if (uri.slice(-1) !== '/') uri += '/' var username = auth.username.trim() var password = auth.password.trim() var email = auth.email.trim() // validation - if (!username) return cb(new Error("No username supplied.")) - if (!password) return cb(new Error("No password supplied.")) - if (!email) return cb(new Error("No email address supplied.")) + if (!username) return cb(new Error('No username supplied.')) + if (!password) return cb(new Error('No password supplied.')) + if (!email) return cb(new Error('No email address supplied.')) if (!email.match(/^[^@]+@[^\.]+\.[^\.]+/)) { - return cb(new Error("Please use a real email address.")) + return cb(new Error('Please use a real email address.')) } var userobj = { - _id : "org.couchdb.user:"+username, - name : username, - password : password, - email : email, - type : "user", - roles : [], - date : new Date().toISOString() + _id: 'org.couchdb.user:' + username, + name: username, + password: password, + email: email, + type: 'user', + roles: [], + date: new Date().toISOString() } var token = this.config.couchToken @@ -48,22 +48,22 @@ function adduser (uri, params, cb) { cb = done.call(this, token, cb) var logObj = Object.keys(userobj).map(function (k) { - if (k === "password") return [k, "XXXXX"] + if (k === 'password') return [k, 'XXXXX'] return [k, userobj[k]] }).reduce(function (s, kv) { s[kv[0]] = kv[1] return s }, {}) - this.log.verbose("adduser", "before first PUT", logObj) + this.log.verbose('adduser', 'before first PUT', logObj) var client = this - uri = url.resolve(uri, "-/user/org.couchdb.user:" + encodeURIComponent(username)) + uri = url.resolve(uri, '-/user/org.couchdb.user:' + encodeURIComponent(username)) var options = { - method : "PUT", - body : userobj, - auth : auth + method: 'PUT', + body: userobj, + auth: auth } this.request( uri, @@ -73,21 +73,21 @@ function adduser (uri, params, cb) { return cb(error, data, json, response) } - client.log.verbose("adduser", "update existing user") + client.log.verbose('adduser', 'update existing user') return client.request( - uri+"?write=true", - { body : userobj, auth : auth }, + uri + '?write=true', + { body: userobj, auth: auth }, function (er, data, json, response) { if (er || data.error) { return cb(er, data, json, response) } Object.keys(data).forEach(function (k) { - if (!userobj[k] || k === "roles") { + if (!userobj[k] || k === 'roles') { userobj[k] = data[k] } }) - client.log.verbose("adduser", "userobj", logObj) - client.request(uri+"/-rev/"+userobj._rev, options, cb) + client.log.verbose('adduser', 'userobj', logObj) + client.request(uri + '/-rev/' + userobj._rev, options, cb) } ) } @@ -107,19 +107,19 @@ function adduser (uri, params, cb) { } } - client.log.verbose("adduser", "back", [error, data, json]) + client.log.verbose('adduser', 'back', [error, data, json]) if (!error) { error = new Error( - (response && response.statusCode || "") + " " + - "Could not create user\n" + JSON.stringify(data) + (response && response.statusCode || '') + ' ' + + 'Could not create user\n' + JSON.stringify(data) ) } if (response && (response.statusCode === 401 || response.statusCode === 403)) { - client.log.warn("adduser", "Incorrect username or password\n" + - "You can reset your account by visiting:\n" + - "\n" + - " https://npmjs.org/forgot\n") + client.log.warn('adduser', 'Incorrect username or password\n' + + 'You can reset your account by visiting:\n' + + '\n' + + ' https://npmjs.org/forgot\n') } return cb(error) |