Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixing resetting of token, changing endpoint, simplifying isLoggedIn …
…function
  • Loading branch information
Evan Langlais committed Apr 30, 2019
1 parent faeb48b commit c23ef5d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/app/authentication/authentication.component.ts
Expand Up @@ -54,7 +54,7 @@ export class AuthenticationComponent implements OnInit {
localStorage.removeItem('gen_name'); localStorage.removeItem('gen_name');
localStorage.removeItem('data_type'); localStorage.removeItem('data_type');
localStorage.removeItem('fault_type'); localStorage.removeItem('fault_type');
localStorage.removeItem('auth_token'); // localStorage.removeItem('auth_token');
} }


} }
12 changes: 2 additions & 10 deletions src/app/header/header.component.ts
Expand Up @@ -23,16 +23,8 @@ export class HeaderComponent implements OnInit {
resetGenAndVisualize() { resetGenAndVisualize() {
this.resetAndRedirect('/visualize-all'); this.resetAndRedirect('/visualize-all');
} }
isLoggedIn() isLoggedIn(): boolean {
{ return (localStorage.getItem('auth_token') !== null);
if(localStorage.getItem('auth_token'))
{
return true;
}
else
{
return false;
}
} }


resetAndRedirect(url: string) { resetAndRedirect(url: string) {
Expand Down
20 changes: 15 additions & 5 deletions src/app/services/login.service.ts
Expand Up @@ -3,13 +3,14 @@ import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/throw'; import 'rxjs/add/observable/throw';
import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/catch';
import {Router} from '@angular/router';


@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class LoginService { export class LoginService {


constructor(private http: HttpClient) { } constructor(private http: HttpClient, private router: Router) { }


authorizeUser(loginInfo): Observable<Object> { authorizeUser(loginInfo): Observable<Object> {
return this.http.post('http://sd5-backend.engr.uconn.edu/auth', loginInfo); return this.http.post('http://sd5-backend.engr.uconn.edu/auth', loginInfo);
Expand All @@ -33,19 +34,28 @@ export class LoginService {
getToken(): Promise<string> { getToken(): Promise<string> {
return new Promise<string>((resolve, reject) => { return new Promise<string>((resolve, reject) => {
const token = localStorage.getItem('auth_token'); const token = localStorage.getItem('auth_token');
if (!token) { reject('No Token'); } if (!token) { this.resetToken(); reject('No Token'); }
this.http.get('http://sd5-backend.engr.uconn.edu/auth/verify', { this.http.get('http://sd5-backend.engr.uconn.edu/verify', {
headers: { headers: {
Authorization: 'Bearer ' + token Authorization: 'Bearer ' + token
}, },
observe: 'response' observe: 'response'
}).subscribe((response) => { }).subscribe((response) => {
if (response.status === 200) { if (response.ok) {
resolve(token); resolve(token);
} else { } else {
reject('Invalid Token'); this.resetToken();
reject('Bad Token!');
} }
}, () => {
this.resetToken();
reject('Bad Token!');
}); });
}); });
} }

resetToken() {
localStorage.removeItem('auth_token');
this.router.navigateByUrl('#');
}
} }

0 comments on commit c23ef5d

Please sign in to comment.