add back error handling.

Author: stephenplusplus

lib/common/connection.js

@@ -129,10 +129,12 @@ Connection.prototype.connect = function() {
   this.isConnecting = true;
   // retrieves an access token
   this.fetchToken(function(err, token) {
-    if (!err) {
-      that.token = token;
-    }
     that.isConnecting = false;
+    if (err) {
+      that.emit('connected', err);
+      return;
+    }
+    that.token = token;
     that.emit('connected');
   });
 };
@@ -249,7 +251,11 @@ Connection.prototype.createAuthorizedReq = function(reqOpts, callback) {
     reqOpts.headers['User-Agent'] = USER_AGENT;
   }
 
-  function onConnected() {
+  function onConnected(err) {
+    if (err) {
+      callback(err);
+      return;
+    }
     callback(null, that.authorizeReq(reqOpts));
   }
 
@@ -258,7 +264,7 @@ Connection.prototype.createAuthorizedReq = function(reqOpts, callback) {
     return;
   }
 
-  this.on('connected', onConnected);
+  this.once('connected', onConnected);
 
   if (!this.isConnecting) {
     this.connect();

test/common/connection.js

@@ -77,6 +77,17 @@ describe('Connection', function() {
       conn.req({ uri: 'https://someuri' }, function() {});
     });
 
+    it('should pass error to callback', function(done) {
+      var error = new Error('Something terrible happened.');
+      conn.fetchToken = function(cb) {
+        cb(error);
+      };
+      conn.req({}, function(err) {
+        assert.equal(error, err);
+        done();
+      });
+    });
+
     it('should make other requests wait while connecting', function(done) {
       var numTokenFetches = 0;
       var requestedUris = [];