Skip to content

Commit 50e0584

Browse files
ruipensoruipenso
committed
Merge pull request #28 from seegno/enhancement/add-getter-setters-methods-to-token
Add methods to get/set `token` property
2 parents a6a0977 + 5b2c02b commit 50e0584

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎src/providers/oauth-provider.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function OAuthProvider() {
100100
*/
101101

102102
isAuthenticated() {
103-
return !!OAuthToken.token;
103+
return !!OAuthToken.getToken();
104104
}
105105

106106
/**
@@ -136,7 +136,7 @@ function OAuthProvider() {
136136
}, options);
137137

138138
return $http.post(`${config.baseUrl}${config.grantPath}`, data, options).then((response) => {
139-
OAuthToken.token = response.data;
139+
OAuthToken.setToken(response.data);
140140

141141
return response;
142142
});
@@ -167,7 +167,7 @@ function OAuthProvider() {
167167
};
168168

169169
return $http.post(`${config.baseUrl}${config.grantPath}`, data, options).then((response) => {
170-
OAuthToken.token = response.data;
170+
OAuthToken.setToken(response.data);
171171

172172
return response;
173173
});

‎src/providers/oauth-token-provider.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ function OAuthTokenProvider() {
4848
* Set token.
4949
*/
5050

51-
set token(data) {
51+
setToken(data) {
5252
return ipCookie(config.name, data, config.options);
5353
}
5454

5555
/**
5656
* Get token.
5757
*/
5858

59-
get token() {
59+
getToken() {
6060
return ipCookie(config.name);
6161
}
6262

@@ -65,7 +65,7 @@ function OAuthTokenProvider() {
6565
*/
6666

6767
getAccessToken() {
68-
return this.token ? this.token.access_token : undefined;
68+
return this.getToken() ? this.getToken().access_token : undefined;
6969
}
7070

7171
/**
@@ -85,15 +85,15 @@ function OAuthTokenProvider() {
8585
*/
8686

8787
getRefreshToken() {
88-
return this.token ? this.token.refresh_token : undefined;
88+
return this.getToken() ? this.getToken().refresh_token : undefined;
8989
}
9090

9191
/**
9292
* Get tokenType.
9393
*/
9494

9595
getTokenType() {
96-
return this.token ? this.token.token_type : undefined;
96+
return this.getToken() ? this.getToken().token_type : undefined;
9797
}
9898

9999
/**

‎test/unit/interceptors/oauth-interceptor.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('oauthInterceptor', function() {
2424
}));
2525

2626
it('should inject `Authorization` header if `token` exists', inject(function($http, $httpBackend, OAuthToken) {
27-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
27+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
2828

2929
$httpBackend.expectGET('https://website.com', function(headers) {
3030
headers.should.have.property('Authorization');

‎test/unit/providers/oauth-provider.spec.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ describe('OAuthProvider', function() {
139139

140140
describe('isAuthenticated()', function() {
141141
it('should be true when there is a stored `token` cookie', inject(function(OAuth, OAuthToken) {
142-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
142+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
143143

144144
OAuth.isAuthenticated().should.be.true;
145145
}));
@@ -254,7 +254,7 @@ describe('OAuthProvider', function() {
254254
username: 'foo',
255255
password: 'bar'
256256
}).then(function(response) {
257-
OAuthToken.token.should.eql(response.data);
257+
OAuthToken.getToken().should.eql(response.data);
258258
}).catch(function() {
259259
should.fail();
260260
});
@@ -277,7 +277,7 @@ describe('OAuthProvider', function() {
277277
it('should call `queryString.stringify`', inject(function(OAuth, OAuthToken) {
278278
sinon.spy(queryString, 'stringify');
279279

280-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
280+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
281281

282282
OAuth.getRefreshToken();
283283

@@ -310,7 +310,7 @@ describe('OAuthProvider', function() {
310310
}));
311311

312312
it('should return an error if `refresh_token` is invalid', inject(function($httpBackend, OAuth, OAuthToken) {
313-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
313+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
314314

315315
$httpBackend.expectPOST(defaults.baseUrl + defaults.grantPath, queryString.stringify(data))
316316
.respond(400, { error: 'invalid_grant' });
@@ -329,7 +329,7 @@ describe('OAuthProvider', function() {
329329
}));
330330

331331
it('should retrieve and store `refresh_token` if request is successful', inject(function($httpBackend, OAuth, OAuthToken) {
332-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
332+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
333333

334334
$httpBackend.expectPOST(defaults.baseUrl + defaults.grantPath, queryString.stringify(data))
335335
.respond({ token_type: 'bearer', access_token: 'qux', expires_in: 3600, refresh_token: 'biz' });
@@ -356,7 +356,7 @@ describe('OAuthProvider', function() {
356356
it('should call `queryString.stringify`', inject(function(OAuth, OAuthToken) {
357357
sinon.spy(queryString, 'stringify');
358358

359-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
359+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
360360

361361
OAuth.revokeToken();
362362

@@ -371,7 +371,7 @@ describe('OAuthProvider', function() {
371371
it('should call `queryString.stringify` with `access_token` if `refresh_token` is not available', inject(function(OAuth, OAuthToken) {
372372
sinon.spy(queryString, 'stringify');
373373

374-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600 };
374+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600 });
375375

376376
OAuth.revokeToken();
377377

@@ -404,7 +404,7 @@ describe('OAuthProvider', function() {
404404
}));
405405

406406
it('should revoke and remove `token` if request is successful', inject(function($httpBackend, OAuth, OAuthToken) {
407-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
407+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
408408

409409
var data = queryString.stringify({
410410
token: 'bar'
@@ -414,7 +414,7 @@ describe('OAuthProvider', function() {
414414
.respond(200);
415415

416416
OAuth.revokeToken().then(function() {
417-
(undefined === OAuthToken.token).should.be.true;
417+
(undefined === OAuthToken.getToken()).should.be.true;
418418
}).catch(function() {
419419
should.fail();
420420
});

‎test/unit/providers/oauth-token-provider.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('OAuthTokenProvider', function() {
4343
angular.mock.module('angular-oauth2', 'angular-oauth2.test');
4444

4545
angular.mock.inject(function(OAuthToken) {
46-
OAuthToken.token = { token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' };
46+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
4747
});
4848

4949
});
@@ -65,9 +65,9 @@ describe('OAuthTokenProvider', function() {
6565
}));
6666

6767
it('setToken()', inject(function(OAuthToken) {
68-
OAuthToken.token = { token_type: 'bearer', access_token: 'qux', expires_in: 3600, refresh_token: 'biz' };
68+
OAuthToken.setToken({ token_type: 'bearer', access_token: 'qux', expires_in: 3600, refresh_token: 'biz' });
6969

70-
OAuthToken.token.should.eql({
70+
OAuthToken.getToken().should.eql({
7171
token_type: 'bearer',
7272
access_token: 'qux',
7373
expires_in: 3600,
@@ -76,7 +76,7 @@ describe('OAuthTokenProvider', function() {
7676
}));
7777

7878
it('getToken()', inject(function(OAuthToken) {
79-
OAuthToken.token.should.eql({
79+
OAuthToken.getToken().should.eql({
8080
token_type: 'bearer',
8181
access_token: 'foo',
8282
expires_in: 3600,
@@ -91,7 +91,7 @@ describe('OAuthTokenProvider', function() {
9191
it('removeToken()', inject(function(OAuthToken) {
9292
OAuthToken.removeToken();
9393

94-
(undefined === OAuthToken.token).should.true;
94+
(undefined === OAuthToken.getToken()).should.true;
9595
}));
9696
});
9797
});

0 commit comments

Comments
 (0)