✨ mis a jour des guards avec la gestion du token et ajout de l'interceptor

Author: mckenziearts

src/app/app.module.ts

@@ -1,5 +1,5 @@
 import { APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -14,6 +14,7 @@ import { AppRoutingModule } from './core/routes/app-routing.module';
 import { AppComponent } from './core/components/app/app.component';
 import { ROOT_REDUCERS } from './core/store/app.store';
 import { Router } from '@angular/router';
+import { AuthInterceptor } from './modules/authentication/interceptors/auth.interceptor';
 
 @NgModule({
   declarations: [
@@ -48,6 +49,11 @@ import { Router } from '@angular/router';
       deps: [Sentry.TraceService],
       multi: true,
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: AuthInterceptor,
+      multi: true,
+    }
   ],
   bootstrap: [AppComponent],
 })

src/app/core/guards/auth.guard.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { CanActivateChild, Router } from '@angular/router';
+import { AccessTokenService } from '@app/modules/authentication/services/access-token.service';
 import { selectIsLoggedIn } from '@app/modules/authentication/store/auth.selectors';
 import { Store } from '@ngrx/store';
 import { filter, first, map, Observable } from 'rxjs';
@@ -8,13 +9,17 @@ import { filter, first, map, Observable } from 'rxjs';
   providedIn: 'root'
 })
 export class AuthGuard implements CanActivateChild {
-  constructor(private store: Store, private router: Router) {}
+  constructor(
+    private store: Store,
+    private router: Router,
+    private accessTokenService: AccessTokenService
+  ) {}
 
   canActivateChild(): Observable<boolean> {
     return this.store.select(selectIsLoggedIn).pipe(
       first((value) => value !== null),
       map((isLoggedIn: boolean | null) => {
-        if (! isLoggedIn) {
+        if (! isLoggedIn && ! this.accessTokenService.getAccessToken()) {
           this.router.navigateByUrl('/auth/login')
           return false;
         }

src/app/core/guards/guest.guard.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
+import { AccessTokenService } from '@app/modules/authentication/services/access-token.service';
 import { selectIsLoggedIn } from '@app/modules/authentication/store/auth.selectors';
 import { Store } from '@ngrx/store';
 import { filter, first, map, Observable } from 'rxjs';
@@ -8,13 +9,17 @@ import { filter, first, map, Observable } from 'rxjs';
   providedIn: 'root'
 })
 export class GuestGuard implements CanActivateChild {
-  constructor(private store: Store, private router: Router) {}
+  constructor(
+    private store: Store,
+    private router: Router,
+    private accessTokenService: AccessTokenService
+  ) {}
 
   canActivateChild(): Observable<boolean> {
     return this.store.select(selectIsLoggedIn).pipe(
       first((value) => value !== null),
       map((isLoggedIn: boolean | null) => {
-        if (isLoggedIn) {
+        if (isLoggedIn && this.accessTokenService.getAccessToken()) {
           this.router.navigateByUrl('/dashboard')
           return false
         }