From 11698f0abb187c38d70cf33c29bfea36b9372bdb Mon Sep 17 00:00:00 2001 From: Desy Ayurianti Date: Thu, 17 Oct 2024 14:00:59 +0700 Subject: [PATCH] fix: fixing guard by adding toastr --- agrilink_vocpro/src/app/app.routes.ts | 2 +- .../app/cores/guard/guards/auth.guard.spec.ts | 17 ----------------- .../app/cores/{guard => }/guards/auth.guard.ts | 4 +++- 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 agrilink_vocpro/src/app/cores/guard/guards/auth.guard.spec.ts rename agrilink_vocpro/src/app/cores/{guard => }/guards/auth.guard.ts (70%) diff --git a/agrilink_vocpro/src/app/app.routes.ts b/agrilink_vocpro/src/app/app.routes.ts index d797d16..3a062f9 100644 --- a/agrilink_vocpro/src/app/app.routes.ts +++ b/agrilink_vocpro/src/app/app.routes.ts @@ -3,7 +3,7 @@ import { DashboardComponent } from './pages/dashboard/dashboard.component'; import { LayoutsComponent } from './pages/dashboard/layouts/layouts.component'; import { GraphComponent } from './pages/dashboard/page/graph/graph.component'; import { AuthComponent } from './pages/auth/auth.component'; -import { AuthGuard } from './cores/guard/guards/auth.guard'; +import { AuthGuard } from './cores/guards/auth.guard'; import { RegisterComponent } from './pages/register/register.component'; export const routes: Routes = [ diff --git a/agrilink_vocpro/src/app/cores/guard/guards/auth.guard.spec.ts b/agrilink_vocpro/src/app/cores/guard/guards/auth.guard.spec.ts deleted file mode 100644 index 4ae275e..0000000 --- a/agrilink_vocpro/src/app/cores/guard/guards/auth.guard.spec.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { CanActivateFn } from '@angular/router'; - -import { authGuard } from './auth.guard'; - -describe('authGuard', () => { - const executeGuard: CanActivateFn = (...guardParameters) => - TestBed.runInInjectionContext(() => authGuard(...guardParameters)); - - beforeEach(() => { - TestBed.configureTestingModule({}); - }); - - it('should be created', () => { - expect(executeGuard).toBeTruthy(); - }); -}); diff --git a/agrilink_vocpro/src/app/cores/guard/guards/auth.guard.ts b/agrilink_vocpro/src/app/cores/guards/auth.guard.ts similarity index 70% rename from agrilink_vocpro/src/app/cores/guard/guards/auth.guard.ts rename to agrilink_vocpro/src/app/cores/guards/auth.guard.ts index 489e713..8ed90a3 100644 --- a/agrilink_vocpro/src/app/cores/guard/guards/auth.guard.ts +++ b/agrilink_vocpro/src/app/cores/guards/auth.guard.ts @@ -1,18 +1,20 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router } from '@angular/router'; +import { ToastrService } from 'ngx-toastr'; @Injectable({ providedIn: 'root' }) export class AuthGuard implements CanActivate { - constructor(private router: Router) {} + constructor(private router: Router, private toast: ToastrService) {} canActivate(): boolean { const token = localStorage.getItem('accessToken'); if (token) { return true; } else { + this.toast.error('You need to login first'); this.router.navigate(['auth']); return false; }