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

GI-218

workflow/engine/classes/class.pmGoogleApi.php

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

workflow/engine/templates/admin/pmGmail.js

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