From b1a2eb4de5d3955c0842b3af21e82adc88ad01fe Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Sun, 8 Oct 2017 21:45:50 -0400
Subject: [PATCH] update SA refresh error, use client_id, not project_id

---
 src/gam.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gam.py b/src/gam.py
index 9a25259f..a877259d 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -538,7 +538,7 @@ def getSvcAcctCredentials(scopes, act_as):
     credentials = credentials.with_scopes(scopes)
     credentials = credentials.with_subject(act_as)
     # TODO: figure out how to set user agent
-    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = credentials.project_id
+    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_id']
     return credentials
   except (ValueError, KeyError):
     printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON)
@@ -1064,11 +1064,11 @@ def doCheckServiceAccount(users):
         result = u'PASS'
       except httplib2.ServerNotFoundError as e:
         systemErrorExit(4, e)
-      except oauth2client.client.HttpAccessTokenRefreshError:
+      except google.auth.exceptions.RefreshError:
         result = u'FAIL'
         all_scopes_pass = False
       print u' Scope: {0:60} {1}'.format(scope, result)
-    service_account = credentials.project_id
+    service_account = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] 
     if all_scopes_pass:
       print u'\nAll scopes passed!\nService account %s is fully authorized.' % service_account
     else: