diff --git a/backend/auth/captin/addCriminalDocuments.php b/backend/auth/driver/addCriminalDocuments.php similarity index 100% rename from backend/auth/captin/addCriminalDocuments.php rename to backend/auth/driver/addCriminalDocuments.php diff --git a/backend/auth/checkPhoneNumberISVerfiedDriver.php b/backend/auth/driver/checkPhoneNumberISVerfied.php similarity index 100% rename from backend/auth/checkPhoneNumberISVerfiedDriver.php rename to backend/auth/driver/checkPhoneNumberISVerfied.php diff --git a/backend/auth/captin/deletecaptainAccounr.php b/backend/auth/driver/deleteAccount.php similarity index 100% rename from backend/auth/captin/deletecaptainAccounr.php rename to backend/auth/driver/deleteAccount.php diff --git a/backend/auth/syria/driver/driver_details.php b/backend/auth/driver/driver_details.php similarity index 100% rename from backend/auth/syria/driver/driver_details.php rename to backend/auth/driver/driver_details.php diff --git a/backend/auth/syria/driver/drivers_pending_list.php b/backend/auth/driver/drivers_pending_list.php similarity index 100% rename from backend/auth/syria/driver/drivers_pending_list.php rename to backend/auth/driver/drivers_pending_list.php diff --git a/backend/auth/captin/getAccount.php b/backend/auth/driver/getAccount.php similarity index 100% rename from backend/auth/captin/getAccount.php rename to backend/auth/driver/getAccount.php diff --git a/backend/auth/captin/getPromptDriverDocumentsEgypt.php b/backend/auth/driver/getPromptDriverDocumentsEgypt.php similarity index 100% rename from backend/auth/captin/getPromptDriverDocumentsEgypt.php rename to backend/auth/driver/getPromptDriverDocumentsEgypt.php diff --git a/backend/auth/syria/driver/isPhoneVerified.php b/backend/auth/driver/isPhoneVerified.php similarity index 100% rename from backend/auth/syria/driver/isPhoneVerified.php rename to backend/auth/driver/isPhoneVerified.php diff --git a/backend/auth/captin/login.php b/backend/auth/driver/login.php similarity index 100% rename from backend/auth/captin/login.php rename to backend/auth/driver/login.php diff --git a/backend/auth/captin/loginFromGoogle.php b/backend/auth/driver/loginFromGoogle.php similarity index 100% rename from backend/auth/captin/loginFromGoogle.php rename to backend/auth/driver/loginFromGoogle.php diff --git a/backend/auth/captin/loginUsingCredentialsWithoutGoogle.php b/backend/auth/driver/loginUsingCredentialsWithoutGoogle.php similarity index 100% rename from backend/auth/captin/loginUsingCredentialsWithoutGoogle.php rename to backend/auth/driver/loginUsingCredentialsWithoutGoogle.php diff --git a/backend/auth/syria/driver/register_driver_and_car.php b/backend/auth/driver/register.php similarity index 100% rename from backend/auth/syria/driver/register_driver_and_car.php rename to backend/auth/driver/register.php diff --git a/backend/auth/captin/removeAccount.php b/backend/auth/driver/removeAccount.php similarity index 100% rename from backend/auth/captin/removeAccount.php rename to backend/auth/driver/removeAccount.php diff --git a/backend/auth/token_passenger/driver/send_otp_driver.php b/backend/auth/driver/token/send_otp.php similarity index 100% rename from backend/auth/token_passenger/driver/send_otp_driver.php rename to backend/auth/driver/token/send_otp.php diff --git a/backend/auth/token_passenger/driver/verify_otp_driver.php b/backend/auth/driver/token/verify_otp.php similarity index 100% rename from backend/auth/token_passenger/driver/verify_otp_driver.php rename to backend/auth/driver/token/verify_otp.php diff --git a/backend/auth/captin/updateAccountBank.php b/backend/auth/driver/updateAccountBank.php similarity index 100% rename from backend/auth/captin/updateAccountBank.php rename to backend/auth/driver/updateAccountBank.php diff --git a/backend/auth/captin/updateDriverClaim.php b/backend/auth/driver/updateDriverClaim.php similarity index 100% rename from backend/auth/captin/updateDriverClaim.php rename to backend/auth/driver/updateDriverClaim.php diff --git a/backend/auth/captin/updateShamCashDriver.php b/backend/auth/driver/updateShamCashDriver.php similarity index 100% rename from backend/auth/captin/updateShamCashDriver.php rename to backend/auth/driver/updateShamCashDriver.php diff --git a/backend/auth/syria/uploadSyrianDocs.php b/backend/auth/driver/uploadDriverDocs.php similarity index 100% rename from backend/auth/syria/uploadSyrianDocs.php rename to backend/auth/driver/uploadDriverDocs.php diff --git a/backend/auth/syria/uploadImage.php b/backend/auth/driver/uploadImage.php similarity index 100% rename from backend/auth/syria/uploadImage.php rename to backend/auth/driver/uploadImage.php diff --git a/backend/auth/loginFromGooglePassenger.php b/backend/auth/passenger/loginFromGoogle.php similarity index 100% rename from backend/auth/loginFromGooglePassenger.php rename to backend/auth/passenger/loginFromGoogle.php diff --git a/backend/auth/loginUsingCredentialsWithoutGooglePassenger.php b/backend/auth/passenger/loginUsingCredentialsWithoutGoogle.php similarity index 100% rename from backend/auth/loginUsingCredentialsWithoutGooglePassenger.php rename to backend/auth/passenger/loginUsingCredentialsWithoutGoogle.php diff --git a/backend/auth/syria/register_passenger.php b/backend/auth/passenger/register.php similarity index 100% rename from backend/auth/syria/register_passenger.php rename to backend/auth/passenger/register.php diff --git a/backend/auth/passengerRemovedAccountEmail.php b/backend/auth/passenger/remove_account.php similarity index 100% rename from backend/auth/passengerRemovedAccountEmail.php rename to backend/auth/passenger/remove_account.php diff --git a/backend/auth/save_passenger_location.php b/backend/auth/passenger/save_location.php similarity index 100% rename from backend/auth/save_passenger_location.php rename to backend/auth/passenger/save_location.php diff --git a/backend/auth/token_passenger/send_otp.php b/backend/auth/passenger/token/send_otp.php similarity index 100% rename from backend/auth/token_passenger/send_otp.php rename to backend/auth/passenger/token/send_otp.php diff --git a/backend/auth/token_passenger/verify_otp.php b/backend/auth/passenger/token/verify_otp.php similarity index 100% rename from backend/auth/token_passenger/verify_otp.php rename to backend/auth/passenger/token/verify_otp.php diff --git a/backend/core/Auth/JwtService.php b/backend/core/Auth/JwtService.php index 1f16e1c0..3b65618b 100644 --- a/backend/core/Auth/JwtService.php +++ b/backend/core/Auth/JwtService.php @@ -25,7 +25,7 @@ class JwtService // Endpoints مسموح لها بتوكن نوع registration private const REGISTRATION_ENDPOINTS = [ 'loginFirstTime', 'loginFirstTimeDriver', - 'checkPhoneNumberISVerfiedDriver', 'checkPhoneNumberISVerfiedPassenger', + 'checkPhoneNumberISVerfied', 'checkPhoneNumberISVerfiedDriver', 'checkPhoneNumberISVerfiedPassenger', 'otpmessage', 'signup', 'verifyEmail', 'verifyOtpMessage', 'sendVerifyEmail', 'sendWhatsAppDriver', 'register_passenger', 'sendWhatsOpt', 'verifyOtp', 'auth_proxy', 'addToken', @@ -33,7 +33,7 @@ class JwtService 'loginFromGooglePassenger', 'loginUsingCredentialsWithoutGooglePassenger', 'register', 'sendOtpMessageDriver', 'getTokensPassenger', 'send_otp', 'verify_otp', 'errorApp', 'register_driver', - 'uploadImage', 'register_driver_and_car', + 'uploadImage', 'uploadDriverDocs', 'register_driver_and_car', ]; public function __construct(?Redis $redis = null) diff --git a/siro_driver/lib/constant/links.dart b/siro_driver/lib/constant/links.dart index ffc32a4d..de3c85e7 100755 --- a/siro_driver/lib/constant/links.dart +++ b/siro_driver/lib/constant/links.dart @@ -387,7 +387,7 @@ class AppLink { static String get getApiKey => "$ride/apiKey/get.php"; static String get getCnMap => "$server/auth/cnMap.php"; static String get getPromptDriverDocumentsEgypt => - "$server/auth/captin/getPromptDriverDocumentsEgypt.php"; + "$server/auth/driver/getPromptDriverDocumentsEgypt.php"; static String get saveDriverDestination => "$ride/location/save_driver_destination.php"; @@ -408,7 +408,7 @@ class AppLink { static String get updateApiKey => "$ride/apiKey/update.php"; static String get deleteApiKey => "$ride/apiKey/delete.php"; static String get checkPhoneNumberISVerfiedDriver => - "$auth/checkPhoneNumberISVerfiedDriver.php"; + "$auth/driver/checkPhoneNumberISVerfied.php"; static String get getTesterApp => "$auth/Tester/getTesterApp.php"; static String get updateTesterApp => "$auth/Tester/updateTesterApp.php"; @@ -476,7 +476,7 @@ class AppLink { static String get uploadImage1 => "$server/uploadImage1.php"; static String get uploadImagePortrate => "$server/uploadImagePortrate.php"; static String get uploadSyrianDocs => - "$syria/auth/syria/uploadSyrianDocs.php"; + "$syria/auth/driver/uploadDriverDocs.php"; static String get uploadImageType => "$server/uploadImageType.php"; //=============egypt documents ============== static String get uploadEgyptidFront => @@ -556,7 +556,7 @@ class AppLink { static String get updateInvitationCodeFromRegister => "$ride/invitor/updateInvitationCodeFromRegister.php"; static String get register_driver_and_car => - "$auth/syria/driver/register_driver_and_car.php"; + "$auth/driver/register.php"; static String get updateDriverInvitationDirectly => "$ride/invitor/updateDriverInvitationDirectly.php"; static String get updatePassengersInvitation => @@ -567,12 +567,12 @@ class AppLink { static String get auth => '$server/auth'; static String get login => "$auth/login.php"; static String get signUp => "$auth/signup.php"; - static String get updateDriverClaim => "$auth/captin/updateDriverClaim.php"; + static String get updateDriverClaim => "$auth/driver/updateDriverClaim.php"; static String get updateShamCashDriver => - "$auth/captin/updateShamCashDriver.php"; + "$auth/driver/updateShamCashDriver.php"; static String get sendVerifyEmail => "$auth/sendVerifyEmail.php"; static String get passengerRemovedAccountEmail => - "$auth/passengerRemovedAccountEmail.php"; + "$auth/passenger/remove_account.php"; static String get verifyEmail => "$auth/verifyEmail.php"; //===================Auth Captin============ static String get authCaptin => '$server/auth/captin'; @@ -595,7 +595,7 @@ class AppLink { static String get updateAccountBank => "$authCaptin/updateAccountBank.php"; static String get getAccount => "$authCaptin/getAccount.php"; static String get uploadImageToAi => "$auth/document_syria/ai_document.php"; - static String get isPhoneVerified => "$auth/syria/driver/isPhoneVerified.php"; + static String get isPhoneVerified => "$auth/driver/isPhoneVerified.php"; //===================Admin Captin============ diff --git a/siro_driver/lib/controller/auth/captin/opt_token_controller.dart b/siro_driver/lib/controller/auth/captin/opt_token_controller.dart index bc73ce47..ac1af47a 100644 --- a/siro_driver/lib/controller/auth/captin/opt_token_controller.dart +++ b/siro_driver/lib/controller/auth/captin/opt_token_controller.dart @@ -97,7 +97,7 @@ class OtpVerificationController extends GetxController { // توجه إلى الصفحة التالية await CRUD().post( - link: '${AppLink.paymentServer}/auth/token/update_driver_auth.php', + link: AppLink.addTokensDriver, payload: { 'token': box.read(BoxName.tokenDriver).toString(), 'fingerPrint': finger.toString(), diff --git a/siro_driver/lib/controller/auth/syria/registration_controller.dart b/siro_driver/lib/controller/auth/syria/registration_controller.dart index 3c9eb3e7..2c41e64e 100644 --- a/siro_driver/lib/controller/auth/syria/registration_controller.dart +++ b/siro_driver/lib/controller/auth/syria/registration_controller.dart @@ -764,7 +764,7 @@ class RegistrationController extends GetxController { // isLoading.value = true; // final uri = Uri.parse( - // 'https://intaleq.xyz/siro/auth/syria/driver/register_driver_and_car.php', + // 'https://intaleq.xyz/siro/auth/driver/register.php', // ); // final client = http.Client(); diff --git a/siro_driver/lib/controller/auth/syria/registration_simulation.dart b/siro_driver/lib/controller/auth/syria/registration_simulation.dart index f03a0540..487a217a 100644 --- a/siro_driver/lib/controller/auth/syria/registration_simulation.dart +++ b/siro_driver/lib/controller/auth/syria/registration_simulation.dart @@ -48,10 +48,10 @@ void main() async { print(' Request: { phone_number: "$phone", code: "123456", device_token: "fp_abc123" }'); print(' ✅ Phone verified, driver_id returned'); - // Check: GET /auth/syria/driver/isPhoneVerified.php + // Check: GET /auth/driver/isPhoneVerified.php // Query: phone_number // Returns: success if is_verified = 1 - print(' → GET /auth/syria/driver/isPhoneVerified.php?phone_number=$phone'); + print(' → GET /auth/driver/isPhoneVerified.php?phone_number=$phone'); print(' ✅ Phone is verified, proceeding to registration'); // ================================================================ @@ -157,7 +157,7 @@ void main() async { for (final docType in uploadDocTypes) { print(' 📤 Uploading: $docType'); - print(' → POST /auth/syria/uploadSyrianDocs.php'); + print(' → POST /auth/driver/uploadDriverDocs.php'); print(' Fields: driver_id=$driverId, doc_type=$docType, file (multipart)'); print(' File stored: private_uploads//__${docType}.jpg'); print(' MIME validation: image/jpeg, image/png, image/webp'); @@ -179,7 +179,7 @@ void main() async { // STEP 6: Final Registration Submission // ================================================================ print('\n─── STEP 6: Final Registration (register_driver_and_car.php) ───'); - print(' → POST /auth/syria/driver/register_driver_and_car.php'); + print(' → POST /auth/driver/register.php'); print(' This is the MAIN orchestrator. It does:'); print(' 1. Phone number normalization (Syria/Jordan/Egypt logic)'); print(' 2. Encrypt sensitive fields (phone, email, name, address, etc.)'); @@ -256,14 +256,14 @@ void main() async { // Admin fetches pending drivers print(' 🔍 Admin fetches pending drivers:'); - print(' → GET /auth/syria/driver/drivers_pending_list.php'); + print(' → GET /auth/driver/drivers_pending_list.php'); print(' Decrypts: phone, first_name, last_name'); print(' Returns: [{ id: "$driverId", first_name: "أحمد", last_name: "الأسد", phone: "$phone" }]'); print(' ✅ Driver appears in pending list (status != "active")'); // Admin views details print('\n 📋 Admin views driver details:'); - print(' → GET /auth/syria/driver/driver_details.php?driver_id=$driverId'); + print(' → GET /auth/driver/driver_details.php?driver_id=$driverId'); print(' Returns: driver row + car registration + document links'); print(' ✅ Admin reviews all documents'); @@ -301,12 +301,12 @@ void main() async { print(' - ml_google_doc.dart (phone OCR scanner)'); print(' Backend (PHP):'); print(' - /auth/otp/request.php + verify.php'); - print(' - /auth/syria/driver/isPhoneVerified.php'); + print(' - /auth/driver/isPhoneVerified.php'); print(' - /auth/document_syria/ai_document.php'); - print(' - /auth/syria/uploadSyrianDocs.php'); - print(' - /auth/syria/driver/register_driver_and_car.php'); - print(' - /auth/syria/driver/drivers_pending_list.php'); - print(' - /auth/syria/driver/driver_details.php'); + print(' - /auth/driver/uploadDriverDocs.php'); + print(' - /auth/driver/register.php'); + print(' - /auth/driver/drivers_pending_list.php'); + print(' - /auth/driver/driver_details.php'); print(' - /serviceapp/getDriversWaitingActive.php'); print(' - /Admin/Staff/activate.php'); print(' Schema:'); diff --git a/siro_driver/lib/views/auth/syria/registration_view.dart b/siro_driver/lib/views/auth/syria/registration_view.dart index cc4955c0..10d0a205 100644 --- a/siro_driver/lib/views/auth/syria/registration_view.dart +++ b/siro_driver/lib/views/auth/syria/registration_view.dart @@ -381,7 +381,7 @@ class RegistrationView extends StatelessWidget { // STEP 3 Widget _buildDocumentUploadStep(BuildContext ctx, RegistrationController c) { final String primaryLink = - '${AppLink.server}/auth/syria/uploadImage.php'; + '${AppLink.server}/auth/driver/uploadImage.php'; return GetBuilder( builder: (ctrl) => SingleChildScrollView( diff --git a/siro_rider/lib/constant/links.dart b/siro_rider/lib/constant/links.dart index 87faf9c3..5a4f5d7a 100644 --- a/siro_rider/lib/constant/links.dart +++ b/siro_rider/lib/constant/links.dart @@ -470,17 +470,17 @@ class AppLink { static String get updateTesterApp => "$auth/Tester/updateTesterApp.php"; static String get signUp => "$auth/signup.php"; static String get savePassengerLocation => - "$auth/save_passenger_location.php"; + "$auth/passenger/save_location.php"; static String get sendVerifyEmail => "$auth/sendVerifyEmail.php"; static String get loginFromGooglePassenger => - "$auth/loginFromGooglePassenger.php"; + "$auth/passenger/loginFromGoogle.php"; static String get loginUsingCredentialsWithoutGooglePassenger => - "$auth/loginUsingCredentialsWithoutGooglePassenger.php"; + "$auth/passenger/loginUsingCredentialsWithoutGoogle.php"; static String get checkPhoneNumberISVerfiedPassenger => "$auth/checkPhoneNumberISVerfiedPassenger.php"; static String get passengerRemovedAccountEmail => - "$auth/passengerRemovedAccountEmail.php"; + "$auth/passenger/remove_account.php"; static String get verifyEmail => "$auth/verifyEmail.php"; //===================Auth Captin============ static String get authCaptin => '$server/auth/captin'; diff --git a/siro_rider/lib/controller/auth/otp_controller.dart b/siro_rider/lib/controller/auth/otp_controller.dart index c58c5272..987d6d36 100644 --- a/siro_rider/lib/controller/auth/otp_controller.dart +++ b/siro_rider/lib/controller/auth/otp_controller.dart @@ -16,7 +16,7 @@ class PhoneAuthHelper { // Define your server URLs 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'; + static final String _registerUrl = '${AppLink.server}/auth/passenger/register.php'; // removed formatSyrianPhone diff --git a/siro_rider/lib/controller/auth/token_otp_change_controller.dart b/siro_rider/lib/controller/auth/token_otp_change_controller.dart index 1239f987..54ba67c6 100644 --- a/siro_rider/lib/controller/auth/token_otp_change_controller.dart +++ b/siro_rider/lib/controller/auth/token_otp_change_controller.dart @@ -96,6 +96,15 @@ class OtpVerificationController extends GetxController { ); if (response != 'failure' && response['status'] == 'success') { + // تحديث التوكن والبصمة الجديدة في الباك إند + await CRUD().post( + link: "${AppLink.server}/ride/firebase/addToken.php", + payload: { + 'token': box.read(BoxName.tokenFCM).toString(), + 'fingerPrint': fingerPrint.toString(), + 'passengerID': box.read(BoxName.passengerID).toString(), + }); + await NotificationService.sendNotification( category: 'token change', target: ptoken.toString(), diff --git a/siro_service/lib/constant/links.dart b/siro_service/lib/constant/links.dart index 8f44ce0d..1e06bd43 100644 --- a/siro_service/lib/constant/links.dart +++ b/siro_service/lib/constant/links.dart @@ -131,10 +131,10 @@ class AppLink { static String signUp = "$auth/signup.php"; static String sendVerifyEmail = "$auth/sendVerifyEmail.php"; static String passengerRemovedAccountEmail = - "$auth/passengerRemovedAccountEmail.php"; + "$auth/passenger/remove_account.php"; static String verifyEmail = "$auth/verifyEmail.php"; static String getPromptDriverDocumentsEgypt = - "$server/auth/captin/getPromptDriverDocumentsEgypt.php"; + "$server/auth/driver/getPromptDriverDocumentsEgypt.php"; //===================Auth Captin============ static String authCaptin = '$server/auth/captin';