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

Merged in jennydmz/processmaker/GI-218 (pull request #3440)

Browse Source 
GI-218
This commit is contained in:
Dante Loayza
2015-12-22 17:27:38 -04:00
parent b23cd2af25 23a99fad79
commit 76977c527f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,10 +297,11 @@ class PMGoogleApi
} else { } else {
throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR')); throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR'));
} }
$data = json_decode($key);
$assertionCredentials = new Google_Auth_AssertionCredentials( $assertionCredentials = new Google_Auth_AssertionCredentials(
$credentials->emailServiceAccount, $credentials->emailServiceAccount,
$scope, $scope,
$key $data->private_key
); );
$assertionCredentials->sub = $this->user; $assertionCredentials->sub = $this->user;

2
workflow/engine/templates/admin/pmGmail.js
View File

@@ -178,7 +178,7 @@ Ext.onReady(function(){
}); });
} }
}, },
regex : /(.)+((\.p12)(\w)?)$/i, regex : /(.)+((\.json)(\w)?)$/i,
regexText : _('ID_PMG_TYPE_ACCEPT') regexText : _('ID_PMG_TYPE_ACCEPT')
}, },
{ {