Fix bug in GoogleTokenVerifier causing it never to work.

enginoid · enginoid · commit 7ee40072cda0 · 2013-05-18T18:29:32.000Z
Apparently, I was horribly misusing constants.  Comprehensive tests would have uncovered this.  I'm not convinced that I'm doing the right thing by injecting services inside the verification function, and this particular section (the verification function and how best to make that customizable) could really use a second pair of eyes.

It would help to know a pattern for configuring functions that use services inside providers.
diff --git a/src/js/googleOauth.js b/src/js/googleOauth.js
@@ -8,33 +8,38 @@
  */
 angular.module('googleOauth', ['angularOauth']).
 
-  constant('GoogleTokenVerifier', function($http) {
-    return function(config, accessToken, deferred) {
+  constant('GoogleTokenVerifier', function(config, accessToken, deferred) {
+    var $injector = angular.injector(['ng']);
+    return $injector.invoke(['$http', '$rootScope', function($http, $rootScope) {
       var verificationEndpoint = 'https://www.googleapis.com/oauth2/v1/tokeninfo';
-      $http.get(verificationEndpoint, {params: {access_token: accessToken}}).
-        success(function(data) {
-          if (data.audience == config.clientId) {
-            deferred.resolve(data);
-          } else {
-            deferred.reject({name: 'invalid_audience'});
-          }
-        }).
-        error(function(data, status, headers, config) {
-          deferred.reject({
-            name: 'error_response',
-            data: data,
-            status: status,
-            headers: headers,
-            config: config
+
+      $rootScope.$apply(function() {
+        $http({method: 'GET', url: verificationEndpoint, params: {access_token: accessToken}}).
+          success(function(data) {
+            if (data.audience == config.clientId) {
+              deferred.resolve(data);
+            } else {
+              deferred.reject({name: 'invalid_audience'});
+            }
+          }).
+          error(function(data, status, headers, config) {
+            deferred.reject({
+              name: 'error_response',
+              data: data,
+              status: status,
+              headers: headers,
+              config: config
+            });
           });
-        });
-    }
+      });
+
+      return deferred;
+    }]);
   }).
 
   config(function(TokenProvider, GoogleTokenVerifier) {
     TokenProvider.extendConfig({
       authorizationEndpoint: 'https://accounts.google.com/o/oauth2/auth',
-      tokenVerifierEndpoint: 'https://www.googleapis.com/oauth2/v1/tokeninfo',
       scopes: ["https://www.googleapis.com/auth/userinfo.email"],
       verifyFunc: GoogleTokenVerifier
     });
