diff --git a/workflow/engine/classes/class.pmGoogleApi.php b/workflow/engine/classes/class.pmGoogleApi.php index 0333b3e6d..621624fb3 100755 --- a/workflow/engine/classes/class.pmGoogleApi.php +++ b/workflow/engine/classes/class.pmGoogleApi.php @@ -227,11 +227,13 @@ class PMGoogleApi throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR')); } + $data = json_decode($key); $assertionCredentials = new Google_Auth_AssertionCredentials( $this->serviceAccountEmail, $this->scope, - $key + $data->private_key ); + $assertionCredentials->sub = $this->user; $client = new Google_Client(); diff --git a/workflow/engine/src/ProcessMaker/Services/Google/Authentication.php b/workflow/engine/src/ProcessMaker/Services/Google/Authentication.php index fadfdf02b..b1d9537ad 100644 --- a/workflow/engine/src/ProcessMaker/Services/Google/Authentication.php +++ b/workflow/engine/src/ProcessMaker/Services/Google/Authentication.php @@ -23,7 +23,8 @@ class Authentication // define options $optArray = array( CURLOPT_URL => $url, - CURLOPT_RETURNTRANSFER => true + CURLOPT_RETURNTRANSFER => true, + CURLOPT_SSL_VERIFYPEER => false ); // apply those options curl_setopt_array($ch, $optArray); @@ -33,7 +34,7 @@ class Authentication // Check if any error occurred if(curl_errno($ch)) { - throw (new \Exception(\G::LoadTranslation( 'ID_TO_URL' ))); + throw (new \Exception(curl_error($ch))); } $info = curl_getinfo($ch); curl_close($ch);