Merge pull request #165 from luin/auth-error

Emit auth error for wrong password. Close #164

README.md

@@ -524,6 +524,7 @@ error    | client will emit `error` when an error occurs while connecting.<br>Ho
 close    | client will emit `close` when an established Redis server connection has closed.
 reconnecting | client will emit `reconnecting` after `close` when a reconnection will be made. The argument of the event is the time (in ms) before reconnecting.
 end     | client will emit `end` after `close` when no more reconnections will be made.
+authError | client will emit `authError` when the password specified in the options is wrong or the server doesn't require a password.
 
 You can also check out the `Redis#status` property to get the current connection status.
 

lib/redis/event_handler.js

@@ -12,9 +12,9 @@ exports.connectHandler = function (self) {
 
     // AUTH command should be processed before any other commands
     if (self.condition.auth) {
-      self.auth(self.condition.auth, function (err, res) {
-        if (err && err.message.match('no password is set')) {
-          console.warn('`auth` is specified in the client but not in the server.');
+      self.auth(self.condition.auth, function (err) {
+        if (err) {
+          self.emit('authError', err);
         }
       });
     }

test/functional/auth.js

@@ -41,18 +41,33 @@ describe('auth', function () {
     });
   });
 
-  it('should warn when the server doesn\'t need auth', function (done) {
-    stub(console, 'warn', function () {
-      console.warn.restore();
+  it('should emit "authError" when the server doesn\'t need auth', function (done) {
+    var server = new MockServer(17379, function (argv) {
+      if (argv[0] === 'auth' && argv[1] === 'pass') {
+        return new Error('ERR Client sent AUTH, but no password is set');
+      }
+    });
+    var redis = new Redis({ port: 17379, password: 'pass' });
+    redis.on('authError', function (error) {
+      expect(error).to.have.property('message', 'ERR Client sent AUTH, but no password is set');
       redis.disconnect();
       server.disconnect();
       done();
     });
+  });
+
+  it('should emit "authError" when the password is wrong', function (done) {
     var server = new MockServer(17379, function (argv) {
       if (argv[0] === 'auth' && argv[1] === 'pass') {
-        return new Error('ERR Client sent AUTH, but no password is set');
+        return new Error('ERR invalid password');
       }
     });
     var redis = new Redis({ port: 17379, password: 'pass' });
+    redis.on('authError', function (error) {
+      expect(error).to.have.property('message', 'ERR invalid password');
+      redis.disconnect();
+      server.disconnect();
+      done();
+    });
   });
 });