diff --git a/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php b/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php index 58d90bf8e13c7ee75a611f16bd64fe08856ea09e..efdabda7349aaf4f7c5cfdc90b39bc4645ca9c4a 100644 --- a/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php +++ b/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php @@ -136,14 +136,6 @@ class Google_Oauth2_Connector { header('Location: ' . $this->getAuthUrl()); } - protected function decryptAuthCode($cipherText) { - $publicKey = VtigerConfig::getOD('OAUTHREDIR_PUBK'); - $pubkey_res = openssl_get_publickey($publicKey); - $base64Decoded = base64_decode($cipherText); - openssl_public_decrypt($base64Decoded,$decipheredText,$pubkey_res); - return $decipheredText; - } - protected function fireRequest($url,$headers,$params=array(),$method='POST') { $httpClient = new Vtiger_Net_Client($url); if(count($headers)) $httpClient->setHeaders($headers); @@ -246,7 +238,7 @@ class Google_Oauth2_Connector { return $this; } else { if($_REQUEST['service'] && $_REQUEST['code']) { - $authCode = $this->decryptAuthCode($_REQUEST['code']); + $authCode = $_REQUEST['code']; $token = $this->exchangeCodeForToken($authCode); $this->storeToken($token); echo '<script>window.opener.sync();window.close();</script>'; exit; diff --git a/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/controllers/SynchronizeController.php b/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/controllers/SynchronizeController.php index 147f8f4a08ab4e4e466fe4bbb97b51be97275d9e..2325684894190cefbda7c8df9a60cf6468ebc4b0 100644 --- a/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/controllers/SynchronizeController.php +++ b/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/controllers/SynchronizeController.php @@ -16,6 +16,7 @@ require_once 'modules/WSAPP/synclib/connectors/VtigerConnector.php'; require_once 'include/database/PearDatabase.php'; require_once 'modules/WSAPP/api/ws/Register.php'; +require_once 'modules/WSAPP/WSAPPLogs.php'; abstract class WSAPP_SynchronizeController {