Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hamza-Ayed
2026-06-12 20:40:40 +03:00
parent 305ae01d52
commit f907212c57
294 changed files with 3592 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
siro_driver/lib/controller/auth/captin/login_captin_controller.dart
View File

@@ -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');

13
siro_driver/lib/controller/auth/captin/opt_token_controller.dart
View File

@@ -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(),
},

17
siro_driver/lib/controller/auth/captin/phone_helper_controller.dart
View File

@@ -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'
},
);

2
siro_driver/lib/controller/auth/captin/register_captin_controller.dart
View File

@@ -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,