reverse password user order

Author: gkorland

index.js

@@ -109,7 +109,7 @@ function RedisClient (options, stream) {
     this.closing = false;
     this.server_info = {};
     this.auth_pass = options.auth_pass || options.password;
-    this.auth_user = options.auth_user;
+    this.auth_user = options.auth_user || options.user;
     this.selected_db = options.db; // Save the selected db here, used when reconnecting
     this.fire_strings = true; // Determine if strings or buffers should be written to the stream
     this.pipeline = false;
@@ -241,7 +241,7 @@ RedisClient.prototype.create_stream = function () {
     if (this.auth_pass !== undefined) {
         this.ready = true;
         // Fail silently as we might not be able to connect
-        this.auth(this.auth_pass, this.auth_user, function (err) {
+        this.auth(this.auth_user, this.auth_pass, function (err) {
             if (err && err.code !== 'UNCERTAIN_STATE') {
                 self.emit('error', err);
             }

lib/individualCommands.js

@@ -180,7 +180,7 @@ Multi.prototype.info = Multi.prototype.INFO = function info (section, callback)
     return this;
 };
 
-function auth_callback (self, pass, user, callback) {
+function auth_callback (self, user, pass, callback) {
     // Backward compatibility support for auth with password only
     if (user instanceof Function) {
         callback = user;
@@ -196,7 +196,7 @@ function auth_callback (self, pass, user, callback) {
                 // If redis is still loading the db, it will not authenticate and everything else will fail
                 debug('Redis still loading, trying to authenticate later');
                 setTimeout(function () {
-                    self.auth(pass, user, callback);
+                    self.auth(user, pass, callback);
                 }, 100);
                 return;
             }
@@ -205,7 +205,7 @@ function auth_callback (self, pass, user, callback) {
     };
 }
 
-RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (pass, user, callback) {
+RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (user, pass, callback) {
     debug('Sending auth to ' + this.address + ' id ' + this.connection_id);
 
     // Backward compatibility support for auth with password only
@@ -220,7 +220,7 @@ RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (pass, u
     this.ready = ready || this.offline_queue.length === 0;
     var tmp;
     if (user) {
-        tmp = this.internal_send_command(new Command('auth', [pass, user], auth_callback(this, pass, user, callback)));
+        tmp = this.internal_send_command(new Command('auth', [user, pass], auth_callback(this, user, pass, callback)));
     } else {
         tmp = this.internal_send_command(new Command('auth', [pass], auth_callback(this, pass, callback)));
     }
@@ -229,7 +229,7 @@ RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (pass, u
 };
 
 // Only works with batch, not in a transaction
-Multi.prototype.auth = Multi.prototype.AUTH = function auth (pass, user, callback) {
+Multi.prototype.auth = Multi.prototype.AUTH = function auth (user, pass, callback) {
     debug('Sending auth to ' + this.address + ' id ' + this.connection_id);
 
     // Backward compatibility support for auth with password only
@@ -241,7 +241,7 @@ Multi.prototype.auth = Multi.prototype.AUTH = function auth (pass, user, callbac
     this.auth_pass = pass;
     this.auth_user = user;
     if (user) {
-        this.queue.push(new Command('auth', [pass, user], auth_callback(this._client, callback)));
+        this.queue.push(new Command('auth', [user, pass], auth_callback(this._client, callback)));
     } else {
         this.queue.push(new Command('auth', [pass], auth_callback(this._client, callback)));
     }