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

Update authentication logic and SDK fixes

Browse Source
This commit is contained in:
Hamza-Ayed
2026-04-24 15:12:12 +03:00
parent 2745b307a9
commit 4534e8769b
18 changed files with 198 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/RideController.php
View File

@@ -66,7 +66,7 @@ class RideController extends Controller
'passenger_rating' => 'nullable|numeric',
]);
$passengerId = $request->input('_jwt_user_id');
$passengerId = $request->attributes->get('_jwt_user_id');
// Prevent duplicate active rides
$activeRide = DB::connection('ride')->table('ride')
@@ -152,7 +152,7 @@ class RideController extends Controller
*/
public function accept(Request $request, int $rideId): JsonResponse
{
$driverId = $request->input('_jwt_user_id');
$driverId = $request->attributes->get('_jwt_user_id');
DB::connection('ride')->beginTransaction();
try {
@@ -233,7 +233,7 @@ class RideController extends Controller
*/
public function start(Request $request, int $rideId): JsonResponse
{
$driverId = $request->input('_jwt_user_id');
$driverId = $request->attributes->get('_jwt_user_id');
$ride = Ride::where('id', $rideId)
->where('driver_id', $driverId)
@@ -280,7 +280,7 @@ class RideController extends Controller
*/
public function arrive(Request $request, int $rideId): JsonResponse
{
$driverId = $request->input('_jwt_user_id');
$driverId = $request->attributes->get('_jwt_user_id');
$ride = Ride::where('id', $rideId)
->where('driver_id', $driverId)
@@ -316,7 +316,7 @@ class RideController extends Controller
*/
public function finish(Request $request, int $rideId): JsonResponse
{
$driverId = $request->input('_jwt_user_id');
$driverId = $request->attributes->get('_jwt_user_id');
$request->validate([
'price_for_driver' => 'required|numeric',
@@ -397,7 +397,7 @@ class RideController extends Controller
*/
public function cancelByPassenger(Request $request, int $rideId): JsonResponse
{
$passengerId = $request->input('_jwt_user_id');
$passengerId = $request->attributes->get('_jwt_user_id');
$ride = Ride::where('id', $rideId)
->where('passenger_id', $passengerId)
@@ -452,7 +452,7 @@ class RideController extends Controller
*/
public function cancelByDriver(Request $request, int $rideId): JsonResponse
{
$driverId = $request->input('_jwt_user_id');
$driverId = $request->attributes->get('_jwt_user_id');
$ride = Ride::where('id', $rideId)
->where('driver_id', $driverId)
@@ -520,8 +520,8 @@ class RideController extends Controller
*/
public function active(Request $request): JsonResponse
{
$userId = $request->input('_jwt_user_id');
$userType = $request->input('_jwt_user_type');
$userId = $request->attributes->get('_jwt_user_id');
$userType = $request->attributes->get('_jwt_user_type');
$query = Ride::active();
if ($userType === 'driver') {
@@ -544,8 +544,8 @@ class RideController extends Controller
*/
public function index(Request $request): JsonResponse
{
$userId = $request->input('_jwt_user_id');
$userType = $request->input('_jwt_user_type');
$userId = $request->attributes->get('_jwt_user_id');
$userType = $request->attributes->get('_jwt_user_type');
$page = $request->input('page', 1);
$limit = min($request->input('limit', 20), 50);