From 056af9ab452c7f014878338a317db30c7438d289 Mon Sep 17 00:00:00 2001
From: Venkatesh <venkatesh.r@venbainfotech.com>
Date: Thu, 25 Jun 2026 17:57:18 +0530
Subject: [PATCH] FIX_CORS_ERROR

---
 app/Filters/AuthJWT.php       | 36 +++++++++++++++++++++++------------
 app/Views/enrollment_list.php |  4 +++-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/Filters/AuthJWT.php b/app/Filters/AuthJWT.php
index 00d985d..f45975b 100755
--- a/app/Filters/AuthJWT.php
+++ b/app/Filters/AuthJWT.php
@@ -3,6 +3,9 @@
 namespace App\Filters;
 
 use App\Helpers\JWTToken;
+use App\Models\EmployeeModel;
+use App\Models\LevelContactModel;
+use App\Filters\Cors;
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -12,12 +15,16 @@ use ReflectionClass;
 
 require_once('../vendor/autoload.php');
 
-use App\Models\EmployeeModel;
-use App\Models\LevelContactModel;
-
 
 class AuthJWT implements FilterInterface
 {
+    protected Cors $corsFilter;
+
+    public function __construct()
+    {
+        $this->corsFilter  = new Cors();
+    }
+
     // public function before(RequestInterface $request, $arguments = null)
     // {
     //     $jwt = $request->getHeaderLine('Authorization');
@@ -84,20 +91,20 @@ class AuthJWT implements FilterInterface
         $authHeader = $request->getHeaderLine('Authorization');
 
         if (!$authHeader) {
-            return $this->reject(403, 'Access Forbidden');
+            return $this->reject($request, 403, 'Access Forbidden');
         }
 
         $result = JWTToken::validateJWT($authHeader);
 
         if ($result['status'] !== true) {
-            return $this->reject(401, $result['message']);
+            return $this->reject($request, 401, $result['message']);
         }
 
         $decoded = $result['decoded'];
         $id      = $decoded['id'] ?? null;
 
         if (!$id) {
-            return $this->reject(401, 'Invalid token payload');
+            return $this->reject($request, 401, 'Invalid token payload');
         }
 
         if (isset($decoded['emp_code'])) {
@@ -111,7 +118,8 @@ class AuthJWT implements FilterInterface
 
         if (!$user || $user['token_time_out'] <= time()) {
             $model->update($id, ['token_time_out' => null]);
-            return $this->reject(401, 'Token expired');
+            // print_r('Token expired'); die();
+            return $this->reject($request, 401, 'Token expired');
         }
 
         // Refresh sliding expiration
@@ -132,12 +140,16 @@ class AuthJWT implements FilterInterface
         return true;
     }
 
-    private function reject(int $code, string $message)
+    private function reject(RequestInterface $request, int $code, string $message): ResponseInterface
     {
-        return service('response')
-            ->setStatusCode($code)
-            ->setJSON(['status' => $code, 'message' => $message])
-            ->send();
+        $response = service('response');
+        $response->setStatusCode($code);
+        $response->setContentType('application/json');
+        $response->setBody(json_encode(['status' => $code, 'message' => $message]));
+
+        $this->corsFilter->after($request, $response);
+        
+        return $response;
     }
 
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index 495d959..86a6080 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -378,7 +378,9 @@
 
                     if(employee.emp_status === 'enrolled'){
                         var enrolled = 'Yes';
-                        enrolled_count++;
+                        if (employee.relationship.toLowerCase() === "self") {
+                            enrolled_count++;
+                        }
                     }else{  
                         var enrolled = 'No';
                         if (employee.relationship.toLowerCase() === "self") {