diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 2c191d10..4fde1cf9 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -149,9 +149,11 @@ defined('DIGILOCKER_FILESLIST_URI') OR define('DIGILOCKER_FILESLIST_URI','https: defined('DIGILOCKER_GETFILE_URI') OR define('DIGILOCKER_GETFILE_URI','https://api.digitallocker.gov.in/public/oauth2/1/file/'); defined('GCP_BUCKET_NAME') OR define('GCP_BUCKET_NAME','pd-giene-data'); defined('CET_CREDITPD_INTEGRATION_REINSERTIMG_URL') OR define('CET_CREDITPD_INTEGRATION_REINSERTIMG_URL','https://demo.devopsmcfinance.com/cet_creditpd/api/ReInsertImageData'); -defined('SMC_FINANCE_AUTH_URL') OR define('SMC_FINANCE_AUTH_URL','http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/login'); +defined('SMC_FINANCE_AUTH_URL') OR define('SMC_FINANCE_AUTH_URL','https://ums-backend-uat-m54bsjg7fq-em.a.run.app/ums/api/v1/auth/getaccess'); +defined('SMC_FINANCE_UPDATE_URL') OR define('SMC_FINANCE_UPDATE_URL','https://activity-tracker-staging-m54bsjg7fq-em.a.run.app/salesapp/api/v1/sales-lead/update-pd'); +// defined('SMC_FINANCE_AUTH_URL') OR define('SMC_FINANCE_AUTH_URL','http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/login'); defined('SMC_FINANCE_REFRESH_TOKEN') OR define('SMC_FINANCE_REFRESH_TOKEN','http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/access-token'); -defined('SMC_FINANCE_UPDATE_URL') OR define('SMC_FINANCE_UPDATE_URL','http://devopsmcfinance.com/salesapi/salesapplication/v1/sales-lead/update-pd'); +// defined('SMC_FINANCE_UPDATE_URL') OR define('SMC_FINANCE_UPDATE_URL','http://devopsmcfinance.com/salesapi/salesapplication/v1/sales-lead/update-pd'); /*************************TWILO CONSTANTS************************************************************/ defined('TWLIO_SID') OR define('TWLIO_SID',getenv('TEST.TWLIO_SID')); defined('TWLIO_AUTH_TOKEN') OR define('TWLIO_AUTH_TOKEN',getenv('TEST.TWLIO_AUTH_TOKEN')); @@ -186,9 +188,11 @@ else if(ENVIRONMENT == 'testing') defined('DIGILOCKER_GETFILE_URI') OR define('DIGILOCKER_GETFILE_URI','https://api.digitallocker.gov.in/public/oauth2/1/file/'); defined('GCP_BUCKET_NAME') OR define('GCP_BUCKET_NAME','pd-giene-data'); defined('CET_CREDITPD_INTEGRATION_REINSERTIMG_URL') OR define('CET_CREDITPD_INTEGRATION_REINSERTIMG_URL','https://demo.devopsmcfinance.com/cet_creditpd/api/ReInsertImageData'); - defined('SMC_FINANCE_AUTH_URL') OR define('SMC_FINANCE_AUTH_URL','http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/login'); + // defined('SMC_FINANCE_AUTH_URL') OR define('SMC_FINANCE_AUTH_URL','http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/login'); + defined('SMC_FINANCE_AUTH_URL') OR define('SMC_FINANCE_AUTH_URL','https://ums-backend-uat-m54bsjg7fq-em.a.run.app/ums/api/v1/auth/getaccess'); + defined('SMC_FINANCE_UPDATE_URL') OR define('SMC_FINANCE_UPDATE_URL','https://activity-tracker-staging-m54bsjg7fq-em.a.run.app/salesapp/api/v1/sales-lead/update-pd'); defined('SMC_FINANCE_REFRESH_TOKEN') OR define('SMC_FINANCE_REFRESH_TOKEN','http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/access-token'); - defined('SMC_FINANCE_UPDATE_URL') OR define('SMC_FINANCE_UPDATE_URL','http://devopsmcfinance.com/salesapi/salesapplication/v1/sales-lead/update-pd'); + // defined('SMC_FINANCE_UPDATE_URL') OR define('SMC_FINANCE_UPDATE_URL','http://devopsmcfinance.com/salesapi/salesapplication/v1/sales-lead/update-pd'); /*************************TWILO CONSTANTS************************************************************/ defined('TWLIO_SID') OR define('TWLIO_SID',getenv('TEST.TWLIO_SID')); defined('TWLIO_AUTH_TOKEN') OR define('TWLIO_AUTH_TOKEN',getenv('TEST.TWLIO_AUTH_TOKEN')); diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 9a5d4321..60ba5b52 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -1841,6 +1841,7 @@ public function filterSalesPDList_post() { // echo "Generated hash: ".$hash;die; // MwiseSales@yahoo.com#sine1234 // $2y$10$n4dEVCXJ2Oho9KJUnhss/.LAXTyXN60dz332ZRPNp4VpY8J.Ue7ly + // decrypted token : autotrigger@smcfinance.com#sine1234#293#19#15/11/2023 08:48:32#mwisesales1@sine.com#11351 if($saltkey != ''){ log_message('ERROR','## A) saltkey Found : '.$saltkey); @@ -1876,6 +1877,7 @@ public function filterSalesPDList_post() { $applicantid = $array['applicantid']; $usersemailid = $array['userid']; $loanamount = $array['loanamount']; + $officername = $array['officername']; $createdby = null; $salepdid = null; $current_date = date("d/m/Y H:i:s"); @@ -2071,7 +2073,7 @@ public function filterSalesPDList_post() { if (ENVIRONMENT == 'production') { $auth_user_id = "autotrigger@smcfinance.com"; $auth_password = "sine1234"; - $token = base64_encode($auth_user_id . "#" . $auth_password . "#" . $user_id . "#" . $role_id . "#" . $current_date . "#" . $usersemailid . "#" . $salepdid); + $token = base64_encode($auth_user_id . "#" . $auth_password . "#" . $user_id . "#" . $role_id . "#" . $current_date . "#" . $usersemailid . "#" . $salepdid."#".$officername); // echo $token; // log_message('ERROR','## 7) Finally, '.$data['msg']); $redirect_uri = "https://pdgenie.com/sales/#/auto?token=" . $token; // For Production @@ -2079,7 +2081,7 @@ public function filterSalesPDList_post() { $auth_user_id = "autotrigger@smcfinance.com"; // $auth_user_id = "MwiseSales@yahoo.com"; $auth_password = "sine1234"; - $token = base64_encode($auth_user_id . "#" . $auth_password . "#" . $user_id . "#" . $role_id . "#" . $current_date . "#" . $usersemailid . "#" . $salepdid); + $token = base64_encode($auth_user_id . "#" . $auth_password . "#" . $user_id . "#" . $role_id . "#" . $current_date . "#" . $usersemailid . "#" . $salepdid."#".$officername); // echo $token; // $token = base64_encode('mwisesales1@sine.com#test1234'."#".$user_id."#".$role_id); // $redirect_uri = "http://localhost:4200/#/auto?token=".$token; // For Localhost diff --git a/api/application/helpers/smcfinance_helper.php b/api/application/helpers/smcfinance_helper.php index 7cb9638c..034e938a 100644 --- a/api/application/helpers/smcfinance_helper.php +++ b/api/application/helpers/smcfinance_helper.php @@ -17,7 +17,7 @@ class SMCFINANCE $ch = curl_init(); $body = '{ "userCode": "APIEdge","userPass": "sineUAT", "application": [ "Sales App-API" ] }'; log_message('ERROR',"## SMC Finance Auth Url Request ".$body); - curl_setopt($ch, CURLOPT_URL, SMC_FINANCE_AUTH_URL); + curl_setopt($ch, CURLOPT_URL, SMC_FINANCE_AUTH_URL); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); @@ -29,7 +29,8 @@ class SMCFINANCE $result = (array)curl_exec($ch ); if(!empty($result)){ $response_decoded = json_decode($result[0]); - $token = $response_decoded->data->accessToken; + // $token = $response_decoded->data->accessToken; + $token = $response_decoded->data; }else{ $token = null; } @@ -38,7 +39,7 @@ class SMCFINANCE // $response = $response_decoded; curl_close( $ch ); log_message('ERROR', "## SMC Finance Auth Url Token : " . $token); - } + } catch (Exception $e) { $token = null; // $response->error = array($e->getMessage()); @@ -47,11 +48,15 @@ class SMCFINANCE return $token; } + + + // 2. Refresh Token // API URL: http://ums.devopsmcfinance.com/umsnode/ums/api/v1/auth/access-token // TYPE : POST // BODY : { "refreshToken": {Refresh Token} } + public static function SmcFinanceRefreshToken($token) { $CI =& get_instance(); @@ -101,8 +106,9 @@ class SMCFINANCE curl_setopt($ch, CURLOPT_URL, SMC_FINANCE_UPDATE_URL); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HEADER, 0); - curl_setopt($ch, CURLOPT_POSTFIELDS,$body); - curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_setopt($ch, CURLOPT_POSTFIELDS,$body); + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); + // curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt( $ch,CURLOPT_SSL_VERIFYPEER, true );