Clear the URL params and hash after logging out.

sahat · Feb 12, 2015 · 7d118ab · 7d118ab
1 parent a133765
commit 7d118ab
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/examples/client/vendor/satellizer.js b/examples/client/vendor/satellizer.js
@@ -1,5 +1,5 @@
 /**
- * Satellizer 0.9.1
+ * Satellizer 0.9.2
  * (c) 2015 Sahat Yalkabov
  * License: MIT
  */
@@ -95,7 +95,7 @@
           url: '/auth/live',
           authorizationEndpoint: 'https://login.live.com/oauth20_authorize.srf',
           redirectUri: window.location.origin || window.location.protocol + '//' + window.location.host,
-          scope: ['wl.basic', 'wl.emails'],
+          scope: ['wl.emails'],
           scopeDelimiter: ' ',
           requiredUrlParams: ['display', 'scope'],
           display: 'popup',
@@ -274,8 +274,9 @@
         };
 
         shared.setToken = function(response, isLinking) {
-          var token = response.access_token || config.tokenRoot && response.data[config.tokenRoot] ?
-            response.data[config.tokenRoot][config.tokenName] : response.data[config.tokenName];
+          var token;
+          token = (response.access_token) || (config.tokenRoot && response.data[config.tokenRoot] ?
+            response.data[config.tokenRoot][config.tokenName] : response.data[config.tokenName]);
           var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
 
           if (!token) {
@@ -318,7 +319,7 @@
           delete $window.localStorage[tokenName];
 
           if (config.logoutRedirect) {
-            $location.path(config.logoutRedirect);
+            $location.url(config.logoutRedirect);
           }
           return $q.when();
         };

diff --git a/satellizer.js b/satellizer.js
@@ -319,7 +319,7 @@
           delete $window.localStorage[tokenName];
 
           if (config.logoutRedirect) {
-            $location.path(config.logoutRedirect);
+            $location.url(config.logoutRedirect);
           }
           return $q.when();
         };