pass isLinking param to oauth.authenticate() to prevent redirect afte…

…r authentication (linking)
sahat · Sep 16, 2014 · eb6ba61 · eb6ba61
1 parent 62e560c
commit eb6ba61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/examples/client/vendor/satellizer.js b/examples/client/vendor/satellizer.js
@@ -194,12 +194,12 @@
       function($q, $window, $location, config) {
         var shared = {};
 
-        shared.saveToken = function(response, deferred) {
+        shared.saveToken = function(response, deferred, isLinking) {
           var token = response.data[config.tokenName];
           var namespace = [config.tokenPrefix, config.tokenName].join('_');
           $window.localStorage[namespace] = token;
 
-          if (config.loginRedirect) {
+          if (config.loginRedirect && !isLinking) {
             $location.path(config.loginRedirect);
           }
 
@@ -252,11 +252,7 @@
 
           provider.open(config.providers[name])
             .then(function(response) {
-              if (isLinking) {
-                deferred.resolve(response);
-              } else {
-                shared.saveToken(response, deferred);
-              }
+              shared.saveToken(response, deferred, isLinking);
             })
             .catch(function(response) {
               deferred.reject(response);

diff --git a/satellizer.js b/satellizer.js
@@ -194,12 +194,12 @@
       function($q, $window, $location, config) {
         var shared = {};
 
-        shared.saveToken = function(response, deferred) {
+        shared.saveToken = function(response, deferred, isLinking) {
           var token = response.data[config.tokenName];
           var namespace = [config.tokenPrefix, config.tokenName].join('_');
           $window.localStorage[namespace] = token;
 
-          if (config.loginRedirect) {
+          if (config.loginRedirect && !isLinking) {
             $location.path(config.loginRedirect);
           }
 
@@ -252,11 +252,7 @@
 
           provider.open(config.providers[name])
             .then(function(response) {
-              if (isLinking) {
-                deferred.resolve(response);
-              } else {
-                shared.saveToken(response, deferred);
-              }
+              shared.saveToken(response, deferred, isLinking);
             })
             .catch(function(response) {
               deferred.reject(response);

diff --git a/satellizer.min.js b/satellizer.min.js