merge prod to main

app/Controllers/AuthController.php

@@ -56,13 +56,32 @@ class AuthController extends Controller
    
     public function loginMask()
     {
-        // Serve the login view directly here
-        return view('user/login');  // Adjust the view path as needed
+        $redirectTo = $this->sanitizeRedirectTarget((string) ($this->request->getGet('redirect_to') ?? ''));
+
+        if (session()->get('is_logged_in')) {
+            if ($redirectTo !== null) {
+                return redirect()->to($redirectTo);
+            }
+
+            $roles = session()->get('roles') ?? [];
+            if (empty($roles) && session()->get('role')) {
+                $roles = [session()->get('role')];
+            }
+
+            if (!empty($roles)) {
+                return $this->redirectToDashboard($roles);
+            }
+        }
+
+        return view('user/login', [
+            'redirect_to' => $redirectTo ?? '',
+        ]);
     }
     
     public function login()
     {
         log_message('info', 'Processing login form submission.');
+        $redirectTo = $this->sanitizeRedirectTarget((string) ($this->request->getPost('redirect_to') ?? $this->request->getGet('redirect_to') ?? ''));
 
         // Step 1: Get email, password, and IP from the request
         $email = $this->request->getPost('email');
@@ -98,7 +117,7 @@ class AuthController extends Controller
                 $this->logLoginAttempt($user['id'], $user['email'], $ip, $this->request->getUserAgent());
 
                 // ✅ Step 7: Call loginUser() to set session and redirect
-                return $this->loginUser($user);
+                return $this->loginUser($user, $redirectTo);
             } else {
                 // Step 8: Password mismatch — log failed attempt
                 $this->handleFailedLogin($user['id'], $user['email'], $ip);
@@ -469,6 +488,7 @@ class AuthController extends Controller
         // Generate a secure token for the password reset
         helper('text');
         $token = bin2hex(random_bytes(48));
+        $tokenHash = hash('sha256', $token);
 
         // Calculate the expiration time for the token (1 hour from now)
         $expires_at = Time::now()->addHours(1);
@@ -477,7 +497,7 @@ class AuthController extends Controller
         $passwordResetModel = new PasswordResetModel();
         $passwordResetModel->insert([
             'email'      => $email,
-            'token'      => $token,
+            'token'      => $tokenHash,
             'created_at' => Time::now(),
             'expires_at' => $expires_at,
         ]);
@@ -490,7 +510,7 @@ class AuthController extends Controller
         return true;
     }
 
-    private function loginUser($user)
+    private function loginUser($user, ?string $redirectTo = null)
     {
         $userRoleModel = new UserRoleModel();
         $roles = $userRoleModel->select('roles.name')
@@ -524,9 +544,17 @@ class AuthController extends Controller
         if (count($roleNames) === 1) {
             // One role → set and redirect directly
             session()->set('role', $roleNames[0]);
+            if ($redirectTo !== null) {
+                return redirect()->to($redirectTo);
+            }
             return $this->redirectToDashboard([$roleNames[0]]);
         } else {
             // Multiple roles → redirect to role selection view
+            if ($redirectTo !== null) {
+                session()->set('post_login_redirect', $redirectTo);
+            } else {
+                session()->remove('post_login_redirect');
+            }
             return redirect()->to('/select-role');
         }
 
@@ -591,12 +619,17 @@ private function redirectToDashboard(array $roles)
     {
         $selectedRole = $this->request->getPost('selected_role');
         $availableRoles = session()->get('roles');
+        $redirectTo = $this->sanitizeRedirectTarget((string) ($this->request->getPost('redirect_to') ?? session()->get('post_login_redirect') ?? ''));
 
         if (!$selectedRole || !in_array($selectedRole, $availableRoles)) {
             return redirect()->to('/select-role')->with('error', 'Invalid role selected.');
         }
 
         session()->set('role', $selectedRole);
+        session()->remove('post_login_redirect');
+        if ($redirectTo !== null) {
+            return redirect()->to($redirectTo);
+        }
         return $this->redirectToDashboard([$selectedRole]);
     }
 
@@ -608,7 +641,44 @@ private function redirectToDashboard(array $roles)
             return redirect()->to('/login')->with('error', 'No roles available.');
         }
 
-        return view('auth/select_role', ['roles' => $roles]);
+        return view('auth/select_role', [
+            'roles' => $roles,
+            'redirect_to' => (string) (session()->get('post_login_redirect') ?? ''),
+        ]);
+    }
+
+    private function sanitizeRedirectTarget(string $redirectTo): ?string
+    {
+        $redirectTo = trim($redirectTo);
+        if ($redirectTo === '') {
+            return null;
+        }
+
+        if (preg_match('#^https?://#i', $redirectTo)) {
+            $appHost = (string) parse_url(base_url('/'), PHP_URL_HOST);
+            $targetHost = (string) parse_url($redirectTo, PHP_URL_HOST);
+            $targetPath = (string) parse_url($redirectTo, PHP_URL_PATH);
+            $targetQuery = (string) parse_url($redirectTo, PHP_URL_QUERY);
+
+            if ($appHost === '' || $targetHost === '' || strcasecmp($appHost, $targetHost) !== 0) {
+                return null;
+            }
+
+            $redirectTo = $targetPath !== '' ? $targetPath : '/';
+            if ($targetQuery !== '') {
+                $redirectTo .= '?' . $targetQuery;
+            }
+        }
+
+        if (!str_starts_with($redirectTo, '/')) {
+            $redirectTo = '/' . ltrim($redirectTo, '/');
+        }
+
+        if (str_starts_with($redirectTo, '//')) {
+            return null;
+        }
+
+        return $redirectTo;
     }
 
 }