Update: 2026-06-16 04:29:16

siro_service/lib/controller/functions/crud.dart

@@ -10,13 +10,13 @@ import 'package:siro_service/constant/links.dart';
 import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
 import 'package:siro_service/env/env.dart';
 import 'package:siro_service/controller/functions/security_helper.dart';
+import 'package:siro_service/controller/functions/session_manager.dart';
 import 'package:siro_service/main.dart';
 import 'package:siro_service/print.dart';
 
 import '../../constant/api_key.dart';
 
 class CRUD {
-  static bool _isRefreshingJWT = false;
   static String? _appSignature;
 
   static String _lastErrorSignature = '';
@@ -24,7 +24,7 @@ class CRUD {
   static const Duration _errorLogDebounceDuration = Duration(minutes: 1);
 
   // ── JWT Validity Check (No external libs) ──────────────────────
-  static bool _isJwtValid(String? token) {
+  static bool isJwtValid(String? token) {
     if (token == null || token.isEmpty) return false;
     try {
       final parts = token.split('.');
@@ -192,13 +192,16 @@ class CRUD {
     }
 
     if (sc == 401) {
-      if (!_isRefreshingJWT && !link.contains('errorApp.php')) {
-        _isRefreshingJWT = true;
-        try {
-          await getJWT();
-        } finally {
-          _isRefreshingJWT = false;
+      // استخدام SessionManager لتجديد الجلسة عند 401
+      if (Get.isRegistered<SessionManager>()) {
+        final sessionManager = Get.find<SessionManager>();
+        if (!sessionManager.isRefreshing.value &&
+            !link.contains('errorApp.php')) {
+          await sessionManager.refreshSession(silent: false);
         }
+      } else {
+        // fallback للتجديد القديم
+        await getJWT();
       }
       return 'token_expired';
     }
@@ -220,15 +223,21 @@ class CRUD {
   }) async {
     String token = r(box.read(BoxName.jwt) ?? '').toString().split(Env.addd)[0];
 
-    if (!_isJwtValid(token) &&
-        !_isRefreshingJWT &&
-        !link.contains('login.php')) {
-      _isRefreshingJWT = true;
-      try {
+    // استخدام SessionManager للتحقق من صلاحية الجلسة قبل كل طلب
+    bool isRefreshing = false;
+    if (Get.isRegistered<SessionManager>()) {
+      isRefreshing = Get.find<SessionManager>().isRefreshing.value;
+    }
+
+    if (!isJwtValid(token) && !isRefreshing && !link.contains('login.php')) {
+      if (Get.isRegistered<SessionManager>()) {
+        final sessionManager = Get.find<SessionManager>();
+        await sessionManager.refreshSession(silent: true);
+        token = r(box.read(BoxName.jwt) ?? '').toString().split(Env.addd)[0];
+      } else {
+        // fallback: تجديد يدوي
         await getJWT();
         token = r(box.read(BoxName.jwt) ?? '').toString().split(Env.addd)[0];
-      } finally {
-        _isRefreshingJWT = false;
       }
     }