From cb1d1bb1e3eb4b9bf25f70e37535a7c6368cb28d Mon Sep 17 00:00:00 2001
From: Jagad R R <jagadraya388@gmail.com>
Date: Sat, 4 Jan 2025 14:00:05 +0700
Subject: [PATCH] redirect to previous page on login

---
 .../Backend/Auth/LoginController.php          | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Backend/Auth/LoginController.php b/app/Http/Controllers/Backend/Auth/LoginController.php
index 31a3fe8..c211348 100644
--- a/app/Http/Controllers/Backend/Auth/LoginController.php
+++ b/app/Http/Controllers/Backend/Auth/LoginController.php
@@ -46,21 +46,21 @@ class LoginController extends Controller
 
     protected function redirectTo()
     {
+        // Check the current guard and redirect accordingly
         if (Auth::guard('admin')->check()) {
             // Redirect admins to their dashboard
-            return RouteServiceProvider::ADMIN_DASHBOARD;
+            return route('admin.dashboard');
         }
 
         if (Auth::guard('web')->check()) {
-            // Redirect users to the home page
-            return redirect()->route('trx_order_elevation.index');
+            // Redirect regular users to their home or default page
+            return route('trx_order_elevation.index');
         }
 
-        // Default redirection (optional)
+        // Default redirection if no condition matches
         return '/login';
     }
 
-
     /**
      * login admin
      *
@@ -75,39 +75,40 @@ class LoginController extends Controller
             'password' => 'required',
         ]);
 
+        // Determine the intended redirect URL
+        $redirectTo = session()->pull('url.intended', $this->redirectTo());
+
         // Attempt to login
         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');
 
             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)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'admin');
 
             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)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'web');
 
             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)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'web');
 
             AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
-            return redirect()->route('admin.dashboard');
+            return redirect($redirectTo);
         }
         
-        // error
-        session()->flash('error', 'Invalid email and password..');
+        // Login failed
+        session()->flash('error', 'Invalid email or password.');
         return back();
-    }
-        
+    }   
 
     /**
      * logout admin guard