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_rider/android/app/src/main/res/xml/network_security_config.xml
+++ b/siro_rider/android/app/src/main/res/xml/network_security_config.xml
@@ -7,13 +7,14 @@
    </base-config>

    <domain-config cleartextTrafficPermitted="false">
-
        <domain includeSubdomains="true">intaleq.xyz</domain>
+        <domain includeSubdomains="true">siromove.com</domain>

-        <pin-set expiration="2027-01-01">
-            <pin digest="SHA-256">pXmP2hTQLxDEvlTVmP5N7xpiA32sycBsxB6hBFT2uL4=</pin>
-
+        <pin-set expiration="2028-01-01">
+            <!-- Primary: ISRG Root X1 (RSA) -->
            <pin digest="SHA-256">C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHESsl=</pin>
+            <!-- Backup: ISRG Root X2 (ECDSA) -->
+            <pin digest="SHA-256">diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=</pin>
        </pin-set>
    </domain-config>

--- a/siro_rider/lib/constant/links.dart
+++ b/siro_rider/lib/constant/links.dart
@@ -410,8 +410,8 @@ static String get loginCaptin => "$authCaptin/login.php";
 static String get loginFromGoogleCaptin => "$authCaptin/loginFromGoogle.php";
 static String get signUpCaptin => "$authCaptin/register.php";
 static String get sendVerifyEmailCaptin => "$authCaptin/sendVerifyEmail.php";
-static String get sendVerifyOtpMessage => "$server/auth/otpmessage.php";
-static String get verifyOtpMessage => "$server/auth/verifyOtpMessage.php";
+static String get sendVerifyOtpMessage => "$server/auth/otp/request.php";
+static String get verifyOtpMessage => "$server/auth/otp/verify.php";
 static String get verifyEmailCaptin => "$authCaptin/verifyEmail.php";
 static String get removeUser => "$authCaptin/removeAccount.php";
 static String get deletecaptainAccounr => "$authCaptin/deletecaptainAccounr.php";
@@ -439,10 +439,10 @@ static String get getRidesDetails => "$server/Admin/AdminRide/get.php";

 //////////Sms egypt///////////
 static String get sendSms => "https://sms.kazumi.me/api/sms/send-sms";
-static String get sendSmsFromPHP =>
-      '$server/auth/sms_new_backend/sendOtpPassenger.php';
-static String get verifyOtpPassenger =>
-      '$server/auth/passengerOTP/verifyOtpPassenger.php';
+  static String get sendSmsFromPHP =>
+      '$server/auth/otp/request.php';
+  static String get verifyOtpPassenger =>
+      '$server/auth/otp/verify.php';
 static String get senddlr => "https://sms.kazumi.me/api/sms/send-dlr";
 static String get sendvalidity => "https://sms.kazumi.me/api/sms/send-validity";
 static String get sendmany => "https://sms.kazumi.me/api/sms/send-many";
--- a/siro_rider/lib/controller/auth/otp_controller.dart
+++ b/siro_rider/lib/controller/auth/otp_controller.dart
@@ -14,10 +14,9 @@ import 'login_controller.dart';

 class PhoneAuthHelper {
  // Define your server URLs
-  static final String _baseUrl = '${AppLink.server}/auth/syria/';
-  static final String _sendOtpUrl = '${_baseUrl}sendWhatsOpt.php';
-  static final String _verifyOtpUrl = '${_baseUrl}verifyOtp.php';
-  static final String _registerUrl = '${_baseUrl}register_passenger.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/register_passenger.php';

  // removed formatSyrianPhone

@@ -29,7 +28,11 @@ class PhoneAuthHelper {

      final response = await CRUD().post(
        link: _sendOtpUrl,
-        payload: {'receiver': fixedPhone}, // ← ← استخدام الرقم المُعدّل
+        payload: {
+          'receiver': fixedPhone,
+          'context': 'login',
+          'user_type': 'passenger'
+        },
      );

      if (response != 'failure') {
@@ -60,7 +63,9 @@ class PhoneAuthHelper {
        link: _verifyOtpUrl,
        payload: {
          'phone_number': fixedPhone,
-          'otp': otpCode,
+          'token_code': otpCode,
+          'context': 'login',
+          'user_type': 'passenger'
        },
      );

--- a/siro_rider/lib/controller/auth/register_controller.dart
+++ b/siro_rider/lib/controller/auth/register_controller.dart
@@ -186,7 +186,9 @@ class RegisterController extends GetxController {
    // Trim any leading or trailing whitespace from the phone number
    phoneNumber = phoneNumber.trim();
    var dd = await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
-      'phone_number': (phoneNumber),
+      'receiver': phoneNumber,
+      'context': 'login',
+      'user_type': 'passenger'
    });
    Log.print('dd: ${dd}');

@@ -270,7 +272,9 @@ class RegisterController extends GetxController {
      if (formKey3.currentState!.validate()) {
        var res = await CRUD().post(link: AppLink.verifyOtpPassenger, payload: {
          'phone_number': phoneController.text,
-          'token': verifyCode.text,
+          'token_code': verifyCode.text,
+          'context': 'login',
+          'user_type': 'passenger'
        });

        if (res != 'failure') {
--- a/siro_rider/lib/controller/auth/token_otp_change_controller.dart
+++ b/siro_rider/lib/controller/auth/token_otp_change_controller.dart
@@ -55,9 +55,11 @@ class OtpVerificationController extends GetxController {
    isLoading.value = true;
    try {
      final response = await CRUD().post(
-        link: '${AppLink.server}/auth/token_passenger/send_otp.php',
+        link: '${AppLink.server}/auth/otp/request.php',
        payload: {
          'receiver': phone,
+          'context': 'token_change',
+          'user_type': 'passenger',
          // 'device_token': deviceToken,
        },
      );
@@ -81,10 +83,12 @@ class OtpVerificationController extends GetxController {
    try {
      String fingerPrint = await DeviceHelper.getDeviceFingerprint();
      final response = await CRUD().post(
-        link: '${AppLink.server}/auth/token_passenger/verify_otp.php',
+        link: '${AppLink.server}/auth/otp/verify.php',
        payload: {
          'phone_number': phone,
-          'otp': otpCode.value,
+          'token_code': otpCode.value,
+          'context': 'token_change',
+          'user_type': 'passenger',
          'token': box.read(BoxName.tokenFCM).toString(),
          'fingerPrint': fingerPrint.toString(),
        },
--- a/siro_rider/lib/controller/local/translations.dart
+++ b/siro_rider/lib/controller/local/translations.dart
@@ -84,6 +84,9 @@ class MyTranslation extends Translations {
          "Emergency SOS": "طوارئ SOS",
          "End": "إنهاء",
          "Enter the 5-digit code": "أدخل الكود المكون من ٥ أرقام",
+          "Enter the 3-digit code": "أدخل الكود المكون من ٣ أرقام",
+          "Already have an account? Login": "هل لديك حساب بالفعل؟ تسجيل الدخول",
+          "Don't have an account? Register": "ليس لديك حساب؟ تسجيل",
          "Enter your City": "أدخل مدينتك",
          "Enter your Password": "أدخل كلمة السر",
          "Failed to book trip: \$e": "فشل حجز المشوار",
@@ -1025,6 +1028,7 @@ class MyTranslation extends Translations {
          "We sent 5 digit to your Email provided":
              "بعتنا كود من ٥ أرقام لإيميلك",
          "5 digit": "5 أرقام",
+          "3 digit": "3 أرقام",
          "Send Verification Code": "بعت كود التأكيد",
          "Your Ride Duration is ": "مدة رحلتك هي ",
          "You will be thier in": "رح توصل بخلال",
@@ -24217,7 +24221,7 @@ class MyTranslation extends Translations {
          "Arrival time": "وقت الوصول",
          "arrival time to reach your point": "وقت الوصول لنقطتك",
          "For Siro and scooter trips, the price is calculated dynamically. For Comfort trips, the price is based on time and distance":
-              "للانطلاق والسكوتر السعر متغير. للراحة السعر بالوقت والمسافة.",
+              "لسيرو والسكوتر السعر متغير. للراحة السعر بالوقت والمسافة.",
          "Hello this is Driver": "هلا، أنا الكابتن",
          "Is the Passenger in your Car ?": "الراكب معك؟",
          "Please wait for the passenger to enter the car before starting the trip.":
--- a/siro_rider/lib/views/auth/login_page.dart
+++ b/siro_rider/lib/views/auth/login_page.dart
@@ -12,14 +12,12 @@ import 'package:path/path.dart';
 import 'package:url_launcher/url_launcher.dart';

 import '../../constant/info.dart';
-import '../../controller/auth/apple_signin_controller.dart';
 import '../../controller/auth/login_controller.dart';
 import '../widgets/elevated_btn.dart';
 import 'otp_page.dart';

 class LoginPage extends StatelessWidget {
  final controller = Get.put(LoginController());
-  final AuthController authController = Get.put(AuthController());

  LoginPage({super.key});

--- a/siro_rider/lib/views/auth/otp_page.dart
+++ b/siro_rider/lib/views/auth/otp_page.dart
@@ -570,7 +570,7 @@ class _OtpVerificationScreenState extends State<OtpVerificationScreen> {
              ),
              const SizedBox(width: 10),
              Text(
-                'Enter the 5-digit code'.tr,
+                'Enter the 3-digit code'.tr,
                style: TextStyle(
                  color: _textMain(isDark),
                  fontSize: 15,
--- a/siro_rider/lib/views/auth/sms_verfy_page.dart
+++ b/siro_rider/lib/views/auth/sms_verfy_page.dart
@@ -93,8 +93,8 @@ class SmsSignupEgypt extends StatelessWidget {
                    key: registerController.formKey3,
                    child: MyTextForm(
                        controller: registerController.verifyCode,
-                        label: '5 digit'.tr,
-                        hint: '5 digit'.tr,
+                        label: '3 digit'.tr,
+                        hint: '3 digit'.tr,
                        type: TextInputType.number),
                  ),
                ),