connection: refetch token if invalid.

lib/common/connection.js

@@ -22,6 +22,7 @@
 'use strict';
 
 var events = require('events');
+var extend = require('extend');
 var fs = require('fs');
 var GAPIToken = require('gapitoken');
 var nodeutil = require('util');
@@ -233,7 +234,15 @@ Connection.prototype.req = function(requestOptions, callback) {
       callback(err);
       return;
     }
-    that.requester(authorizedReq, callback);
+    that.requester(authorizedReq, function(err) {
+      if (err && err.code === 401) {
+        // Token expired. Try to fetch a new one.
+        that.token = null;
+        that.req(requestOptions, callback);
+        return;
+      }
+      callback(err);
+    });
   });
 };
 
@@ -246,10 +255,10 @@ Connection.prototype.req = function(requestOptions, callback) {
  * @example
  * conn.createAuthorizedReq({}, function(err) {});
  */
-Connection.prototype.createAuthorizedReq = function(reqOpts, callback) {
+Connection.prototype.createAuthorizedReq = function(requestOptions, callback) {
   var that = this;
-  // Add user agent.
-  reqOpts.headers = reqOpts.headers || {};
+
+  var reqOpts = extend(true, {}, requestOptions, { headers: {} });
 
   if (reqOpts.headers['User-Agent']) {
     reqOpts.headers['User-Agent'] += '; ' + USER_AGENT;
@@ -305,9 +314,11 @@ Connection.prototype.isConnected = function() {
  * @return {object} Authorized request options.
  */
 Connection.prototype.authorizeReq = function(requestOptions) {
-  requestOptions.headers = requestOptions.headers || {};
-  requestOptions.headers.Authorization = 'Bearer ' + this.token.accessToken;
-  return requestOptions;
+  return extend(true, {}, requestOptions, {
+    headers: {
+      Authorization: 'Bearer ' + this.token.accessToken
+    }
+  });
 };
 
 /**

test/common/connection.js

@@ -106,6 +106,23 @@ describe('Connection', function() {
       conn.req({ uri: 'https://someuri' }, function() {});
     });
 
+    it('should fetch a new token if API returns a 401', function() {
+      var fetchTokenCount = 0;
+      conn.fetchToken = function(callback) {
+        fetchTokenCount++;
+        callback(null, tokenNeverExpires);
+      };
+      conn.requester = function(req, callback) {
+        if (fetchTokenCount === 1) {
+          callback({ code: 401 });
+        } else {
+          callback(null);
+        }
+      };
+      conn.req({ uri: 'https://someuri' }, function() {});
+      assert.equal(fetchTokenCount, 2);
+    });
+
     it('should pass error to callback', function(done) {
       var error = new Error('Something terrible happened.');
       conn.fetchToken = function(cb) {