fixed the order of .config block so that provider is registered befor…

…e it can be used Fixes #200
sahat · Nov 26, 2014 · 3cff252 · 3cff252
1 parent eb8413d
commit 3cff252
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 202 deletions.
diff --git a/dist/satellizer.js b/dist/satellizer.js
@@ -4,25 +4,7 @@
  * License: MIT
  */
 
-angular.module('satellizer', [])
-  .config(['$httpProvider', '$authProvider', 'satellizer.config', function($httpProvider, $authProvider, config) {
-    $httpProvider.interceptors.push(['$q', function($q) {
-      var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-      return {
-        request: function(httpConfig) {
-          var token = localStorage.getItem(tokenName);
-          if (token) {
-            token = config.authHeader === 'Authorization' ? 'Bearer ' + token : token;
-            httpConfig.headers[config.authHeader] = token;
-          }
-          return httpConfig;
-        },
-        responseError: function(response) {
-          return $q.reject(response);
-        }
-      };
-    }]);
-  }]);
+angular.module('satellizer', []);
 
 angular.module('satellizer')
   .constant('satellizer.config', {
@@ -111,77 +93,6 @@ angular.module('satellizer')
     }
   });
 
-angular.module('satellizer')
-  .factory('satellizer.shared', [
-    '$q',
-    '$window',
-    '$location',
-    'satellizer.config',
-    function($q, $window, $location, config) {
-      var shared = {};
-
-      shared.getToken = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        return $window.localStorage[tokenName];
-      };
-
-      shared.getPayload = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        var token = $window.localStorage[tokenName];
-
-        if (token && token.split('.').length === 3) {
-          var base64Url = token.split('.')[1];
-          var base64 = base64Url.replace('-', '+').replace('_', '/');
-          return JSON.parse($window.atob(base64));
-        }
-      };
-
-      shared.setToken = function(response, isLinking) {
-        var token = response.access_token || response.data[config.tokenName];
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-
-        if (!token) {
-          throw new Error('Expecting a token named "' + config.tokenName + '" but instead got: ' + JSON.stringify(response.data));
-        }
-
-        $window.localStorage[tokenName] = token;
-
-        if (config.loginRedirect && !isLinking) {
-          $location.path(config.loginRedirect);
-        }
-      };
-
-      shared.isAuthenticated = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        var token = $window.localStorage[tokenName];
-
-        if (token) {
-          if (token.split('.').length === 3) {
-            var base64Url = token.split('.')[1];
-            var base64 = base64Url.replace('-', '+').replace('_', '/');
-            var exp = JSON.parse($window.atob(base64)).exp;
-            return Math.round(new Date().getTime() / 1000) <= exp;
-          } else {
-            return true;
-          }
-        }
-
-        return false;
-      };
-
-      shared.logout = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        delete $window.localStorage[tokenName];
-
-        if (config.logoutRedirect) {
-          $location.path(config.logoutRedirect);
-        }
-        return $q.when();
-      };
-
-      return shared;
-    }]);
-
 angular.module('satellizer')
   .provider('$auth', ['satellizer.config', function(config) {
     Object.defineProperties(this, {
@@ -309,6 +220,77 @@ angular.module('satellizer')
 
   }]);
 
+angular.module('satellizer')
+  .factory('satellizer.shared', [
+    '$q',
+    '$window',
+    '$location',
+    'satellizer.config',
+    function($q, $window, $location, config) {
+      var shared = {};
+
+      shared.getToken = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        return $window.localStorage[tokenName];
+      };
+
+      shared.getPayload = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        var token = $window.localStorage[tokenName];
+
+        if (token && token.split('.').length === 3) {
+          var base64Url = token.split('.')[1];
+          var base64 = base64Url.replace('-', '+').replace('_', '/');
+          return JSON.parse($window.atob(base64));
+        }
+      };
+
+      shared.setToken = function(response, isLinking) {
+        var token = response.access_token || response.data[config.tokenName];
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+
+        if (!token) {
+          throw new Error('Expecting a token named "' + config.tokenName + '" but instead got: ' + JSON.stringify(response.data));
+        }
+
+        $window.localStorage[tokenName] = token;
+
+        if (config.loginRedirect && !isLinking) {
+          $location.path(config.loginRedirect);
+        }
+      };
+
+      shared.isAuthenticated = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        var token = $window.localStorage[tokenName];
+
+        if (token) {
+          if (token.split('.').length === 3) {
+            var base64Url = token.split('.')[1];
+            var base64 = base64Url.replace('-', '+').replace('_', '/');
+            var exp = JSON.parse($window.atob(base64)).exp;
+            return Math.round(new Date().getTime() / 1000) <= exp;
+          } else {
+            return true;
+          }
+        }
+
+        return false;
+      };
+
+      shared.logout = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        delete $window.localStorage[tokenName];
+
+        if (config.logoutRedirect) {
+          $location.path(config.logoutRedirect);
+        }
+        return $q.when();
+      };
+
+      return shared;
+    }]);
+
 angular.module('satellizer')
   .factory('satellizer.popup', [
     '$q',
@@ -600,6 +582,30 @@ angular.module('satellizer')
     };
   });
 
+angular.module('satellizer')
+  .config([
+    '$httpProvider',
+    '$authProvider',
+    'satellizer.config',
+    function($httpProvider, $authProvider, config) {
+      $httpProvider.interceptors.push(['$q', function($q) {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        return {
+          request: function(httpConfig) {
+            var token = localStorage.getItem(tokenName);
+            if (token) {
+              token = config.authHeader === 'Authorization' ? 'Bearer ' + token : token;
+              httpConfig.headers[config.authHeader] = token;
+            }
+            return httpConfig;
+          },
+          responseError: function(response) {
+            return $q.reject(response);
+          }
+        };
+      }]);
+    }]);
+
 // Base64.js Polyfill (@davidchambers)
 (function() {
   var object = typeof exports != 'undefined' ? exports : this;

diff --git a/dist/satellizer.min.js b/dist/satellizer.min.js
diff --git a/examples/client/vendor/satellizer.js b/examples/client/vendor/satellizer.js
@@ -4,25 +4,7 @@
  * License: MIT
  */
 
-angular.module('satellizer', [])
-  .config(['$httpProvider', '$authProvider', 'satellizer.config', function($httpProvider, $authProvider, config) {
-    $httpProvider.interceptors.push(['$q', function($q) {
-      var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-      return {
-        request: function(httpConfig) {
-          var token = localStorage.getItem(tokenName);
-          if (token) {
-            token = config.authHeader === 'Authorization' ? 'Bearer ' + token : token;
-            httpConfig.headers[config.authHeader] = token;
-          }
-          return httpConfig;
-        },
-        responseError: function(response) {
-          return $q.reject(response);
-        }
-      };
-    }]);
-  }]);
+angular.module('satellizer', []);
 
 angular.module('satellizer')
   .constant('satellizer.config', {
@@ -111,77 +93,6 @@ angular.module('satellizer')
     }
   });
 
-angular.module('satellizer')
-  .factory('satellizer.shared', [
-    '$q',
-    '$window',
-    '$location',
-    'satellizer.config',
-    function($q, $window, $location, config) {
-      var shared = {};
-
-      shared.getToken = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        return $window.localStorage[tokenName];
-      };
-
-      shared.getPayload = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        var token = $window.localStorage[tokenName];
-
-        if (token && token.split('.').length === 3) {
-          var base64Url = token.split('.')[1];
-          var base64 = base64Url.replace('-', '+').replace('_', '/');
-          return JSON.parse($window.atob(base64));
-        }
-      };
-
-      shared.setToken = function(response, isLinking) {
-        var token = response.access_token || response.data[config.tokenName];
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-
-        if (!token) {
-          throw new Error('Expecting a token named "' + config.tokenName + '" but instead got: ' + JSON.stringify(response.data));
-        }
-
-        $window.localStorage[tokenName] = token;
-
-        if (config.loginRedirect && !isLinking) {
-          $location.path(config.loginRedirect);
-        }
-      };
-
-      shared.isAuthenticated = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        var token = $window.localStorage[tokenName];
-
-        if (token) {
-          if (token.split('.').length === 3) {
-            var base64Url = token.split('.')[1];
-            var base64 = base64Url.replace('-', '+').replace('_', '/');
-            var exp = JSON.parse($window.atob(base64)).exp;
-            return Math.round(new Date().getTime() / 1000) <= exp;
-          } else {
-            return true;
-          }
-        }
-
-        return false;
-      };
-
-      shared.logout = function() {
-        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
-        delete $window.localStorage[tokenName];
-
-        if (config.logoutRedirect) {
-          $location.path(config.logoutRedirect);
-        }
-        return $q.when();
-      };
-
-      return shared;
-    }]);
-
 angular.module('satellizer')
   .provider('$auth', ['satellizer.config', function(config) {
     Object.defineProperties(this, {
@@ -309,6 +220,77 @@ angular.module('satellizer')
 
   }]);
 
+angular.module('satellizer')
+  .factory('satellizer.shared', [
+    '$q',
+    '$window',
+    '$location',
+    'satellizer.config',
+    function($q, $window, $location, config) {
+      var shared = {};
+
+      shared.getToken = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        return $window.localStorage[tokenName];
+      };
+
+      shared.getPayload = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        var token = $window.localStorage[tokenName];
+
+        if (token && token.split('.').length === 3) {
+          var base64Url = token.split('.')[1];
+          var base64 = base64Url.replace('-', '+').replace('_', '/');
+          return JSON.parse($window.atob(base64));
+        }
+      };
+
+      shared.setToken = function(response, isLinking) {
+        var token = response.access_token || response.data[config.tokenName];
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+
+        if (!token) {
+          throw new Error('Expecting a token named "' + config.tokenName + '" but instead got: ' + JSON.stringify(response.data));
+        }
+
+        $window.localStorage[tokenName] = token;
+
+        if (config.loginRedirect && !isLinking) {
+          $location.path(config.loginRedirect);
+        }
+      };
+
+      shared.isAuthenticated = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        var token = $window.localStorage[tokenName];
+
+        if (token) {
+          if (token.split('.').length === 3) {
+            var base64Url = token.split('.')[1];
+            var base64 = base64Url.replace('-', '+').replace('_', '/');
+            var exp = JSON.parse($window.atob(base64)).exp;
+            return Math.round(new Date().getTime() / 1000) <= exp;
+          } else {
+            return true;
+          }
+        }
+
+        return false;
+      };
+
+      shared.logout = function() {
+        var tokenName = config.tokenPrefix ? config.tokenPrefix + '_' + config.tokenName : config.tokenName;
+        delete $window.localStorage[tokenName];
+
+        if (config.logoutRedirect) {
+          $location.path(config.logoutRedirect);
+        }
+        return $q.when();
+      };
+
+      return shared;
+    }]);
+
 angular.module('satellizer')
   .factory('satellizer.popup', [
     '$q',