adding redirections

Author: Hrissy-art

src/app/app.routes.ts

@@ -5,6 +5,8 @@ import { UserConnectionComponent } from './feature/user/components/user-connecti
 //import { isLoggedInGuard } from './core/guards/is-logged-in.guard';
 import { isAdminGuard } from './core/guards/is-admin.guard';
 import { CreateUserComponent } from './feature/user/components/create-user/create-user.component';
+import { isProviderGuard } from './core/guards/is-provider.guard';
+import { ProviderHomeComponent } from './feature/provider/page/provider-home/provider-home.component';
 
 export const routes: Routes = [
   {
@@ -24,9 +26,17 @@ export const routes: Routes = [
   },
   {
     path: 'contact',
-    component: UserConnectionComponent,
+    component: CreateUserComponent,
+  },
+  { path: 'auth', component: UserConnectionComponent },
+
+  {
+    path: 'providers',
+    component: ProviderHomeComponent,
+
+    canActivate: [isProviderGuard],
+    //canActivate: [isLoggedInGuard],
   },
-  { path: 'signup', component: CreateUserComponent },
 
   // {
   // //   path: '**',

src/app/core/components/header/header.component.html

@@ -10,8 +10,9 @@
       <a [routerLink]="'/contact'" class="nav-link">Contact</a>
     </nav>
 
-    <button class="header-button" type="button" (click)="navigateToSignUpPage()">Se connecter / s'inscrire</button>
-
+    <!-- <button class="header-button" type="button" (click)="navigateToSignUpPage()">Se connecter / s'inscrire</button>// -->
+    <button *ngIf="isLoggedIn" type="button" (click)="onLogout()">Déconnexion</button>
+    <button *ngIf="!isLoggedIn" type="button" class="header-button" (click)="navigateToSignUpPage()">Se connecter / s'inscrire</button>
     <button class="btn btn-light d-md-none" type="button" data-bs-toggle="collapse" data-bs-target="#mobileMenu">☰</button>
   </div>
 
@@ -24,7 +25,5 @@
     </nav>
   </div>
 
-  <button *ngIf="isLoggedIn" type="button" (click)="onLogout()">Déconnexion</button>
-  <button *ngIf="!isLoggedIn" type="button" class="btn btn-primary mt-2" (click)="navigateToSignUpPage()">Se connecter / s'inscrire</button>
 
 </header>

src/app/core/components/header/header.component.ts

@@ -27,19 +27,17 @@ export class HeaderComponent implements OnInit {
     // this._authService.logoutMessage$.subscribe((msg) => {
     //   if (msg) {
     //     this.message = msg;
-  
+
     //     // Efface le message après quelques secondes
     //     setTimeout(() => {
     //       this.message = null;
     //     }, 3000);
     //   }
     // });
-
-    
   }
 
   navigateToSignUpPage(): void {
-    this._router.navigate(['/signup']);
+    this._router.navigate(['/auth']);
   }
   onLogout(): void {
     this._authService.logout();

src/app/core/guards/is-provider.guard.spec.ts

@@ -0,0 +1,17 @@
+import { TestBed } from '@angular/core/testing';
+import { CanActivateFn } from '@angular/router';
+
+import { isProviderGuard } from './is-provider.guard';
+
+describe('isProviderGuard', () => {
+  const executeGuard: CanActivateFn = (...guardParameters) => 
+      TestBed.runInInjectionContext(() => isProviderGuard(...guardParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeGuard).toBeTruthy();
+  });
+});

src/app/core/guards/is-provider.guard.ts

@@ -0,0 +1,29 @@
+import { inject } from '@angular/core';
+import { CanActivateFn, Router, UrlTree } from '@angular/router';
+import { map, Observable, of, switchMap } from 'rxjs';
+import { AuthService } from '../services/auth.service';
+import { UserStoreService } from '../services/user-store.service';
+
+export const isProviderGuard: CanActivateFn = (): Observable<boolean | UrlTree> => {
+  const authService = inject(AuthService);
+  console.log('authService', 'router', 'userStoreService');
+
+  const router = inject(Router);
+  const userStoreService = inject(UserStoreService);
+
+  const rolesFromToken = authService.getRoleFromToken();
+
+  return userStoreService.getRolesFromStore().pipe(
+    switchMap(roles => {
+      console.log('Rôles récupérés du store:', roles);
+
+      if (rolesFromToken.includes('ROLE_PROVIDER')) {
+        console.log("L'utilisateur est un provider");
+        return authService.isLoggedInObservable().pipe(map(loggedIn => (loggedIn ? true : router.createUrlTree(['/auth']))));
+      }
+
+      console.log("L'utilisateur n'est pas un provider");
+      return of(router.createUrlTree(['/auth']));
+    })
+  );
+};

src/app/core/services/auth.service.ts

@@ -4,31 +4,31 @@ import { BehaviorSubject, map, Observable, of, tap } from 'rxjs';
 import { TokenService } from './token.service';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { UserStoreService } from './user-store.service';
+import { Router } from '@angular/router';
 
 type Role = {
   authority: string;
 };
 
-
 @Injectable({
   providedIn: 'root',
 })
 export class AuthService {
   private _userPayload: any;
   private _authStatus$!: BehaviorSubject<boolean>;
   private _logoutMessage$ = new BehaviorSubject<string | null>(null);
-public logoutMessage$ = this._logoutMessage$.asObservable();
+  public logoutMessage$ = this._logoutMessage$.asObservable();
 
   constructor(
     private _http: HttpClient,
     private _tokenService: TokenService,
-    private _userStore: UserStoreService
+    private _userStore: UserStoreService,
+    private _router: Router
   ) {
-    this._authStatus$ = new BehaviorSubject<boolean>(this._tokenService.isLogged()); 
+    this._authStatus$ = new BehaviorSubject<boolean>(this._tokenService.isLogged());
     this._userPayload = this._decodeToken();
     console.log('User Payload après décode :', this._userPayload);
   }
-  
 
   public register$(email: string, password: string): Observable<boolean> {
     return this._http.post<boolean>('http://localhost:8080/auth/register', { email, password });
@@ -57,6 +57,15 @@ public logoutMessage$ = this._logoutMessage$.asObservable();
         this._authStatus$.next(true);
 
         console.log('les roles');
+        const roles = this.getRoleFromToken();
+
+        if (roles.includes('ROLE_PROVIDER')) {
+          this._router.navigate(['/providers']);
+        } else if (roles.includes('ROLE_ADMIN')) {
+          this._router.navigate(['/products']);
+        } else {
+          this._router.navigate(['/']);
+        }
       }),
       map(res => res.token)
     );
@@ -87,7 +96,7 @@ public logoutMessage$ = this._logoutMessage$.asObservable();
     this._tokenService.clearToken();
     this._userPayload = null;
     this._authStatus$.next(false);
-    this._logoutMessage$.next('Vous avez été déconnecté(e).')
+    this._logoutMessage$.next('Vous avez été déconnecté(e).');
   }
 
   private _decodeToken(): unknown {

src/app/core/services/login.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { LoginService } from './login.service';
+
+describe('LoginService', () => {
+  let service: LoginService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(LoginService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/core/services/login.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { AuthService } from './auth.service';
+import { Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LoginService {
+  constructor(private _authService: AuthService, private _router: Router) {}
+
+  onLogin(email: string, password: string): void {
+    this._authService.login$(email, password).subscribe({
+      next: () => {
+        const roles = this._authService.getRoleFromToken();
+        console.log('Rôles après login :', roles);
+
+        if (roles.includes('ROLE_PROVIDER')) {
+          this._router.navigate(['/providers']);
+        } else if (roles.includes('ROLE_USER')) {
+          this._router.navigate(['/products']); 
+        } else {
+          this._router.navigate(['/']);
+        }
+      },
+      error: err => {
+        console.error('Erreur de login', err);
+      }
+    });
+  }
+}

src/app/feature/provider/page/provider-home/provider-home.component.html

@@ -0,0 +1,2 @@
+<p>provider-home works!</p>
+<app-banner-home></app-banner-home>