From 183cbd7fffbbfb780cd7892ce5fbd92d488376f8 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 31 May 2024 09:08:40 +0530 Subject: [PATCH 1/4] CHANGE_ AccountManagerDetails attached in getEmployeeProfile API : GWM --- app/Config/Routes.php | 4 ---- app/Controllers/EmployeeRestController.php | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index a32b6788..d1a18cb3 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -258,12 +258,8 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) { -$routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/$1"); -$routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile"); -$routes->post("/calculatePremium", "EmployeeRestController::calculatePremium"); -$routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy"); $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 3c51bae9..c31cabe7 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -94,7 +94,12 @@ class EmployeeRestController extends AdminController ->where('relationship', $relationship) ->first(); $result = $employee; - return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + $AccountManagerDetails = $this->clientRMModel->select('client_rm.* , user_profiles.*') + ->join('user_profiles', 'client_rm.user_id = user_profiles.id', 'left') + ->where('client_rm.client_id', $client_id ) + ->where('client_rm.level', 3 ) + ->findAll(); + return $this->respond(['status' => 'success','code' => 200,'data' => $result, 'AccountManagerDetails'=> isset($AccountManagerDetails[0]) ? $AccountManagerDetails[0] : null ],200); } else { $result = "No Match's"; return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); From 6d404cfae57910fc2d5f5e1e7e1a119291b5280b Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 31 May 2024 13:22:46 +0530 Subject: [PATCH 2/4] CHANGE_JWT_CHECK : AADHAVAN --- app/Config/Routes.php | 4 +--- app/Helpers/JWTToken.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index a32b6788..5e98d503 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -243,6 +243,7 @@ $routes->cli('cli/processjobs', 'JobWorker::processJobs'); $routes->get("processjob", "JobWorker::processJob"); + //Employee login api's $routes->post("/employeeRest/verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber"); $routes->post("/employeeRest/getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData"); @@ -255,9 +256,6 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) { $routes->post("getId", "RestAuthenticationController::getUserIdFromToken"); }); - - - $routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/$1"); $routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile"); $routes->post("/calculatePremium", "EmployeeRestController::calculatePremium"); diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php index 6c6d29cf..3d86be20 100644 --- a/app/Helpers/JWTToken.php +++ b/app/Helpers/JWTToken.php @@ -20,7 +20,7 @@ class JWTToken { $secret_Key="secret"; $iat = time(); - $exp = $iat + 36000; + $exp = $iat + 120; $request_data = [ "iat" => $iat, "exp" => $exp, From a026f7799d972f3230a4440867c1ccb9c94f8f10 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 31 May 2024 16:36:34 +0530 Subject: [PATCH 3/4] CHANGE_JWT_TIME_SET : AADHAVAN --- app/Filters/AuthJWT.php | 10 +++++++++- app/Helpers/JWTToken.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Filters/AuthJWT.php b/app/Filters/AuthJWT.php index a9b6911f..456b2e6f 100644 --- a/app/Filters/AuthJWT.php +++ b/app/Filters/AuthJWT.php @@ -24,9 +24,17 @@ class AuthJWT implements FilterInterface if (JWTToken::validateJWT($jwt)) { $data = JWTToken::validateJWT($jwt); $data = json_decode($data); + if ($data->status) { // $auth = $request->getHeader("Authorization"); - + // $decodedToken = $data->decoded; + + // $decodedToken->exp += 30; + // $newJwt = JWTToken::encode((array)$decodedToken); + + // Set the new JWT in the response headers + // $response = service('response'); + // $response->setHeader('Authorization', $newJwt); return true; }else{ header('Content-Type: application/json'); diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php index 3d86be20..3eae594c 100644 --- a/app/Helpers/JWTToken.php +++ b/app/Helpers/JWTToken.php @@ -20,7 +20,7 @@ class JWTToken { $secret_Key="secret"; $iat = time(); - $exp = $iat + 120; + $exp = $iat + 9000; $request_data = [ "iat" => $iat, "exp" => $exp, From 17bc0b9911b8c8fb940e98c70751a3c8c7cf690f Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 31 May 2024 16:37:57 +0530 Subject: [PATCH 4/4] CHANGE_JWT_TIME_SET_THREE_MIN : AADHAVAN --- app/Helpers/JWTToken.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php index 3eae594c..dc381fa1 100644 --- a/app/Helpers/JWTToken.php +++ b/app/Helpers/JWTToken.php @@ -20,7 +20,7 @@ class JWTToken { $secret_Key="secret"; $iat = time(); - $exp = $iat + 9000; + $exp = $iat + 180; $request_data = [ "iat" => $iat, "exp" => $exp,