Auth guards

src/app/app-routing.module.ts

@@ -35,6 +35,8 @@ import {HostAnalyticsComponent} from './components/analytics/host-analytics/host
 import {ResetPasswordComponent} from './components/auth/reset-password/reset-password.component';
 import {ResetPasswordConfirmComponent} from './components/auth/reset-password-confirm/reset-password-confirm.component';
 
+import { AuthGuard } from './guards/auth-guard.service';
+
 const routes: Routes = [
   {
     path: '',
@@ -104,10 +106,12 @@ const routes: Routes = [
   {
     path: 'dashboard',
     component: DashboardComponent,
+    canActivate: [AuthGuard]
   },
   {
     path: 'analytics',
     component: AnalyticsComponent,
+    canActivate: [AuthGuard],
     children: [
       {path: '', redirectTo: 'host-analytics', pathMatch: 'full'},
       {path: 'host-analytics', component: HostAnalyticsComponent}

src/app/app.module.ts

@@ -88,6 +88,9 @@ import {PasswordMismatchValidatorDirective} from './Directives/password.validato
 import { ResetPasswordComponent } from './components/auth/reset-password/reset-password.component';
 import { EmailValidatorDirective } from './Directives/email.validator';
 import { ResetPasswordConfirmComponent } from './components/auth/reset-password-confirm/reset-password-confirm.component';
+
+import { AuthGuard } from './guards/auth-guard.service';
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -174,7 +177,8 @@ import { ResetPasswordConfirmComponent } from './components/auth/reset-password-
     ApiService,
     GlobalService,
     ChallengeService,
-    EndpointsService
+    EndpointsService,
+    AuthGuard
   ],
   bootstrap: [AppComponent]
 })

src/app/components/analytics/analytics.component.ts

@@ -18,7 +18,6 @@ export class AnalyticsComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.authService.isLoggedIn();
     this.authServiceSubscription = this.authService.change.subscribe((authState) => {
       if (!authState.isLoggedIn) {
         this.router.navigate(['/auth/login']);

src/app/components/dashboard/dashboard.component.ts

@@ -45,9 +45,6 @@ export class DashboardComponent implements OnInit, OnDestroy {
    * Component on initialized.
    */
   ngOnInit() {
-    if (!this.authService.isLoggedIn()) {
-      this.router.navigate([this.routePath]);
-    }
     this.authServiceSubscription = this.authService.change.subscribe((authState) => {
       if (!authState.isLoggedIn) {
         this.router.navigate([this.routePath]);

src/app/guards/auth-guard.service.ts

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { CanActivate, Router, UrlTree } from '@angular/router';
+import { AuthService } from '../services/auth.service';
+
+@Injectable()
+export class AuthGuard implements CanActivate {
+  constructor(private authService: AuthService, private router: Router) {}
+
+  canActivate(): Observable<boolean> | Promise<boolean> | boolean | UrlTree {
+    const routePath = '/auth/login';
+    const isAuthenticated = this.authService.isLoggedIn();
+
+    if (isAuthenticated) {
+      return true;
+    }
+
+    const tree: UrlTree = this.router.parseUrl(routePath);
+    return tree;
+  }
+}