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