Parse errors from Google+ API.

Author: jaredhanson

lib/errors/googleplusapierror.js

@@ -0,0 +1,25 @@
+/**
+ * `GooglePlusAPIError` error.
+ *
+ * References:
+ *   - https://developers.google.com/+/web/api/rest/
+ *
+ * @constructor
+ * @param {string} [message]
+ * @param {number} [code]
+ * @access public
+ */
+function GooglePlusAPIError(message, code) {
+  Error.call(this);
+  Error.captureStackTrace(this, arguments.callee);
+  this.name = 'LiveConnectAPIError';
+  this.message = message;
+  this.code = code;
+}
+
+// Inherit from `Error`.
+GooglePlusAPIError.prototype.__proto__ = Error.prototype;
+
+
+// Expose constructor.
+module.exports = GooglePlusAPIError;

lib/oauth2.js

@@ -4,7 +4,8 @@
 var OAuth2Strategy = require('passport-oauth').OAuth2Strategy
   , util = require('util')
   , GooglePlusProfile = require('./profile/googleplus')
-  , InternalOAuthError = require('passport-oauth').InternalOAuthError;
+  , InternalOAuthError = require('passport-oauth').InternalOAuthError
+  , GooglePlusAPIError = require('./errors/googleplusapierror');
 
 var DEPRECATED_SCOPES = {
   'https://www.googleapis.com/auth/userinfo.profile': 'profile',
@@ -92,18 +93,15 @@ Strategy.prototype.userProfile = function(accessToken, done) {
     var json;
 
     if (err) {
-      // TODO
-      /*
       if (err.data) {
         try {
           json = JSON.parse(err.data);
         } catch (_) {}
       }
-        
+      
       if (json && json.error) {
-        return done(new LiveConnectAPIError(json.error.message, json.error.code));
+        return done(new GooglePlusAPIError(json.error.message, json.error.code));
       }
-      */
       return done(new InternalOAuthError('Failed to fetch user profile', err));
     }
 

test/strategy.profile.test.js

@@ -99,6 +99,38 @@ describe('Strategy#userProfile', function() {
     });
   });
 
+  describe('error caused by invalid token when using Google+ API', function() {
+    var strategy = new GoogleStrategy({
+        clientID: 'ABC123',
+        clientSecret: 'secret',
+        userProfileURL: 'https://www.googleapis.com/plus/v1/people/me'
+      }, function() {});
+    
+    strategy._oauth2.get = function(url, accessToken, callback) {
+      if (url != 'https://www.googleapis.com/plus/v1/people/me') { return callback(new Error('incorrect url argument')); }
+      
+      var body = '{\n "error": {\n  "errors": [\n   {\n    "domain": "global",\n    "reason": "authError",\n    "message": "Invalid Credentials",\n    "locationType": "header",\n    "location": "Authorization"\n   }\n  ],\n  "code": 401,\n  "message": "Invalid Credentials"\n }\n}\n';
+      callback({ statusCode: 401, data: body });
+    };
+      
+    var err, profile;
+    
+    before(function(done) {
+      strategy.userProfile('invalid-token', function(e, p) {
+        err = e;
+        profile = p;
+        done();
+      });
+    });
+  
+    it('should error', function() {
+      expect(err).to.be.an.instanceOf(Error);
+      expect(err.constructor.name).to.equal('GooglePlusAPIError');
+      expect(err.message).to.equal("Invalid Credentials");
+      expect(err.code).to.equal(401);
+    });
+  }); // error caused by invalid token
+  
   describe('error caused by malformed response', function() {
     var strategy =  new GoogleStrategy({
         clientID: 'ABC123',