refactor(client:auth): move authInterceptor to auth module

Author: kingcody

app/templates/client/app/app(js).js

@@ -1,48 +1,16 @@
 'use strict';
 
 angular.module('<%= scriptAppName %>', [<%- angularModules %>])
-  <% if (filters.ngroute) { %>.config(function($routeProvider, $locationProvider<% if (filters.auth) { %>, $httpProvider<% } %>) {
+  .config(function(<% if (filters.ngroute) { %>$routeProvider<% } if (filters.uirouter) { %>$urlRouterProvider<% } %>, $locationProvider) {<% if (filters.ngroute) { %>
     $routeProvider
       .otherwise({
         redirectTo: '/'
-      });
-
-    $locationProvider.html5Mode(true);<% if (filters.auth) { %>
-    $httpProvider.interceptors.push('authInterceptor');<% } %>
-  })<% } if (filters.uirouter) { %>.config(function($stateProvider, $urlRouterProvider, $locationProvider<% if (filters.auth) { %>, $httpProvider<% } %>) {
+      });<% } if (filters.uirouter) { %>
     $urlRouterProvider
-      .otherwise('/');
-
-    $locationProvider.html5Mode(true);<% if (filters.auth) { %>
-    $httpProvider.interceptors.push('authInterceptor');<% } %>
-  })<% } if (filters.auth) { %>
+      .otherwise('/');<% } %>
 
-  .factory('authInterceptor', function($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) {
-    <% if (filters.uirouter) { %>var state;
-    <% } %>return {
-      // Add authorization token to headers
-      request: function(config) {
-        config.headers = config.headers || {};
-        if ($cookies.get('token')) {
-          config.headers.Authorization = 'Bearer ' + $cookies.get('token');
-        }
-        return config;
-      },
-
-      // Intercept 401s and redirect you to login
-      responseError: function(response) {
-        if (response.status === 401) {
-          <% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>(state || (state = $injector.get('$state'))).go('login');<% } %>
-          // remove any stale tokens
-          $cookies.remove('token');
-          return $q.reject(response);
-        }
-        else {
-          return $q.reject(response);
-        }
-      }
-    };
-  })
+    $locationProvider.html5Mode(true);
+  })<% if (filters.auth) { %>
 
   .run(function($rootScope<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $state<% } %>, Auth) {
     // Redirect to login if route requires auth and the user is not logged in

app/templates/client/components/auth(auth)/auth.module(js).js

@@ -1,5 +1,10 @@
 'use strict';
 
 angular.module('<%= scriptAppName %>.auth', [
-  'ngCookies'
-]);
+  'ngCookies'<% if (filters.ngroute) { %>,
+  'ngRoute'<% } if (filters.uirouter) { %>,
+  'ui.router'<% } %>
+])
+  .config(function($httpProvider) {
+    $httpProvider.interceptors.push('authInterceptor');
+  });

app/templates/client/components/auth(auth)/interceptor.service(js).js

@@ -0,0 +1,35 @@
+'use strict';
+
+(function() {
+
+  function authInterceptor($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) {
+    <% if (filters.uirouter) { %>var state;
+    <% } %>return {
+      // Add authorization token to headers
+      request: function(config) {
+        config.headers = config.headers || {};
+        if ($cookies.get('token')) {
+          config.headers.Authorization = 'Bearer ' + $cookies.get('token');
+        }
+        return config;
+      },
+
+      // Intercept 401s and redirect you to login
+      responseError: function(response) {
+        if (response.status === 401) {
+          <% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>(state || (state = $injector.get('$state'))).go('login');<% } %>
+          // remove any stale tokens
+          $cookies.remove('token');
+          return $q.reject(response);
+        }
+        else {
+          return $q.reject(response);
+        }
+      }
+    };
+  }
+
+  angular.module('<%= scriptAppName %>.auth')
+    .factory('authInterceptor', authInterceptor);
+
+})();

test/test-file-creation.js

@@ -269,6 +269,7 @@ describe('angular-fullstack generator', function () {
         'client/app/admin/admin.controller.' + script,
         'client/components/auth/auth.module.' + script,
         'client/components/auth/auth.service.' + script,
+        'client/components/auth/interceptor.service.' + script,
         'client/components/auth/user.service.' + script,
         'client/components/mongoose-error/mongoose-error.directive.' + script,
         'server/api/user/index.js',