From d0b6e9ff0129a39bfaa08ee5d7ee76475e7f6c03 Mon Sep 17 00:00:00 2001 From: isaacclad Date: Wed, 1 Jul 2026 21:46:09 +0000 Subject: [PATCH] Fix meeting show redirects and SSO connect loop for signed-in users. RoomController show may redirect to conference/webinar pages; SSO connect honors intended URL when already authenticated. Co-authored-by: Cursor --- app/Http/Controllers/Auth/SsoLoginController.php | 4 +--- app/Http/Controllers/Meet/RoomController.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Auth/SsoLoginController.php b/app/Http/Controllers/Auth/SsoLoginController.php index 6f16d83..e527a38 100644 --- a/app/Http/Controllers/Auth/SsoLoginController.php +++ b/app/Http/Controllers/Auth/SsoLoginController.php @@ -33,9 +33,7 @@ class SsoLoginController extends Controller $intended = (string) $request->query('redirect', route('meet.dashboard')); if (Auth::check()) { - $redirect = $this->resolveLanding($identity, $request->user(), $intended); - - return $this->safeRedirect($redirect, route('meet.dashboard')); + return $this->safeRedirect($intended, route('meet.dashboard')); } if (! $request->boolean('fallback')) { diff --git a/app/Http/Controllers/Meet/RoomController.php b/app/Http/Controllers/Meet/RoomController.php index f824054..6884ea3 100644 --- a/app/Http/Controllers/Meet/RoomController.php +++ b/app/Http/Controllers/Meet/RoomController.php @@ -143,7 +143,7 @@ class RoomController extends Controller return redirect()->route('meet.rooms.show', $room)->with('success', 'Meeting created.'); } - public function show(Request $request, Room $room): View + public function show(Request $request, Room $room): View|RedirectResponse { $this->authorizeAbility($request, 'meetings.view'); $this->authorizeOwner($request, $room);