fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GI-162 Corregir obser. code Review Pmdrive/Gmail SOLVED

Browse Source 
- Add validation error_log, return

Change validate array_search == null to === false

Change setTimeout 36000 to 60000
This commit is contained in:
Marco A. Nina Mena
2015-11-27 10:09:02 -04:00
parent 9691cfad4c
commit c8bef4c68d
7 changed files with 104 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/class.pmGoogleApi.php
View File

@@ -181,7 +181,12 @@ class PMGoogleApi
{
$client = null;
if ($this->typeAuthentication == 'webApplication') {
$credential = file_get_contents(PATH_DATA_SITE . $this->accountJson);
if (file_exists(PATH_DATA_SITE . $this->accountJson)) {
$credential = file_get_contents(PATH_DATA_SITE . $this->accountJson);
} else {
throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_JSON_ERROR'));
}
$client = new Google_Client();
$client->setAuthConfig($credential);
@@ -206,7 +211,12 @@ class PMGoogleApi
die;
}
} else if ($this->typeAuthentication == 'serviceAccount') {
$key = file_get_contents(PATH_DATA_SITE . $this->serviceAccountP12);
if (file_exists(PATH_DATA_SITE . $this->serviceAccountP12)) {
$key = file_get_contents(PATH_DATA_SITE . $this->serviceAccountP12);
} else {
throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR'));
}
$assertionCredentials = new Google_Auth_AssertionCredentials(
$this->serviceAccountEmail,
@@ -244,7 +254,12 @@ class PMGoogleApi
);
if ($credentials->typeAuth == 'webApplication') {
$credential = file_get_contents($credentials->pathFileJson);
if (file_exists($credentials->pathFileJson)) {
$credential = file_get_contents($credentials->pathFileJson);
} else {
throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_JSON_ERROR'));
}
$client = new Google_Client();
$client->setAuthConfig($credential);
@@ -267,7 +282,12 @@ class PMGoogleApi
die;
}
} else {
$key = file_get_contents($credentials->pathServiceAccountP12);
if (file_exists($credentials->pathServiceAccountP12)) {
$key = file_get_contents($credentials->pathServiceAccountP12);
} else {
throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR'));
}
$assertionCredentials = new Google_Auth_AssertionCredentials(
$credentials->emailServiceAccount,
$scope,