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

allow forcing OAuth for service account

Browse Source
This commit is contained in:
Jay Lee
2023-02-17 15:40:36 +00:00
parent 9036d114ed
commit 50aadc6ea7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gam/__init__.py
View File

@@ -926,11 +926,11 @@ def _getSvcAcctData():
controlflow.system_error_exit(6, None) controlflow.system_error_exit(6, None)
GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string) GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string)
def getSvcAcctCredentials(scopes, act_as, api=None): def getSvcAcctCredentials(scopes, act_as, api=None, force_oauth=False):
try: try:
_getSvcAcctData() _getSvcAcctData()
sign_method = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA].get('key_type', 'default') sign_method = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA].get('key_type', 'default')
if act_as: if act_as or force_oauth:
# DwD means we need to go about things differently... # DwD means we need to go about things differently...
if sign_method == 'default': if sign_method == 'default':
credentials = google.oauth2.service_account.Credentials.from_service_account_info( credentials = google.oauth2.service_account.Credentials.from_service_account_info(
@@ -1303,7 +1303,9 @@ def doCheckServiceAccount(users):
# We are explicitly not doing DwD here, just confirming service account can auth # We are explicitly not doing DwD here, just confirming service account can auth
auth_error = '' auth_error = ''
try: try:
credentials = getSvcAcctCredentials([USERINFO_EMAIL_SCOPE], None) credentials = getSvcAcctCredentials([USERINFO_EMAIL_SCOPE],
None,
force_oauth=True)
request = transport.create_request() request = transport.create_request()
credentials.refresh(request) credentials.refresh(request)
sa_token_info = gapi.call(oa2, sa_token_info = gapi.call(oa2,