From b85aa0f93db966d5e78863db9e5188db8385baf4 Mon Sep 17 00:00:00 2001
From: zadi francice <mrfrancice@gmail.com>
Date: Wed, 8 May 2024 15:46:29 +0000
Subject: [PATCH] authenfication

---
 src/app/account/auth/login-standard-user/login-standard-user.component.ts | 21 +++++++++++++++------
 src/app/core/layout/navbar/navbar.component.ts                            | 18 ++++++++----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/app/account/auth/login-standard-user/login-standard-user.component.ts b/src/app/account/auth/login-standard-user/login-standard-user.component.ts
index d5b71aa..9a8d527 100644
--- a/src/app/account/auth/login-standard-user/login-standard-user.component.ts
+++ b/src/app/account/auth/login-standard-user/login-standard-user.component.ts
@@ -76,7 +76,6 @@ export class LoginStandardUserComponent implements OnInit {
   isActive = false;
 
   msgAuth = '';
-
   // eslint-disable-next-line @angular-eslint/no-empty-lifecycle-method
   ngOnInit() {
     this.user = {
@@ -91,14 +90,24 @@ export class LoginStandardUserComponent implements OnInit {
       password: this.user.password,
     });
 
+    let token: string;
+    console.log('Token ==> ', this.authService.token);
     if (this.authService.token) {
-      this.authService.verifyToken(this.authService.token).subscribe(result => {
+      token = this.authService.token;
+    } else {
+      const localStorageToken = localStorage.getItem('token');
+      token = localStorageToken ? String(localStorageToken) : '';
+    }
+    console.log('Token ==> ', token);
+    if (token) {
+      this.authService.verifyToken(token).subscribe(result => {
         if (result.status) {
           console.log('Token vérifié avec succès');
-          console.log('accessToken', this.authService.token);
+          console.log('accessToken', token);
           localStorage.setItem('isLoggedIn', 'true');
-          localStorage.setItem('token', this.user.username);
-          // Remplacez 'page-accueil' par l'URL de la page à laquelle vous souhaitez rediriger
+          localStorage.setItem('token', token);
+          localStorage.setItem('username', this.user.username);
+          // Remplacez 'dash' par l'URL de la page à laquelle vous souhaitez rediriger
           console.log("Redirection vers 'dash'");
           this.router.navigate(['/admin']);
         } else {
@@ -106,7 +115,7 @@ export class LoginStandardUserComponent implements OnInit {
         }
       });
     } else {
-      console.log('token non identifié');
+      console.log('Token non trouvé');
     }
   }
 
diff --git a/src/app/core/layout/navbar/navbar.component.ts b/src/app/core/layout/navbar/navbar.component.ts
index 2700ff7..dedcd01 100644
--- a/src/app/core/layout/navbar/navbar.component.ts
+++ b/src/app/core/layout/navbar/navbar.component.ts
@@ -12,18 +12,16 @@ import { Router } from '@angular/router';
 })
 export class NavbarComponent {
   userEmail: string | null | undefined;
-  ngOnInit() {  
-    this.userEmail = localStorage.getItem('token');  
-    console.log(this.userEmail);  
-  } 
- 
-  private router = inject(Router)
+  ngOnInit() {
+    this.userEmail = localStorage.getItem('username');
+    console.log(this.userEmail);
+  }
 
-  deconnxionlogin()
-{
+  private router = inject(Router);
 
-    localStorage.setItem('isLoggedIn', "false"); 
-    localStorage.removeItem('token'); 
+  deconnxionlogin() {
+    localStorage.setItem('isLoggedIn', 'false');
+    localStorage.removeItem('token');
     // // Remplacez 'page-accueil' par l'URL de la page à laquelle vous souhaitez rediriger
     // console.log("Redirection vers 'dash'");
     this.router.navigate(['/auth']);
--
libgit2 0.27.1