Update: 2026-07-21 20:58:30
This commit is contained in:
@@ -198,7 +198,11 @@ try {
|
|||||||
|
|
||||||
// Generate JWT tokens for driver
|
// Generate JWT tokens for driver
|
||||||
$audDriver = filterRequest("aud") ?: filterRequest("audience") ?: (getenv('allowedDriver2') ?: 'driver-app:ios');
|
$audDriver = filterRequest("aud") ?: filterRequest("audience") ?: (getenv('allowedDriver2') ?: 'driver-app:ios');
|
||||||
$fpDriver = filterRequest("fingerprint") ?? filterRequest("fingerPrint");
|
$fpDriver = filterRequest("fingerprint") ?? filterRequest("fingerPrint") ?? ($_SERVER['HTTP_X_DEVICE_FP'] ?? null);
|
||||||
|
if ($fpDriver === null && function_exists('getallheaders')) {
|
||||||
|
$hdrs = array_change_key_case(getallheaders(), CASE_LOWER);
|
||||||
|
$fpDriver = $hdrs['x-device-fp'] ?? null;
|
||||||
|
}
|
||||||
$jwtSvc = new JwtService($redis);
|
$jwtSvc = new JwtService($redis);
|
||||||
$accessToken = $jwtSvc->generateAccessToken($driverID, 'driver', $audDriver, $fpDriver);
|
$accessToken = $jwtSvc->generateAccessToken($driverID, 'driver', $audDriver, $fpDriver);
|
||||||
$refreshToken = $jwtSvc->generateRefreshToken($driverID, 'driver', $audDriver);
|
$refreshToken = $jwtSvc->generateRefreshToken($driverID, 'driver', $audDriver);
|
||||||
@@ -287,7 +291,11 @@ try {
|
|||||||
|
|
||||||
// Generate JWT tokens for passenger
|
// Generate JWT tokens for passenger
|
||||||
$audPass = filterRequest("aud") ?: filterRequest("audience") ?: (getenv('allowed2') ?: 'passenger-app:ios');
|
$audPass = filterRequest("aud") ?: filterRequest("audience") ?: (getenv('allowed2') ?: 'passenger-app:ios');
|
||||||
$fpPass = filterRequest("fingerprint") ?? filterRequest("fingerPrint");
|
$fpPass = filterRequest("fingerprint") ?? filterRequest("fingerPrint") ?? ($_SERVER['HTTP_X_DEVICE_FP'] ?? null);
|
||||||
|
if ($fpPass === null && function_exists('getallheaders')) {
|
||||||
|
$hdrs = array_change_key_case(getallheaders(), CASE_LOWER);
|
||||||
|
$fpPass = $hdrs['x-device-fp'] ?? null;
|
||||||
|
}
|
||||||
$jwtSvc = new JwtService($redis);
|
$jwtSvc = new JwtService($redis);
|
||||||
$accessToken = $jwtSvc->generateAccessToken($passengerID, 'passenger', $audPass, $fpPass);
|
$accessToken = $jwtSvc->generateAccessToken($passengerID, 'passenger', $audPass, $fpPass);
|
||||||
$refreshToken = $jwtSvc->generateRefreshToken($passengerID, 'passenger', $audPass);
|
$refreshToken = $jwtSvc->generateRefreshToken($passengerID, 'passenger', $audPass);
|
||||||
|
|||||||
@@ -65,13 +65,15 @@ class PhoneAuthHelper {
|
|||||||
static Future<void> verifyOtp(String phoneNumber, String otpCode) async {
|
static Future<void> verifyOtp(String phoneNumber, String otpCode) async {
|
||||||
try {
|
try {
|
||||||
final fixedPhone = CountryLogic.formatCurrentCountryPhone(phoneNumber);
|
final fixedPhone = CountryLogic.formatCurrentCountryPhone(phoneNumber);
|
||||||
|
final String fingerPrint = await DeviceHelper.getDeviceFingerprint();
|
||||||
final response = await CRUD().post(
|
final response = await CRUD().post(
|
||||||
link: _verifyOtpUrl,
|
link: _verifyOtpUrl,
|
||||||
payload: {
|
payload: {
|
||||||
'phone_number': fixedPhone,
|
'phone_number': fixedPhone,
|
||||||
'token_code': otpCode,
|
'token_code': otpCode,
|
||||||
'context': 'login',
|
'context': 'login',
|
||||||
'user_type': 'passenger'
|
'user_type': 'passenger',
|
||||||
|
'fingerPrint': fingerPrint,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user