AuthService and guard changes

Author: kotsis

.angular-cli.json

@@ -24,7 +24,8 @@
         "styles.css"
       ],
       "scripts": [
-        "../node_modules/jquery/dist/jquery.min.js"
+        "../node_modules/jquery/dist/jquery.min.js",
+        "../node_modules/bootstrap/dist/js/bootstrap.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

src/app/auth/auth.guard.ts

@@ -2,11 +2,26 @@ import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 
+import { AuthService } from './auth.service';
+import { Router } from '@angular/router';
+
 @Injectable()
 export class AuthGuard implements CanActivate {
+
+  constructor(
+    private authService: AuthService,
+    private router: Router
+  ) {}
+
   canActivate(
     next: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
+
+    if (!this.authService.isLoggedIn) {
+      this.router.navigate(['/home']);
+      return false;
+    }
+
     return true;
   }
 }

src/app/auth/auth.service.ts

@@ -1,8 +1,30 @@
 import { Injectable } from '@angular/core';
+import { environment } from './../../environments/environment';
+import { Router } from '@angular/router';
 
 @Injectable()
 export class AuthService {
 
-  constructor() { }
+  authenticated: boolean;
 
+  constructor(private router: Router) {
+    this.checkIfLoggedin();
+  }
+
+  //let options = new RequestOptions({ headers: headers, withCredentials: true });
+  //this.http.post(this.connectUrl, <stringified_data> , options)
+
+  checkIfLoggedin(){
+    //ask api
+    //to-do use environment.apiUrl+'/isLoggedIn' returns yes, no
+    this.authenticated = false;
+  }
+
+  get isLoggedIn(): boolean {
+    // Check if current date is greater
+    // than expiration and user is logged in
+    //const expiresAt = JSON.parse(localStorage.getItem('expires_at'));
+    //return Date.now() < expiresAt && this.authenticated;
+    return this.authenticated;
+  }
 }