Fix meeting show redirects and SSO connect loop for signed-in users.
Deploy Ladill Meet / deploy (push) Successful in 1m0s
Deploy Ladill Meet / deploy (push) Successful in 1m0s
RoomController show may redirect to conference/webinar pages; SSO connect honors intended URL when already authenticated. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -33,9 +33,7 @@ class SsoLoginController extends Controller
|
|||||||
$intended = (string) $request->query('redirect', route('meet.dashboard'));
|
$intended = (string) $request->query('redirect', route('meet.dashboard'));
|
||||||
|
|
||||||
if (Auth::check()) {
|
if (Auth::check()) {
|
||||||
$redirect = $this->resolveLanding($identity, $request->user(), $intended);
|
return $this->safeRedirect($intended, route('meet.dashboard'));
|
||||||
|
|
||||||
return $this->safeRedirect($redirect, route('meet.dashboard'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $request->boolean('fallback')) {
|
if (! $request->boolean('fallback')) {
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ class RoomController extends Controller
|
|||||||
return redirect()->route('meet.rooms.show', $room)->with('success', 'Meeting created.');
|
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->authorizeAbility($request, 'meetings.view');
|
||||||
$this->authorizeOwner($request, $room);
|
$this->authorizeOwner($request, $room);
|
||||||
|
|||||||
Reference in New Issue
Block a user