Skip to content

Commit 4c928e0

Browse files
committed
Merge pull request #1109 from kingcody/feature/upgrade-cookieStorage
refactor(client:auth): use $cookies instead
2 parents e14eaee + e7a1a46 commit 4c928e0

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ angular.module '<%= scriptAppName %>', [<%= angularModules %>]
1515
$locationProvider.html5Mode true<% if (filters.auth) { %>
1616
$httpProvider.interceptors.push 'authInterceptor'<% } %>
1717
<% } %><% if (filters.auth) { %>
18-
.factory 'authInterceptor', ($rootScope, $q, $cookieStore<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) ->
18+
.factory 'authInterceptor', ($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) ->
1919
<% if (filters.uirouter) { %>state = null
2020
<% } %># Add authorization token to headers
2121
request: (config) ->
2222
config.headers = config.headers or {}
23-
config.headers.Authorization = 'Bearer ' + $cookieStore.get 'token' if $cookieStore.get 'token'
23+
config.headers.Authorization = 'Bearer ' + $cookies.get 'token' if $cookies.get 'token'
2424
config
2525

2626
# Intercept 401s and redirect you to login
2727
responseError: (response) ->
2828
if response.status is 401
2929
<% if (filters.ngroute) { %>$location.path '/login'<% } if (filters.uirouter) { %>(state || state = $injector.get '$state').go 'login'<% } %>
3030
# remove any stale tokens
31-
$cookieStore.remove 'token'
31+
$cookies.remove 'token'
3232

3333
$q.reject response
3434

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
1717
$httpProvider.interceptors.push('authInterceptor');<% } %>
1818
})<% } if (filters.auth) { %>
1919

20-
.factory('authInterceptor', function($rootScope, $q, $cookieStore<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) {
20+
.factory('authInterceptor', function($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $injector<% } %>) {
2121
<% if (filters.uirouter) { %>var state;
2222
<% } %>return {
2323
// Add authorization token to headers
2424
request: function(config) {
2525
config.headers = config.headers || {};
26-
if ($cookieStore.get('token')) {
27-
config.headers.Authorization = 'Bearer ' + $cookieStore.get('token');
26+
if ($cookies.get('token')) {
27+
config.headers.Authorization = 'Bearer ' + $cookies.get('token');
2828
}
2929
return config;
3030
},
@@ -34,7 +34,7 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
3434
if (response.status === 401) {
3535
<% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>(state || (state = $injector.get('$state'))).go('login');<% } %>
3636
// remove any stale tokens
37-
$cookieStore.remove('token');
37+
$cookies.remove('token');
3838
return $q.reject(response);
3939
}
4040
else {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict'
22

33
angular.module '<%= scriptAppName %>'
4-
.factory 'Auth', ($http, User, $cookieStore, $q) ->
5-
currentUser = if $cookieStore.get 'token' then User.get() else {}
4+
.factory 'Auth', ($http, User, $cookies, $q) ->
5+
currentUser = if $cookies.get 'token' then User.get() else {}
66

77
###
88
Authenticate user and save token
@@ -17,7 +17,7 @@ angular.module '<%= scriptAppName %>'
1717
password: user.password
1818

1919
.then (res) ->
20-
$cookieStore.put 'token', res.data.token
20+
$cookies.put 'token', res.data.token
2121
currentUser = User.get()
2222
callback?()
2323
res.data
@@ -32,7 +32,7 @@ angular.module '<%= scriptAppName %>'
3232
Delete access token and user info
3333
###
3434
logout: ->
35-
$cookieStore.remove 'token'
35+
$cookies.remove 'token'
3636
currentUser = {}
3737
return
3838

@@ -47,7 +47,7 @@ angular.module '<%= scriptAppName %>'
4747
createUser: (user, callback) ->
4848
User.save user,
4949
(data) ->
50-
$cookieStore.put 'token', data.token
50+
$cookies.put 'token', data.token
5151
currentUser = User.get()
5252
callback? null, user
5353

@@ -144,4 +144,4 @@ angular.module '<%= scriptAppName %>'
144144
Get auth token
145145
###
146146
getToken: ->
147-
$cookieStore.get 'token'
147+
$cookies.get 'token'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
angular.module('<%= scriptAppName %>')
4-
.factory('Auth', function Auth($http, User, $cookieStore, $q) {
4+
.factory('Auth', function Auth($http, User, $cookies, $q) {
55
/**
66
* Return a callback or noop function
77
*
@@ -14,7 +14,7 @@ angular.module('<%= scriptAppName %>')
1414

1515
currentUser = {};
1616

17-
if ($cookieStore.get('token')) {
17+
if ($cookies.get('token')) {
1818
currentUser = User.get();
1919
}
2020

@@ -33,7 +33,7 @@ angular.module('<%= scriptAppName %>')
3333
password: user.password
3434
})
3535
.then(function(res) {
36-
$cookieStore.put('token', res.data.token);
36+
$cookies.put('token', res.data.token);
3737
currentUser = User.get();
3838
safeCb(callback)();
3939
return res.data;
@@ -48,7 +48,7 @@ angular.module('<%= scriptAppName %>')
4848
* Delete access token and user info
4949
*/
5050
logout: function() {
51-
$cookieStore.remove('token');
51+
$cookies.remove('token');
5252
currentUser = {};
5353
},
5454

@@ -62,7 +62,7 @@ angular.module('<%= scriptAppName %>')
6262
createUser: function(user, callback) {
6363
return User.save(user,
6464
function(data) {
65-
$cookieStore.put('token', data.token);
65+
$cookies.put('token', data.token);
6666
currentUser = User.get();
6767
return safeCb(callback)(null, user);
6868
},
@@ -160,7 +160,7 @@ angular.module('<%= scriptAppName %>')
160160
* @return {String} - a token string used for authenticating
161161
*/
162162
getToken: function() {
163-
return $cookieStore.get('token');
163+
return $cookies.get('token');
164164
}
165165
};
166166
});

0 commit comments

Comments
 (0)