diff --git a/app/Config/Filters.php b/app/Config/Filters.php index 1585b950..aae7204d 100755 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -62,7 +62,7 @@ class Filters extends BaseConfig 'before' => [ 'HttpRequestLog' => ['except' => 'cli/*'], 'Cors', - 'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*']], + 'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob']], 'SecurityInputFilter', 'GlobalPostFileUploadGuard' // 'csrf', diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 9745699a..1f996e53 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -392,7 +392,7 @@ class EmployeeController extends AdminController CONCAT( ( SELECT lc.name - FROM level_contect lc + FROM level_contacts lc WHERE lc.id = files.hr_id LIMIT 1 ), diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 3f23f944..9bfb87f9 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -1268,7 +1268,7 @@ class RestAuthenticationController extends AdminController log_message('error', ' '); log_message('error', ' ************************************* POST END **************************************** '); log_message('error', ' '); - return $this->respond(['status' => 'success','code' => 200,'data' => "", 'message' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"], 'is_mpin_skipped' => $employeeData['is_mpin_skipped'], 'is_biometric_enabled' => $employeeData['is_biometric_enabled']],200); + return $this->respond(['status' => 'success','code' => 200,'data' => "", 'message' => "Mpin - exist" , 'Mpin' =>$employeeData["mpin"], 'is_mpin_skipped' => $employeeData['is_mpin_skipped'] ?? 0, 'is_biometric_enabled' => $employeeData['is_biometric_enabled'] ?? 0],200); } else { $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - checkMpin: Mpin - not found"); log_message('error', ' '); diff --git a/app/Filters/Cors.php b/app/Filters/Cors.php index bb8d5b8b..3cfd1252 100644 --- a/app/Filters/Cors.php +++ b/app/Filters/Cors.php @@ -274,6 +274,7 @@ class Cors implements FilterInterface // Handle allowed headers if ($isPreflight) { + $response->setHeader('Access-Control-Allow-Methods', ['OPTIONS']); // For preflight: respect what the browser is asking for // The browser sends Access-Control-Request-Headers to ask permission $requestedHeaders = $request->getHeaderLine('Access-Control-Request-Headers');