From 23a99fad7967acf7c3a2d487fc9b5f9da34b4b70 Mon Sep 17 00:00:00 2001
From: jennydmz <jennydmz@gmail.com>
Date: Tue, 22 Dec 2015 17:17:43 -0400
Subject: [PATCH] GI-218

Changing the default p12 file for the new json configuration service account file
---
 workflow/engine/classes/class.pmGoogleApi.php | 3 ++-
 workflow/engine/templates/admin/pmGmail.js    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.pmGoogleApi.php b/workflow/engine/classes/class.pmGoogleApi.php
index 8d7d72c0a..0333b3e6d 100755
--- a/workflow/engine/classes/class.pmGoogleApi.php
+++ b/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;
 
diff --git a/workflow/engine/templates/admin/pmGmail.js b/workflow/engine/templates/admin/pmGmail.js
index a4e52b59e..385788d52 100644
--- a/workflow/engine/templates/admin/pmGmail.js
+++ b/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')
             },
             {