Using logged in status

Author: Bernardo-MG

src/app/authentication/guard/authenticated.guard.ts

@@ -13,15 +13,20 @@ export class AuthenticatedGuard implements CanActivate {
   ) { }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    const user = this.authenticationService.getUser().token;
-    if (user) {
-      // logged in so return true
-      return true;
+    const logged = this.authenticationService.getUser().logged;
+    let active;
+
+    if (logged) {
+      // Logged in
+      active = true;
+    } else {
+      // Not logged in
+      // Redirect to login
+      this.router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
+      active = false;
     }
 
-    // not logged in so redirect to login page with the return url
-    this.router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
-    return false;
+    return active;
   }
 
 }

src/app/authentication/interceptor/authentication.interceptor.ts

@@ -9,19 +9,27 @@ export class AuthenticationInterceptor implements HttpInterceptor {
 
   private tokenHeaderKey = 'Authorization';
 
+  private tokenHeaderIdentifier = 'Basic'
+
   constructor(private authenticationService: AuthenticationService) { }
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     let authReq;
 
+    // Acquire the current user token
     const token = this.authenticationService.getUser().token;
 
     if (token === null) {
+      // No token
+      // No changes to request
       authReq = request;
     } else {
-      authReq = request.clone({ headers: request.headers.set(this.tokenHeaderKey, 'Basic ' + token) });
+      // Has token
+      // It is added to the request
+      authReq = request.clone({ headers: request.headers.set(this.tokenHeaderKey, `${this.tokenHeaderIdentifier} ${token}`) });
     }
 
     return next.handle(authReq);
   }
+
 }