deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-05 21:31:35 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

update SA refresh error, use client_id, not project_id

Browse Source
This commit is contained in:
Jay Lee
2017-10-08 21:45:50 -04:00
parent a1ca3523a3
commit b1a2eb4de5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam.py
View File

@@ -538,7 +538,7 @@ def getSvcAcctCredentials(scopes, act_as):
credentials = credentials.with_scopes(scopes) credentials = credentials.with_scopes(scopes)
credentials = credentials.with_subject(act_as) credentials = credentials.with_subject(act_as)
# TODO: figure out how to set user agent # 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 return credentials
except (ValueError, KeyError): except (ValueError, KeyError):
printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON) printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON)
@@ -1064,11 +1064,11 @@ def doCheckServiceAccount(users):
result = u'PASS' result = u'PASS'
except httplib2.ServerNotFoundError as e: except httplib2.ServerNotFoundError as e:
systemErrorExit(4, e) systemErrorExit(4, e)
except oauth2client.client.HttpAccessTokenRefreshError: except google.auth.exceptions.RefreshError:
result = u'FAIL' result = u'FAIL'
all_scopes_pass = False all_scopes_pass = False
print u' Scope: {0:60} {1}'.format(scope, result) 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: if all_scopes_pass:
print u'\nAll scopes passed!\nService account %s is fully authorized.' % service_account print u'\nAll scopes passed!\nService account %s is fully authorized.' % service_account
else: else: