From 7bade8ce01cad64b8a44e3d6bde23f2458a3d92f Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Thu, 25 Jul 2024 11:26:07 +0530
Subject: [PATCH] CHANGES_in rest login api in employee login : GWM

---
 app/Config/Routes.php                         |  4 +--
 .../RestAuthenticationController.php          | 36 +++++++------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 3a17a26a..0163d762 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -286,9 +286,9 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
 
 
 
-$routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
 
-$routes->get("getChatResponse", "ChatBotController::getChatResponse");
+
+
 $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->post("storeFireBase", "EmployeeRestController::storeFireBase");
     $routes->post("saveMpin", "RestAuthenticationController::saveMpin");
diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index 6efaa163..bb6013d5 100644
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -69,15 +69,13 @@ class RestAuthenticationController extends AdminController
     {
         try {
             $mobile_number = $this->request->getJSON()->mobile_number;
-            $randomNumber = rand(100000, 999999);
-            $randomNumber = 123456;
+          
 
             $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first();
             
             if ($employeeData) {
-                $id= $employeeData["id"];
-                $otp = $this->employeeModel->where('id', $id)->set('otp', $randomNumber)->update();
-                $result = ['user_verification' => true ,'message' => "Verified Successfully", 'otp'=>$randomNumber];
+               
+                $result = ['user_verification' => true ,'message' => "Verified Successfully"];
                 return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
             } else {
                 $result = ['user_verification' => false , 'message' => "User not found"];
@@ -92,13 +90,13 @@ class RestAuthenticationController extends AdminController
 
     public function getVerifiedUserData()
     {
-        // try {
+        try {
             $mobile_number = $this->request->getJSON()->mobile_number;
-            $otp = $this->request->getJSON()->otp;
+            $otp_verification = $this->request->getJSON()->otp_verification;
 
             $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first();
            
-            if ($employeeData && $otp == $employeeData["otp"] || $employeeData && isset($this->request->getJSON()->login_by_hr)) {
+            if ($employeeData && $otp_verification == true || $employeeData && isset($this->request->getJSON()->login_by_hr)) {
                 $auth =  HttpRequestHelper::getRequestInfo();
                 if ($auth) {
                     $data = [
@@ -108,22 +106,19 @@ class RestAuthenticationController extends AdminController
                        'platform' => $auth['platform'],
                        'broswer' => $auth['browser'],
                     ];
-
-                    $authdata= $this->authHistoryModel->insert($data);
-                                        
+                     $this->authHistoryModel->insert($data);                    
                 }
-                $otp_null = $this->employeeModel->where('id', $employeeData["id"])->set('otp', null)->update();
-
-
+              
 
                 $result = JWTToken::encode($employeeData);
-            return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+
             } 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()
@@ -190,11 +185,6 @@ class RestAuthenticationController extends AdminController
 
 
 
-    public function employeeLogout()
-    {
-
-    }
-
     public function getUserIdFromToken()
     {
         $id = JWTToken::getUserIdFromToken();