Merge pull request #24 from chrisiconolly/master

Adds the ability to whitelist local requests
nabil-boag · Dec 10, 2015 · 9c844bf · 9c844bf
2 parents 2e297bf + e9c6574
commit 9c844bf
Show file tree

Hide file tree

Showing 8 changed files with 233 additions and 126 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -40,6 +40,7 @@ module.exports = function (grunt) {
   grunt.registerTask('workflow:dev', [
     'connect:dev',
     'build',
+    'test:dev',
     'open:dev',
     'watch:dev'
   ]);

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Add the `ng.httpLoader` module as a dependency in your application:
 angular.module('demo', ['ng.httpLoader'])
 ```
 
-Whitelist the domains that you want the loader to show for:
+Whitelist the external domains that you want the loader to show for:
 
 ```javascript
 .config([
@@ -54,6 +54,19 @@ Whitelist the domains that you want the loader to show for:
 ])
 ```
 
+You can whitelist requests to the local server:
+
+```javascript
+.config([
+  'httpMethodInterceptorProvider',
+  function (httpMethodInterceptorProvider) {
+    // ...
+    httpMethodInterceptorProvider.whitelistLocalRequests();
+    // ...
+  }
+])
+```
+
 Add an HTML element with the `ng-http-loader` directive. This will be displayed
 while requests are pending:
 

diff --git a/app/package/js/angular-http-loader.js b/app/package/js/angular-http-loader.js
@@ -134,7 +134,8 @@ angular
   .module('ng.httpLoader.httpMethodInterceptor', [])
 
   .provider('httpMethodInterceptor', function () {
-    var domains = [];
+    var domains = [],
+      whitelistLocalRequests = false;
 
     /**
      * Add domains to the white list
@@ -146,6 +147,13 @@ angular
       domains.push(domain);
     };
 
+    /**
+     * White list requests to the local domain
+     */
+    this.whitelistLocalRequests = function () {
+      whitelistLocalRequests = true;
+    };
+
     this.$get = [
       '$q',
       '$rootScope',
@@ -160,6 +168,12 @@ angular
          * @returns {boolean}
          */
         var isUrlOnWhitelist = function (url) {
+          if (url.substring(0, 2) !== '//' &&
+            url.indexOf('://') === -1 &&
+            whitelistLocalRequests) {
+            return true;
+          }
+
           for (var i = domains.length; i--;) {
             if (url.indexOf(domains[i]) !== -1) {
               return true;

diff --git a/app/package/js/angular-http-loader.min.js b/app/package/js/angular-http-loader.min.js
diff --git a/app/src/demo.html b/app/src/demo.html
@@ -18,35 +18,30 @@
           function (httpMethodInterceptorProvider) {
             httpMethodInterceptorProvider.whitelistDomain('validate.jsontest.com');
             httpMethodInterceptorProvider.whitelistDomain('github.com');
+            httpMethodInterceptorProvider.whitelistLocalRequests();
           }
         ])
 
         .controller('demoCtrl', [
           '$scope',
           '$http',
           function (scope, $http) {
-            scope.makeRequest = function (index) {
-              switch (index) {
-                case 1:
-                  $http.get('http://validate.jsontest.com/?json=%7B%22key%22:%22value%22%7D');
-                  break;
-                case 2:
-                  $http.get('https://api.github.com/users/fabpot/repos');
-                  break;
-                case 3:
-                  $http.get('http://www.flickr.com/services/feeds/photos_public.gne?tags=soccer&format=json');
-                  break;
-              }
+            scope.buttons = [
+              {'name': 'jsontest (Whitelisted)', 'link': 'http://validate.jsontest.com/?json=%7B%22key%22:%22value%22%7D'},
+              {'name': 'Github (Whitelisted)', 'link': '//api.github.com/users/fabpot/repos'},
+              {'name': 'Local request (Whitelisted)', 'link': '/demo.html'},
+              {'name': 'Flickr (Not whitelisted - loader won\'t show)', 'link': 'http://www.flickr.com/services/feeds/photos_public.gne?tags=soccer&format=json'},
+            ];
+
+            scope.makeRequest = function (link) {
+              $http.get(link);
             }
           }
         ]);
     </script>
   </head>
   <body ng-app="demo" ng-controller="demoCtrl">
-    <button ng-click="makeRequest(1)">jsontest (Whitelisted)</button>
-    <button ng-click="makeRequest(2)">Github (Whitelisted)</button>
-    <button ng-click="makeRequest(3)">Flickr (Not whitelisted - loader won't show)</button>
-
+    <button ng-repeat="button in buttons" ng-click="makeRequest(button.link)">{{button.name}}</button>
     <!-- Loader template -->
     <script type="text/ng-template" id="example-loader.tpl.html">Loading {{title}}...</script>
 

diff --git a/app/src/js/httpMethodInterceptor.js b/app/src/js/httpMethodInterceptor.js
@@ -7,7 +7,8 @@ angular
   .module('ng.httpLoader.httpMethodInterceptor', [])
 
   .provider('httpMethodInterceptor', function () {
-    var domains = [];
+    var domains = [],
+      whitelistLocalRequests = false;
 
     /**
      * Add domains to the white list
@@ -19,6 +20,13 @@ angular
       domains.push(domain);
     };
 
+    /**
+     * White list requests to the local domain
+     */
+    this.whitelistLocalRequests = function () {
+      whitelistLocalRequests = true;
+    };
+
     this.$get = [
       '$q',
       '$rootScope',
@@ -33,6 +41,12 @@ angular
          * @returns {boolean}
          */
         var isUrlOnWhitelist = function (url) {
+          if (url.substring(0, 2) !== '//' &&
+            url.indexOf('://') === -1 &&
+            whitelistLocalRequests) {
+            return true;
+          }
+
           for (var i = domains.length; i--;) {
             if (url.indexOf(domains[i]) !== -1) {
               return true;