itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redirect to previous page on login

Browse Source
This commit is contained in:
Jagad R R
2025-01-04 14:00:05 +07:00
parent fbde09292d
commit cb1d1bb1e3
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Backend/Auth/LoginController.php
+18 -17
View File
@@ -46,21 +46,21 @@ class LoginController extends Controller
protected function redirectTo() protected function redirectTo()
{ {
// Check the current guard and redirect accordingly
if (Auth::guard('admin')->check()) { if (Auth::guard('admin')->check()) {
// Redirect admins to their dashboard // Redirect admins to their dashboard
return RouteServiceProvider::ADMIN_DASHBOARD; return route('admin.dashboard');
} }
if (Auth::guard('web')->check()) { if (Auth::guard('web')->check()) {
// Redirect users to the home page // Redirect regular users to their home or default page
return redirect()->route('trx_order_elevation.index'); return route('trx_order_elevation.index');
} }
// Default redirection (optional) // Default redirection if no condition matches
return '/login'; return '/login';
} }
/** /**
* login admin * login admin
* *
@@ -75,40 +75,41 @@ class LoginController extends Controller
'password' => 'required', 'password' => 'required',
]); ]);
// Determine the intended redirect URL
$redirectTo = session()->pull('url.intended', $this->redirectTo());
// Attempt to login // Attempt to login
if (Auth::guard('admin')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember)) { if (Auth::guard('admin')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember)) {
session()->flash('success', 'Successully Logged in !'); session()->flash('success', 'Successfully Logged in!');
Session::put('current_guard', 'admin'); Session::put('current_guard', 'admin');
AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System'); AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
return redirect()->route('admin.dashboard'); return redirect($redirectTo);
} else if (Auth::guard('admin')->attempt(['username' => $request->email, 'password' => $request->password], $request->remember)) { } else if (Auth::guard('admin')->attempt(['username' => $request->email, 'password' => $request->password], $request->remember)) {
session()->flash('success', 'Successully Logged in !'); session()->flash('success', 'Successfully Logged in!');
Session::put('current_guard', 'admin'); Session::put('current_guard', 'admin');
AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System'); AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
return redirect()->route('admin.dashboard'); return redirect($redirectTo);
} else if (Auth::guard('web')->attempt(['username' => $request->email, 'password' => $request->password], $request->remember)) { } else if (Auth::guard('web')->attempt(['username' => $request->email, 'password' => $request->password], $request->remember)) {
session()->flash('success', 'Successully Logged in !'); session()->flash('success', 'Successfully Logged in!');
Session::put('current_guard', 'web'); Session::put('current_guard', 'web');
AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System'); AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
return redirect()->route('admin.dashboard'); return redirect($redirectTo);
} else if (Auth::guard('web')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember)) { } else if (Auth::guard('web')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember)) {
session()->flash('success', 'Successully Logged in !'); session()->flash('success', 'Successfully Logged in!');
Session::put('current_guard', 'web'); Session::put('current_guard', 'web');
AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System'); AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
return redirect()->route('admin.dashboard'); return redirect($redirectTo);
} }
// error // Login failed
session()->flash('error', 'Invalid email and password..'); session()->flash('error', 'Invalid email or password.');
return back(); return back();
} }
/** /**
* logout admin guard * logout admin guard
* *