fix authenticated

Author: Fxdonad

src/app/features/auth/pages/error-404/error-404.component.html

@@ -1,7 +1,7 @@
 <div class="error-container">
   <!-- <div class="error-icon">😕</div> -->
   <!-- <h1>404</h1> -->
-  <ng-lottie [options]="lottieOptions" style="width: 500px; height: 500px">
+  <ng-lottie [options]="lottieOptions" style="width: 700px; height: 400px">
   </ng-lottie>
   <h2>Không tìm thấy trang</h2>
   <p>

src/app/features/auth/pages/error-404/error-404.component.scss

@@ -5,6 +5,7 @@
   justify-content: center;
   min-height: 80vh;
   text-align: center;
+  margin-top: 3rem;
   width: 100vw;
 }
 

src/app/shared/components/my-shared/header/header.ts

@@ -3,7 +3,6 @@ import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { ProfileMenuComponent } from './profile-menu.component';
-import { decodeJWT } from '../../../utils/stringProcess';
 import { ToggleSwitch } from '../../fxdonad-shared/toggle-switch/toggle-switch';
 import { ThemeService } from '../../../../styles/theme-service/theme.service';
 import { ProfileService } from '../../../../core/services/api-service/profile.service';
@@ -16,6 +15,7 @@ import { NotificationModalComponent } from './notification-modal/notification-mo
 import { NotificationSocketService } from '../../../../core/services/socket-service/notification-socket.service';
 import { NotificationListService } from '../../../../core/services/api-service/notification-list.service';
 import { sendNotification } from '../../../utils/notification';
+import { checkAuthenticated } from '../../../utils/authenRoleActions';
 
 @Component({
   selector: 'app-header',
@@ -37,7 +37,7 @@ export class HeaderComponent {
   isLoggedIn: boolean = false;
   showProfileMenu = false;
   isMenuVisible = false;
-  timeExpiresAt: string = '';
+  timeExpiresAt: Date = new Date();
   avatarUrl: string = '';
   avatarDefault = avatarUrlDefault;
   setPassword = false;
@@ -89,11 +89,8 @@ export class HeaderComponent {
 
     this.getCountNotice();
 
-    this.timeExpiresAt =
-      decodeJWT(localStorage.getItem('token') ?? '')?.expiresAt || '';
-    const expiresAt = new Date(this.timeExpiresAt).getTime();
-    // this.isLoggedIn = !isNaN(expiresAt) && Date.now() < expiresAt;
-    this.isLoggedIn = !!localStorage.getItem('token');
+    //kiểm tra trạng thái đăng nhập có hợp lệ không
+    this.isLoggedIn = checkAuthenticated();
   }
 
   organizations = [

src/app/shared/utils/authenRoleActions.ts

@@ -27,10 +27,11 @@ export function activeForMyContent(
 
 export function checkAuthenticated(): boolean {
   const decoded = decodeJWT(localStorage.getItem('token') ?? '');
+  console.log('expiresAt:', decoded.expiresAt);
+  console.log('now:', new Date());
 
   if (decoded?.expiresAt) {
-    const expiresAt = new Date(decoded.expiresAt); // nếu expiresAt là string
-    return expiresAt > new Date();
+    return decoded.expiresAt > new Date();
   } else {
     return false;
   }

src/app/shared/utils/stringProcess.ts

@@ -121,8 +121,8 @@ export function removeSpecialCharacters(str: string): string {
 export function decodeJWT(token: string | null): {
   header: any;
   payload: DecodedJwtPayload;
-  issuedAt?: string;
-  expiresAt?: string;
+  issuedAt?: Date;
+  expiresAt?: Date;
 } {
   try {
     if (!token) {
@@ -165,13 +165,9 @@ export function decodeJWT(token: string | null): {
     const header = base64UrlDecode(header64);
     const payload = base64UrlDecode(payload64) as DecodedJwtPayload;
 
-    const issuedAt = payload.iat
-      ? new Date(payload.iat * 1000).toLocaleString()
-      : undefined;
+    const issuedAt = payload.iat ? new Date(payload.iat * 1000) : undefined;
 
-    const expiresAt = payload.exp
-      ? new Date(payload.exp * 1000).toLocaleString()
-      : undefined;
+    const expiresAt = payload.exp ? new Date(payload.exp * 1000) : undefined;
 
     return {
       header,