Merge pull request #1109 from kingcody/feature/upgrade-cookieStorage

refactor(client:auth): use $cookies instead

Author: kingcody

app/templates/client/app/app(coffee).coffee

@@ -15,20 +15,20 @@ angular.module '<%= scriptAppName %>', [<%= angularModules %>]
   $locationProvider.html5Mode true<% if (filters.auth) { %>
   $httpProvider.interceptors.push 'authInterceptor'<% } %>
 <% } %><% if (filters.auth) { %>
-.factory 'authInterceptor', ($rootScope, $q, $cookieStore<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) ->
+.factory 'authInterceptor', ($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) ->
   <% if (filters.uirouter) { %>state = null
   <% } %># Add authorization token to headers
   request: (config) ->
     config.headers = config.headers or {}
-    config.headers.Authorization = 'Bearer ' + $cookieStore.get 'token' if $cookieStore.get 'token'
+    config.headers.Authorization = 'Bearer ' + $cookies.get 'token' if $cookies.get 'token'
     config
 
   # Intercept 401s and redirect you to login
   responseError: (response) ->
     if response.status is 401
       <% if (filters.ngroute) { %>$location.path '/login'<% } if (filters.uirouter) { %>(state || state = $injector.get '$state').go 'login'<% } %>
       # remove any stale tokens
-      $cookieStore.remove 'token'
+      $cookies.remove 'token'
 
     $q.reject response
 

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

@@ -17,14 +17,14 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
     $httpProvider.interceptors.push('authInterceptor');<% } %>
   })<% } if (filters.auth) { %>
 
-  .factory('authInterceptor', function($rootScope, $q, $cookieStore<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) {
+  .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 ($cookieStore.get('token')) {
-          config.headers.Authorization = 'Bearer ' + $cookieStore.get('token');
+        if ($cookies.get('token')) {
+          config.headers.Authorization = 'Bearer ' + $cookies.get('token');
         }
         return config;
       },
@@ -34,7 +34,7 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
         if (response.status === 401) {
           <% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>(state || (state = $injector.get('$state'))).go('login');<% } %>
           // remove any stale tokens
-          $cookieStore.remove('token');
+          $cookies.remove('token');
           return $q.reject(response);
         }
         else {

app/templates/client/components/auth(auth)/auth.service(coffee).coffee

@@ -1,8 +1,8 @@
 'use strict'
 
 angular.module '<%= scriptAppName %>'
-.factory 'Auth', ($http, User, $cookieStore, $q) ->
-  currentUser = if $cookieStore.get 'token' then User.get() else {}
+.factory 'Auth', ($http, User, $cookies, $q) ->
+  currentUser = if $cookies.get 'token' then User.get() else {}
 
   ###
   Authenticate user and save token
@@ -17,7 +17,7 @@ angular.module '<%= scriptAppName %>'
       password: user.password
 
     .then (res) ->
-      $cookieStore.put 'token', res.data.token
+      $cookies.put 'token', res.data.token
       currentUser = User.get()
       callback?()
       res.data
@@ -32,7 +32,7 @@ angular.module '<%= scriptAppName %>'
   Delete access token and user info
   ###
   logout: ->
-    $cookieStore.remove 'token'
+    $cookies.remove 'token'
     currentUser = {}
     return
 
@@ -47,7 +47,7 @@ angular.module '<%= scriptAppName %>'
   createUser: (user, callback) ->
     User.save user,
       (data) ->
-        $cookieStore.put 'token', data.token
+        $cookies.put 'token', data.token
         currentUser = User.get()
         callback? null, user
 
@@ -144,4 +144,4 @@ angular.module '<%= scriptAppName %>'
   Get auth token
   ###
   getToken: ->
-    $cookieStore.get 'token'
+    $cookies.get 'token'

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

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('<%= scriptAppName %>')
-  .factory('Auth', function Auth($http, User, $cookieStore, $q) {
+  .factory('Auth', function Auth($http, User, $cookies, $q) {
     /**
      * Return a callback or noop function
      *
@@ -14,7 +14,7 @@ angular.module('<%= scriptAppName %>')
 
     currentUser = {};
 
-    if ($cookieStore.get('token')) {
+    if ($cookies.get('token')) {
       currentUser = User.get();
     }
 
@@ -33,7 +33,7 @@ angular.module('<%= scriptAppName %>')
           password: user.password
         })
         .then(function(res) {
-          $cookieStore.put('token', res.data.token);
+          $cookies.put('token', res.data.token);
           currentUser = User.get();
           safeCb(callback)();
           return res.data;
@@ -48,7 +48,7 @@ angular.module('<%= scriptAppName %>')
        * Delete access token and user info
        */
       logout: function() {
-        $cookieStore.remove('token');
+        $cookies.remove('token');
         currentUser = {};
       },
 
@@ -62,7 +62,7 @@ angular.module('<%= scriptAppName %>')
       createUser: function(user, callback) {
         return User.save(user,
           function(data) {
-            $cookieStore.put('token', data.token);
+            $cookies.put('token', data.token);
             currentUser = User.get();
             return safeCb(callback)(null, user);
           },
@@ -160,7 +160,7 @@ angular.module('<%= scriptAppName %>')
        * @return {String} - a token string used for authenticating
        */
       getToken: function() {
-        return $cookieStore.get('token');
+        return $cookies.get('token');
       }
     };
   });