reivilibre/TaskBoard
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Matthew Ross 2016-07-16 18:13:16 -04:00
parent c55f91811a
commit c0a9bb5c48
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/shared/auth/auth.guard.ts
View File

@ -1,15 +1,11 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { CanActivate, Router } from '@angular/router'; import { CanActivate } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import { AuthService } from './auth.service'; import { AuthService } from './auth.service';
import { ApiResponse } from '../index';
@Injectable() @Injectable()
export class AuthGuard implements CanActivate { export class AuthGuard implements CanActivate {
constructor(private authService: AuthService, private router: Router) { constructor(private authService: AuthService) {
} }
canActivate() { canActivate() {

14
src/app/shared/auth/auth.service.ts
View File

@ -24,20 +24,12 @@ export class AuthService {
return this.http.post('api/authenticate', token, { headers: header }). return this.http.post('api/authenticate', token, { headers: header }).
map(res => { map(res => {
let response: ApiResponse = res.json(); this.checkStatus(res);
if (res.status === 200 && response.data.length) { return this.activeUser !== null;
this.activeUser = response.data[1];
}
return true;
}). }).
catch((res, caught) => { catch((res, caught) => {
let response: ApiResponse = res.json(); this.checkStatus(res);
this.activeUser = null;
localStorage.removeItem(this.jwtKey);
this.router.navigate(['']);
return Observable.of(false); return Observable.of(false);
}); });