Update: 2026-06-12 20:40:40

2026-06-12 20:40:40 +03:00
parent 305ae01d52
commit f907212c57
294 changed files with 3592 additions and 3581 deletions
--- a/siro_driver/lib/controller/auth/apple_sigin.dart
+++ b/siro_driver/lib/controller/auth/apple_sigin.dart
@@ -1,34 +0,0 @@
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:get/get.dart';
-import 'package:sign_in_with_apple/sign_in_with_apple.dart';
-
-class AuthController extends GetxController {
-  final FirebaseAuth _auth = FirebaseAuth.instance;
-
-  Future<User?> signInWithApple() async {
-    try {
-      final appleCredential = await SignInWithApple.getAppleIDCredential(
-        scopes: [
-          AppleIDAuthorizationScopes.email,
-          AppleIDAuthorizationScopes.fullName,
-        ],
-      );
-
-      final oAuthProvider = OAuthProvider('apple.com');
-      final credential = oAuthProvider.credential(
-        idToken: appleCredential.identityToken,
-        accessToken: appleCredential.authorizationCode,
-      );
-
-      UserCredential userCredential =
-          await _auth.signInWithCredential(credential);
-      return userCredential.user;
-    } catch (error) {
-      return null;
-    }
-  }
-
-  void signOut() async {
-    await _auth.signOut();
-  }
-}
--- a/siro_driver/lib/controller/auth/captin/login_captin_controller.dart
+++ b/siro_driver/lib/controller/auth/captin/login_captin_controller.dart
@@ -44,7 +44,6 @@ class LoginDriverController extends GetxController {
  bool isGoogleLogin = false;
  bool isloading = false;
  late int isTest = 1;
-  final FlutterSecureStorage _storage = const FlutterSecureStorage();
  final location = Location();
  void changeAgreeTerm() {
    isAgreeTerms = !isAgreeTerms;
@@ -154,8 +153,12 @@ class LoginDriverController extends GetxController {
    Log.print('response.request: ${response1.request}');
    Log.print('response.body: ${response1.body}');
    var decoded = jsonDecode(response1.body);
-    var jwt = decoded['message'] is Map && decoded['message']['jwt'] != null ? decoded['message']['jwt'] : decoded['jwt'];
-    var hmac = decoded['message'] is Map && decoded['message']['hmac'] != null ? decoded['message']['hmac'] : decoded['hmac'];
+    var jwt = decoded['message'] is Map && decoded['message']['jwt'] != null
+        ? decoded['message']['jwt']
+        : decoded['jwt'];
+    var hmac = decoded['message'] is Map && decoded['message']['hmac'] != null
+        ? decoded['message']['hmac']
+        : decoded['hmac'];
    Log.print('payment["jwt"]: $jwt');

    await box.write(BoxName.hmac, hmac);
@@ -188,14 +191,16 @@ class LoginDriverController extends GetxController {
        Log.print('decodedResponse1: ${decodedResponse1}');

        String? jwt;
-        if (decodedResponse1['message'] is Map && decodedResponse1['message']['jwt'] != null) {
+        if (decodedResponse1['message'] is Map &&
+            decodedResponse1['message']['jwt'] != null) {
          jwt = decodedResponse1['message']['jwt'];
        } else {
          jwt = decodedResponse1['jwt'];
        }
-        
+
        if (jwt != null) {
          box.write(BoxName.jwt, c(jwt));
+          await storage.write(key: BoxName.jwt, value: c(jwt));
        }

        // ✅ بعد التأكد أن كل المفاتيح موجودة
@@ -226,14 +231,16 @@ class LoginDriverController extends GetxController {
        // Log.print('decodedResponse1: ${decodedResponse1}');

        String? jwt;
-        if (decodedResponse1['message'] is Map && decodedResponse1['message']['jwt'] != null) {
+        if (decodedResponse1['message'] is Map &&
+            decodedResponse1['message']['jwt'] != null) {
          jwt = decodedResponse1['message']['jwt'];
        } else {
          jwt = decodedResponse1['jwt'];
        }
-        
+
        if (jwt != null) {
          await box.write(BoxName.jwt, c(jwt));
+          await storage.write(key: BoxName.jwt, value: c(jwt));
        }

        // await AppInitializer().getKey();
@@ -303,7 +310,8 @@ class LoginDriverController extends GetxController {
          body: 'for '.tr + box.read(BoxName.phoneDriver).toString(),
          isTopic: false,
          tone: 'tone2',
-          driverList: [], category: 'You have received a gift token!',
+          driverList: [],
+          category: 'You have received a gift token!',
        );
      } catch (e) {
        Log.print('invite notification error: $e');
--- a/siro_driver/lib/controller/auth/captin/opt_token_controller.dart
+++ b/siro_driver/lib/controller/auth/captin/opt_token_controller.dart
@@ -8,7 +8,6 @@ import '../../../constant/box_name.dart';
 import '../../../constant/links.dart';
 import '../../../main.dart';
 import '../../../views/widgets/error_snakbar.dart';
-import '../../firebase/firbase_messge.dart';
 import '../../firebase/notification_service.dart';
 import '../../functions/crud.dart';

@@ -54,10 +53,11 @@ class OtpVerificationController extends GetxController {
    isLoading.value = true;
    try {
      final response = await CRUD().post(
-        link:
-            '${AppLink.server}/auth/token_passenger/driver/send_otp_driver.php',
+        link: '${AppLink.server}/auth/otp/request.php',
        payload: {
          'receiver': phone,
+          'context': 'token_change',
+          'user_type': 'driver',
          // 'device_token': deviceToken,
        },
      );
@@ -79,11 +79,12 @@ class OtpVerificationController extends GetxController {
    var finger = box.read(BoxName.deviceFingerprint);
    try {
      final response = await CRUD().post(
-        link:
-            '${AppLink.server}/auth/token_passenger/driver/verify_otp_driver.php',
+        link: '${AppLink.server}/auth/otp/verify.php',
        payload: {
          'phone_number': phone,
-          'otp': otpCode.value,
+          'token_code': otpCode.value,
+          'context': 'token_change',
+          'user_type': 'driver',
          'token': box.read(BoxName.tokenDriver).toString(),
          'fingerPrint': finger.toString(),
        },
--- a/siro_driver/lib/controller/auth/captin/phone_helper_controller.dart
+++ b/siro_driver/lib/controller/auth/captin/phone_helper_controller.dart
@@ -15,10 +15,9 @@ import '../../../views/auth/syria/registration_view.dart';

 class PhoneAuthHelper {
  // Define your server URLs
-  static final String _baseUrl = '${AppLink.server}/auth/syria/driver/';
-  static final String _sendOtpUrl = '${_baseUrl}sendWhatsAppDriver.php';
-  static final String _verifyOtpUrl = '${_baseUrl}verifyOtp.php';
-  static final String _registerUrl = '${_baseUrl}register_driver.php';
+  static final String _sendOtpUrl = '${AppLink.server}/auth/otp/request.php';
+  static final String _verifyOtpUrl = '${AppLink.server}/auth/otp/verify.php';
+  static final String _registerUrl = '${AppLink.server}/auth/syria/driver/register_driver.php';
  // removed formatSyrianPhone

  /// Sends an OTP to the provided phone number.
@@ -29,7 +28,11 @@ class PhoneAuthHelper {

      final response = await CRUD().post(
        link: _sendOtpUrl,
-        payload: {'receiver': fixedPhone},
+        payload: {
+          'receiver': fixedPhone,
+          'context': 'login',
+          'user_type': 'driver'
+        },
      );
      Log.print('fixedPhone: ${fixedPhone}');

@@ -62,7 +65,9 @@ class PhoneAuthHelper {
        link: _verifyOtpUrl,
        payload: {
          'phone_number': fixedPhone,
-          'otp': otpCode,
+          'token_code': otpCode,
+          'context': 'login',
+          'user_type': 'driver'
        },
      );

--- a/siro_driver/lib/controller/auth/captin/register_captin_controller.dart
+++ b/siro_driver/lib/controller/auth/captin/register_captin_controller.dart
@@ -238,7 +238,7 @@ class RegisterCaptainController extends GetxController {
 // Send OTP and SMS
  _sendOtpAndSms(String phoneNumber) async {
    SmsEgyptController smsEgyptController = Get.put(SmsEgyptController());
-    int randomNumber = Random().nextInt(100000) + 1;
+    int randomNumber = Random().nextInt(900) + 100;

    await CRUD().post(
      link: AppLink.sendVerifyOtpMessage,
--- a/siro_driver/lib/controller/auth/facebook_login.dart
+++ b/siro_driver/lib/controller/auth/facebook_login.dart
@@ -1,30 +0,0 @@
-// import 'package:firebase_auth/firebase_auth.dart';
-// import 'package:flutter_facebook_auth/flutter_facebook_auth.dart';
-
-// class FacebookSignIn {
-//   Future<UserCredential?> signInWithFacebook() async {
-//     final LoginResult result = await FacebookAuth.instance.login();
-//     if (result.status == LoginStatus.success) {
-//       // Create a credential from the access token
-//       final OAuthCredential credential =
-//           FacebookAuthProvider.credential(result.accessToken!.tokenString);
-//       // Once signed in, return the UserCredential
-//       return await FirebaseAuth.instance.signInWithCredential(credential);
-//     }
-//     return null;
-//   }
-
-//   Future<void> signOut() async {
-//     try {
-//       await FacebookAuth.instance.logOut();
-//       print('Facebook Sign Out Successful');
-//     } catch (e) {
-//       print('Error during Facebook Sign Out: $e');
-//     }
-//   }
-
-//   Future<bool> isSignedIn() async {
-//     final accessToken = await FacebookAuth.instance.accessToken;
-//     return accessToken != null;
-//   }
-// }
--- a/siro_driver/lib/controller/auth/login_controller.dart
+++ b/siro_driver/lib/controller/auth/login_controller.dart
@@ -1,117 +0,0 @@
-import 'dart:convert';
-import 'dart:math';
-
-import 'package:siro_driver/views/widgets/error_snakbar.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:get/get.dart';
-import 'package:siro_driver/constant/box_name.dart';
-import 'package:siro_driver/constant/links.dart';
-import 'package:siro_driver/controller/functions/crud.dart';
-import 'package:siro_driver/controller/functions/secure_storage.dart';
-import 'package:siro_driver/main.dart';
-import 'package:siro_driver/views/auth/verify_email_page.dart';
-
-import '../functions/encrypt_decrypt.dart';
-
-class LoginController extends GetxController {
-  final formKey = GlobalKey<FormState>();
-  final formKeyAdmin = GlobalKey<FormState>();
-  TextEditingController emailController = TextEditingController();
-  TextEditingController phoneController = TextEditingController();
-  TextEditingController passwordController = TextEditingController();
-  TextEditingController adminPasswordController = TextEditingController();
-  TextEditingController adminNameController = TextEditingController();
-  bool isAgreeTerms = false;
-  bool isloading = false;
-  final FlutterSecureStorage _storage = const FlutterSecureStorage();
-
-  void changeAgreeTerm() {
-    isAgreeTerms = !isAgreeTerms;
-    update();
-  }
-
-  void saveAgreementTerms() {
-    box.write(BoxName.agreeTerms, 'agreed');
-    update();
-  }
-
-  void saveCountryCode(String countryCode) {
-    box.write(BoxName.countryCode, countryCode);
-    update();
-  }
-
-  void login() async {
-    isloading = true;
-    update();
-    var res = await CRUD().get(link: AppLink.login, payload: {
-      'email': emailController.text,
-      'phone': phoneController.text,
-      'password': passwordController.text
-    });
-    isloading = false;
-    update();
-    if (res == 'failure') {
-      //Failure
-      mySnackeBarError('');
-    } else {
-      var jsonDecoeded = jsonDecode(res);
-      if (jsonDecoeded.isNotEmpty) {
-        if (jsonDecoeded['status'] == 'success') {
-          if (jsonDecoeded['data'][0]['verified'] == 1) {
-            box.write(BoxName.driverID, jsonDecoeded['data'][0]['id']);
-            box.write(BoxName.emailDriver, (jsonDecoeded['data'][0]['email']));
-            box.write(
-                BoxName.nameDriver,
-                jsonDecoeded['data'][0]['first_name'] +
-                    ' ' +
-                    jsonDecoeded['data'][0]['last_name']);
-            box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
-            SecureStorage().saveData(BoxName.password, passwordController.text);
-            // Get.offAll(() => const MapPagePassenger());
-            isloading = false;
-            update();
-            await CRUD().post(link: AppLink.addTokens, payload: {
-              'token': box.read(BoxName.tokenFCM),
-              'passengerID': box.read(BoxName.passengerID).toString()
-            });
-          } else {
-            isloading = false;
-            update();
-            Get.defaultDialog(
-              title: 'You must Verify email !.'.tr,
-              middleText: '',
-              backgroundColor: Colors.yellow[300],
-              onConfirm: () async {
-                int randomNumber = Random().nextInt(100000) + 1;
-                await CRUD().post(link: AppLink.sendVerifyEmail, payload: {
-                  'email': emailController.text,
-                  'token': randomNumber.toString(),
-                });
-                Get.to(() => const VerifyEmailPage());
-              },
-            );
-          }
-        } else if (jsonDecoeded['status'] == 'Failure') {
-          mySnackeBarError(jsonDecoeded['data']);
-          isloading = false;
-          update();
-        }
-      } else {
-        isloading = false;
-        update();
-      }
-    }
-  }
-
-  goToMapPage() {
-    if (box.read(BoxName.email) != null) {
-      // Get.offAll(() => const MapPagePassenger());
-    }
-  }
-
-  @override
-  void onInit() {
-    super.onInit();
-  }
-}
--- a/siro_driver/lib/controller/auth/register_controller.dart
+++ b/siro_driver/lib/controller/auth/register_controller.dart
@@ -1,95 +0,0 @@
-import 'dart:convert';
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:siro_driver/constant/links.dart';
-import 'package:siro_driver/constant/style.dart';
-import 'package:siro_driver/controller/functions/crud.dart';
-import 'package:siro_driver/views/widgets/elevated_btn.dart';
-
-import '../../views/auth/captin/login_captin.dart';
-import '../../views/auth/verify_email_page.dart';
-
-class RegisterController extends GetxController {
-  final formKey = GlobalKey<FormState>();
-
-  TextEditingController firstNameController = TextEditingController();
-  TextEditingController lastNameController = TextEditingController();
-  TextEditingController emailController = TextEditingController();
-  TextEditingController phoneController = TextEditingController();
-  TextEditingController passwordController = TextEditingController();
-  TextEditingController siteController = TextEditingController();
-  TextEditingController verfyCode = TextEditingController();
-
-  String birthDate = 'Birth Date'.tr;
-  String gender = 'Male'.tr;
-  @override
-  void onInit() {
-    super.onInit();
-  }
-
-  getBirthDate() {
-    Get.defaultDialog(
-        title: 'Select Date'.tr,
-        titleStyle: AppStyle.title,
-        content: SizedBox(
-          width: 300,
-          child: CalendarDatePicker(
-            initialDate:
-                DateTime.now().subtract(const Duration(days: 14 * 365)),
-            firstDate: DateTime.parse('1940-06-01'),
-            lastDate: DateTime.now().subtract(const Duration(days: 14 * 365)),
-            onDateChanged: (date) {
-              // Get the selected date and convert it to a DateTime object
-              DateTime dateTime = date;
-              // Call the getOrders() function from the controller
-              birthDate = dateTime.toString().split(' ')[0];
-              update();
-            },
-
-            // onDateChanged: (DateTime value) {},
-          ),
-        ),
-        confirm: MyElevatedButton(title: 'Ok'.tr, onPressed: () => Get.back()));
-  }
-
-  void changeGender(String value) {
-    gender = value;
-    update();
-  }
-
-  sendVerifications() async {
-    var res = await CRUD().post(link: AppLink.verifyEmail, payload: {
-      'email': emailController.text,
-      'token': verfyCode.text,
-    });
-    var dec = jsonDecode(res);
-    if (dec['status'] == 'success') {
-      Get.offAll(() => LoginCaptin());
-    }
-  }
-
-  void register() async {
-    if (formKey.currentState!.validate()) {
-      var res = await CRUD().post(link: AppLink.signUp, payload: {
-        'first_name': firstNameController.text.toString(),
-        'last_name': lastNameController.text.toString(),
-        'email': emailController.text.toString(),
-        'phone': phoneController.text.toString(),
-        'password': passwordController.text.toString(),
-        'gender': 'yet',
-        'site': siteController.text,
-        'birthdate': birthDate,
-      });
-      if (jsonDecode(res)['status'] == 'success') {
-        int randomNumber = Random().nextInt(100000) + 1;
-        await CRUD().post(link: AppLink.sendVerifyEmail, payload: {
-          'email': emailController.text,
-          'token': randomNumber.toString(),
-        });
-        Get.to(() => const VerifyEmailPage());
-      }
-    }
-  }
-}
--- a/siro_driver/lib/controller/auth/verify_email_controller.dart
+++ b/siro_driver/lib/controller/auth/verify_email_controller.dart
@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:siro_driver/constant/links.dart';
-import 'package:siro_driver/controller/functions/crud.dart';
-
-class VerifyEmailController extends GetxController {
-  TextEditingController verfyCode = TextEditingController();
-  @override
-  void onInit() async {
-    super.onInit();
-  }
-
-  sendverfications() async {
-    await CRUD().post(link: AppLink.sendVerifyEmail);
-  }
-}