fix(auth): fix isAuthenticatedOrRefresh to not refresh token with n…

…o value (#708)
akveo · Sep 12, 2018 · b29418f · b29418f
1 parent 0e05034
commit b29418f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/framework/auth/services/auth.service.ts b/src/framework/auth/services/auth.service.ts
@@ -51,7 +51,7 @@ export class NbAuthService {
  return this.getToken()
  .pipe(
  switchMap(token => {
- if (!token.isValid()) {
+ if (token.getValue() && !token.isValid()) {
  return this.refreshToken(token.getOwnerStrategyName(), token)
  .pipe(
  switchMap(res => {

diff --git a/src/framework/auth/services/auth.spec.ts b/src/framework/auth/services/auth.spec.ts
@@ -31,7 +31,8 @@ describe('auth-service', () => {
  const resp200 = new HttpResponse<Object>({body: {}, status: 200});
 
  const testToken = nbAuthCreateToken(NbAuthSimpleToken, testTokenValue, ownerStrategyName);
- const emptyToken = nbAuthCreateToken(NbAuthSimpleToken, null, ownerStrategyName);
+ const invalidToken = nbAuthCreateToken(NbAuthSimpleToken, testTokenValue, ownerStrategyName);
+ const emptyToken = nbAuthCreateToken(NbAuthSimpleToken, null, null);
 
  const failResult = new NbAuthResult(false,
  resp401,
@@ -162,13 +163,17 @@ describe('auth-service', () => {
 
  it('isAuthenticatedOrRefresh, token invalid, strategy refreshToken called, returns true', (done) => {
 
+ spyOn(invalidToken, 'isValid')
+ .and
+ .returnValue(false);
+
  const spy = spyOn(dummyAuthStrategy, 'refreshToken')
  .and
  .returnValue(observableOf(successResult));
 
  spyOn(tokenService, 'get')
  .and
- .returnValues(observableOf(emptyToken), observableOf(testToken));
+ .returnValues(observableOf(invalidToken), observableOf(testToken));
 
  authService.isAuthenticatedOrRefresh()
  .pipe(first())
@@ -181,13 +186,33 @@ describe('auth-service', () => {
  );
 
  it('isAuthenticatedOrRefresh, token invalid, strategy refreshToken called, returns false', (done) => {
+
+ spyOn(invalidToken, 'isValid')
+ .and
+ .returnValue(false);
+
  const spy = spyOn(dummyAuthStrategy, 'refreshToken')
  .and
  .returnValue(observableOf(failResult));
 
  spyOn(tokenService, 'get')
  .and
- .returnValues(observableOf(emptyToken), observableOf(emptyToken));
+ .returnValues(observableOf(invalidToken), observableOf(invalidToken));
+
+ authService.isAuthenticatedOrRefresh()
+ .pipe(first())
+ .subscribe((isAuth: boolean) => {
+ expect(spy).toHaveBeenCalled();
+ expect(isAuth).toBeFalsy();
+ done();
+ });
+ },
+ );
+
+ it('isAuthenticatedOrRefresh, token doesn\'t exist, strategy refreshToken called, returns false', (done) => {
+ const spy = spyOn(tokenService, 'get')
+ .and
+ .returnValue(observableOf(emptyToken));
 
  authService.isAuthenticatedOrRefresh()
  .pipe(first())