Merge pull request #27 from jmangelo/fix/incorrect-hash-handling

Replace direct query of window.location.hash with the location service
auth0 · Mar 29, 2017 · 4dcbfa7 · 4dcbfa7
2 parents 05508f7 + 5bec6e1
commit 4dcbfa7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/angular-lock.js b/angular-lock.js
@@ -26,7 +26,8 @@
 
     this.$get = [
       '$rootScope',
-      function($rootScope) {
+      '$location',
+      function($rootScope, $location) {
         var Lock = new Auth0Lock(this.clientID, this.domain, this.options);
         var credentials = { clientID: this.clientID, domain: this.domain };
         var shouldVerifyIdToken = true;
@@ -83,10 +84,7 @@
             if (/id_token=/.test(location) || /error=/.test(location)) {
               var webAuth = new auth0.WebAuth(credentials);
 
-              // Hash simulation for html5Mode(true).
-              var hash = window.location.hash
-                ? window.location.hash
-                : '#' + location.replace(/http.?:\/\/[^/]+/, '').slice(1);
+              var hash = $location.hash();
 
               webAuth.parseHash(
                 { hash: hash, _idTokenVerification: shouldVerifyIdToken },

diff --git a/dist/angular-lock.js b/dist/angular-lock.js
@@ -26,7 +26,8 @@
 
     this.$get = [
       '$rootScope',
-      function($rootScope) {
+      '$location',
+      function($rootScope, $location) {
         var Lock = new Auth0Lock(this.clientID, this.domain, this.options);
         var credentials = { clientID: this.clientID, domain: this.domain };
         var shouldVerifyIdToken = true;
@@ -83,10 +84,7 @@
             if (/id_token=/.test(location) || /error=/.test(location)) {
               var webAuth = new auth0.WebAuth(credentials);
 
-              // Hash simulation for html5Mode(true).
-              var hash = window.location.hash
-                ? window.location.hash
-                : '#' + location.replace(/http.?:\/\/[^/]+/, '').slice(1);
+              var hash = $location.hash();
 
               webAuth.parseHash(
                 { hash: hash, _idTokenVerification: shouldVerifyIdToken },

diff --git a/dist/angular-lock.min.js b/dist/angular-lock.min.js