diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 72e7b8c7..56fb00c5 100644 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -92,11 +92,12 @@ class RestAuthenticationController extends AdminController public function getVerifiedUserData() { - try { + // try { $mobile_number = $this->request->getJSON()->mobile_number; $otp = $this->request->getJSON()->otp; $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); + if ($employeeData && $otp == $employeeData["otp"] || $employeeData && isset($this->request->getJSON()->login_by_hr)) { $auth = HttpRequestHelper::getRequestInfo(); if ($auth) { @@ -120,9 +121,9 @@ class RestAuthenticationController extends AdminController } else { return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200); } - } catch (\Exception $e) { - return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500); - } + // } catch (\Exception $e) { + // return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500); + // } } public function verifyHrWithMobileNumber() diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php index 5e351c5e..196bdaca 100644 --- a/app/Helpers/JWTToken.php +++ b/app/Helpers/JWTToken.php @@ -27,9 +27,8 @@ class JWTToken try{ $token = JWT::encode($request_data ,$secret_Key,'HS512'); $id = $request_data['id']; - $data =[ - "token_time_out" => time() + getenv('TOKENTIMEOUT') - ]; + $data["token_time_out"] = time() + getenv('TOKENTIMEOUT'); + if(isset($data['emp_code'])){ $model = new EmployeeModel(); $model->update($id, $data); diff --git a/app/Helpers/header.php b/app/Helpers/header.php new file mode 100644 index 00000000..2ade2b0b --- /dev/null +++ b/app/Helpers/header.php @@ -0,0 +1,658 @@ + + + +
+ + +