-เพิ่ม guard jwt token
-เพิ่ม jwt-decoded -เพิ่ม ระบบ first setup ดึงข้อมูล accounting
This commit is contained in:
@@ -61,6 +61,7 @@
|
||||
"bootstrap": "^5.3.8",
|
||||
"chart.js": "^4.5.1",
|
||||
"dotenv": "^17.2.3",
|
||||
"jwt-decode": "^4.0.0",
|
||||
"ng2-charts": "^6.0.1",
|
||||
"postcss": "^8.5.6",
|
||||
"rxjs": "~7.8.0",
|
||||
@@ -73,6 +74,7 @@
|
||||
"@angular/cli": "^20.3.9",
|
||||
"@angular/compiler-cli": "^20.3.10",
|
||||
"@capacitor/cli": "latest",
|
||||
"@types/jasmine": "~5.1.0",
|
||||
"cross-env": "^10.1.0",
|
||||
"electron": "^39.0.0",
|
||||
"electron-builder": "^26.0.12",
|
||||
@@ -84,7 +86,6 @@
|
||||
"karma-jasmine-html-reporter": "~2.1.0",
|
||||
"ngx-toastr": "^19.1.0",
|
||||
"postcss": "^8.5.3",
|
||||
"typescript": "~5.9.3",
|
||||
"@types/jasmine": "~5.1.0"
|
||||
"typescript": "~5.9.3"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,31 +47,53 @@ export class MainDashboardContentComponent implements OnInit {
|
||||
constructor(private generalService: GeneralService) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.fetchChartData();
|
||||
let token = localStorage.getItem('access_token')
|
||||
this.OnSearchAct(token, true);
|
||||
}
|
||||
|
||||
fetchChartData(): void {
|
||||
// NOTE: Using a placeholder endpoint as the actual one was not provided.
|
||||
const uri = '/api/dashboard/summary-last-6-months';
|
||||
|
||||
this.generalService.getRequest(uri).subscribe({
|
||||
OnSearchAct(value: any, setupFirst: boolean): void {
|
||||
const uri = '/api/web/accountingSearch';
|
||||
let request = {
|
||||
token: value
|
||||
}
|
||||
this.generalService.postRequest(uri, request).subscribe({
|
||||
next: (result: any) => {
|
||||
if (result.code === '200' && result.data) {
|
||||
this.processChartData(result.data);
|
||||
} else {
|
||||
console.warn('Could not fetch chart data:', result.message_th);
|
||||
// Optionally, display placeholder data or an error message
|
||||
this.setupPlaceholderData();
|
||||
if (result.code === '200') {
|
||||
this.generalService.trowApi(result);
|
||||
console.log(`✅ OTP ส่งไปที่ ${value.email}`);
|
||||
}
|
||||
},
|
||||
error: (error: any) => {
|
||||
console.error('Error fetching chart data:', error);
|
||||
// Display placeholder data on error to show the graph structure
|
||||
this.setupPlaceholderData();
|
||||
|
||||
},
|
||||
complete: () => {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// fetchChartData(): void {
|
||||
// // NOTE: Using a placeholder endpoint as the actual one was not provided.
|
||||
// const uri = '/api/dashboard/summary-last-6-months';
|
||||
|
||||
// this.generalService.getRequest(uri).subscribe({
|
||||
// next: (result: any) => {
|
||||
// if (result.code === '200' && result.data) {
|
||||
// this.processChartData(result.data);
|
||||
// } else {
|
||||
// console.warn('Could not fetch chart data:', result.message_th);
|
||||
// // Optionally, display placeholder data or an error message
|
||||
// this.setupPlaceholderData();
|
||||
// }
|
||||
// },
|
||||
// error: (error: any) => {
|
||||
// console.error('Error fetching chart data:', error);
|
||||
// // Display placeholder data on error to show the graph structure
|
||||
// this.setupPlaceholderData();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
|
||||
processChartData(data: any[]): void {
|
||||
const labels = data.map(item => item.month);
|
||||
const revenues = data.map(item => item.revenue);
|
||||
|
||||
@@ -1,12 +1,30 @@
|
||||
import { inject } from '@angular/core';
|
||||
import { CanActivateFn, Router } from '@angular/router';
|
||||
import { jwtDecode } from 'jwt-decode';
|
||||
|
||||
export const authGuard: CanActivateFn = (route, state) => {
|
||||
const router = inject(Router);
|
||||
const accessToken = localStorage.getItem('access_token');
|
||||
|
||||
if (accessToken) {
|
||||
return true;
|
||||
try {
|
||||
const decodedToken: any = jwtDecode(accessToken);
|
||||
const currentTime = Date.now() / 1000;
|
||||
|
||||
if (decodedToken.exp < currentTime) {
|
||||
// Token expired
|
||||
localStorage.removeItem('access_token');
|
||||
router.navigate(['/login']);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
// Error decoding token
|
||||
localStorage.removeItem('access_token');
|
||||
router.navigate(['/login']);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
router.navigate(['/login']);
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user