From f3e5117c198941109eeba9947eb317036f14d487 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Fri, 26 Jun 2026 01:17:02 +0300
Subject: [PATCH] Update: 2026-06-26 01:17:02

---
 siro_service/lib/controller/functions/crud.dart |  1 +
 .../lib/controller/login_controller.dart        | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/siro_service/lib/controller/functions/crud.dart b/siro_service/lib/controller/functions/crud.dart
index 29b090d6..e56e0691 100644
--- a/siro_service/lib/controller/functions/crud.dart
+++ b/siro_service/lib/controller/functions/crud.dart
@@ -279,6 +279,7 @@ class CRUD {
     var payload = {
       'fingerprint': _getFpHeader(),
       'password': box.read(BoxName.password) ?? '',
+      'email': box.read(BoxName.email) ?? '',
       'aud': 'service',
     };
 
diff --git a/siro_service/lib/controller/login_controller.dart b/siro_service/lib/controller/login_controller.dart
index 6b53d69a..9687c54c 100644
--- a/siro_service/lib/controller/login_controller.dart
+++ b/siro_service/lib/controller/login_controller.dart
@@ -46,6 +46,21 @@ class LoginController extends GetxController {
     if (res != 'failure' && res is Map && res['status'] == 'success') {
       var d = res['message']; // V1 returns {status, message: {jwt, data: {user...}}}
 
+      // Save JWT immediately so subsequent CRUD calls don't trigger
+      // unnecessary session refresh (which calls getJWT without email)
+      final jwt = d['jwt'];
+      final hmac = d['hmac'];
+      await box.write(BoxName.jwt, c(jwt));
+      await storage.write(key: BoxName.jwt, value: c(jwt));
+      if (hmac != null) {
+        await box.write(BoxName.hmac, hmac);
+      }
+      await storage.write(key: 'password', value: pass);
+      await box.write(BoxName.password, pass);
+      final emailStr = email.text.trim();
+      await storage.write(key: 'email', value: emailStr);
+      await box.write(BoxName.email, emailStr);
+
       // Request OTP from unified module
       String phone = d['data']['phone'] ?? '';
       bool otpSent = await _sendOtp(phone);
@@ -73,7 +88,7 @@ class LoginController extends GetxController {
           'user_type': 'service'
         },
       );
-      return response != 'failure';
+      return response is Map && response['status'] == 'success';
     } catch (e) {
       Log.print('OTP SEND ERROR: $e');
       return false;