Merge pull request #64 from cybey/signOutFailedValidate

Added functionality to trigger the signOut function when service retu…

Author: neroniaky

README.md

@@ -97,6 +97,7 @@ constructor(private _tokenService: Angular2TokenService) {
 
         signOutPath:                'auth/sign_out',
         validateTokenPath:          'auth/validate_token',
+        signOutFailedValidate:      false,
 
         registerAccountPath:        'auth',
         deleteAccountPath:          'auth',
@@ -126,6 +127,7 @@ constructor(private _tokenService: Angular2TokenService) {
 | `signInStoredUrlStorageKey?: string`    | Sets locale storage key to store URL before displaying signIn page |
 | `signOutPath?: string`                  | Sets path for sign out                   |
 | `validateTokenPath?: string`            | Sets path for token validation           |
+| `signOutFailedValidate?: boolean`       | Signs user out when validation returns a 401 status |
 | `registerAccountPath?: string`          | Sets path for account registration       |
 | `deleteAccountPath?: string`            | Sets path for account deletion           |
 | `registerAccountCallback?: string`      | Sets the path user are redirected to after email confirmation for registration |

src/angular2-token.model.ts

@@ -69,6 +69,7 @@ export interface Angular2TokenOptions {
 
     signOutPath?:               string;
     validateTokenPath?:         string;
+    signOutFailedValidate?:     boolean;
 
     deleteAccountPath?:         string;
     registerAccountPath?:       string;

src/angular2-token.service.ts

@@ -90,6 +90,7 @@ export class Angular2TokenService implements CanActivate {
 
             signOutPath:                'auth/sign_out',
             validateTokenPath:          'auth/validate_token',
+            signOutFailedValidate:      false,
 
             registerAccountPath:        'auth',
             deleteAccountPath:          'auth',
@@ -194,7 +195,13 @@ export class Angular2TokenService implements CanActivate {
     validateToken(): Observable<Response> {
         let observ = this.get(this._constructUserPath() + this._options.validateTokenPath);
 
-        observ.subscribe(res => this._currentUserData = res.json().data, error => null);
+        observ.subscribe(
+            res => this._currentUserData = res.json().data,
+            error => {
+                if (error.status === 401 && this._options.signOutFailedValidate) {
+                    this.signOut();
+                }
+            });
 
         return observ;
     }

src/angular2-token.spec.ts

@@ -180,6 +180,30 @@ describe('Angular2TokenService', () => {
 		tokenService.validateToken();
 	}));
 
+	it('validateToken should call signOut when it returns status 401', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+		
+		mockBackend.connections.subscribe(
+			c => c.mockError(new Response(new ResponseOptions({ status: 401, headers: new Headers() })))
+		);
+
+		spyOn(tokenService, 'signOut');
+		
+		tokenService.init({ apiPath: 'myapi', signOutFailedValidate: true });
+		tokenService.validateToken().subscribe(res => null, err => expect(tokenService.signOut).toHaveBeenCalled());
+	}));
+
+	it('validateToken should not call signOut when it returns status 401', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+		
+		mockBackend.connections.subscribe(
+			c => c.mockError(new Response(new ResponseOptions({ status: 401, headers: new Headers() })))
+		);
+
+		spyOn(tokenService, 'signOut');
+		
+		tokenService.init({ apiPath: 'myapi', signOutFailedValidate: false });
+		tokenService.validateToken().subscribe(res => null, err => expect(tokenService.signOut).not.toHaveBeenCalled());
+	}));
+
 	it('updatePasswordPath should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
 
 		mockBackend.connections.subscribe(