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

Update: 2026-07-21 19:43:50

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-21 19:43:51 +03:00
parent 1bec13634a
commit 23f697b1c6
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/auth/otp/verify.php
+28 -2
View File
@@ -196,10 +196,21 @@ try {
$driverID = substr(md5($phone_number), 0, 16); $driverID = substr(md5($phone_number), 0, 16);
} }
// Generate JWT tokens for driver
$audDriver = filterRequest("aud") ?: filterRequest("audience") ?: (getenv('allowedDriver2') ?: 'driver-app:ios');
$fpDriver = filterRequest("fingerprint") ?? filterRequest("fingerPrint");
$jwtSvc = new JwtService($redis);
$accessToken = $jwtSvc->generateAccessToken($driverID, 'driver', $audDriver, $fpDriver);
$refreshToken = $jwtSvc->generateRefreshToken($driverID, 'driver', $audDriver);
jsonSuccess([ jsonSuccess([
"isRegistered" => $isRegistered, "isRegistered" => $isRegistered,
"driver" => $driverData, "driver" => $driverData,
"driverID" => $driverID "driverID" => $driverID,
"jwt" => $accessToken,
"token" => $accessToken,
"access_token" => $accessToken,
"refresh_token" => $refreshToken
], "Your phone number has been verified."); ], "Your phone number has been verified.");
} else { } else {
jsonError("Your phone number could not be verified or the code is expired. Please try again."); jsonError("Your phone number could not be verified or the code is expired. Please try again.");
@@ -256,6 +267,7 @@ try {
// Check registration status // Check registration status
$isRegistered = false; $isRegistered = false;
$passengerData = null; $passengerData = null;
$passengerID = '';
$chkStmt = $con->prepare("SELECT id, first_name, last_name, email, phone FROM passengers WHERE phone = ?"); $chkStmt = $con->prepare("SELECT id, first_name, last_name, email, phone FROM passengers WHERE phone = ?");
$chkStmt->execute([$encryptionHelper->encryptData($phone_number)]); $chkStmt->execute([$encryptionHelper->encryptData($phone_number)]);
@@ -268,11 +280,25 @@ try {
$passenger['email'] = $encryptionHelper->decryptData($passenger['email']); $passenger['email'] = $encryptionHelper->decryptData($passenger['email']);
$passenger['phone'] = $encryptionHelper->decryptData($passenger['phone']); $passenger['phone'] = $encryptionHelper->decryptData($passenger['phone']);
$passengerData = $passenger; $passengerData = $passenger;
$passengerID = (string)$passenger['id'];
} else {
$passengerID = substr(md5($phone_number), 0, 16);
} }
// Generate JWT tokens for passenger
$audPass = filterRequest("aud") ?: filterRequest("audience") ?: (getenv('allowed2') ?: 'passenger-app:ios');
$fpPass = filterRequest("fingerprint") ?? filterRequest("fingerPrint");
$jwtSvc = new JwtService($redis);
$accessToken = $jwtSvc->generateAccessToken($passengerID, 'passenger', $audPass, $fpPass);
$refreshToken = $jwtSvc->generateRefreshToken($passengerID, 'passenger', $audPass);
jsonSuccess([ jsonSuccess([
"isRegistered" => $isRegistered, "isRegistered" => $isRegistered,
"passenger" => $passengerData "passenger" => $passengerData,
"jwt" => $accessToken,
"token" => $accessToken,
"access_token" => $accessToken,
"refresh_token" => $refreshToken
], "Your phone number has been verified."); ], "Your phone number has been verified.");
} else { } else {
jsonError("Your phone number could not be verified or the code is expired. Please try again."); jsonError("Your phone number could not be verified or the code is expired. Please try again.");