deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 22:23:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix error; DASA suggestions (#1236)

Browse Source 
* userKey and customer is an invalid combination; userkey and domain is allowed

* DASA suggestions

I would not use OAUTHFILE to distinguish between normal/DASA, it seems to me that this might lead to oauth2service.json getting deleted by accident.

By using enabledasa.txt you can flip between the two modes easily.

* Update __init__.py

Is this what yuou meant?
This commit is contained in:
Ross Scroggs
2020-09-11 08:33:06 -07:00
committed by GitHub
parent 487e1dc4c1
commit 908edff878
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam/var.py
View File

@ -1134,6 +1134,8 @@ GC_DECODED_ID_TOKEN = 'decoded_id_token'
GC_DOMAIN = 'domain'
# Google Drive download directory
GC_DRIVE_DIR = 'drive_dir'
# Enable Delegated Admin Service Accounts
GC_ENABLE_DASA = 'enabledasa'
# If no_browser is False, writeCSVfile won't open a browser when todrive is set
# and doRequestOAuth prints a link and waits for the verification code when
# oauth2.txt is being created
@ -1187,6 +1189,7 @@ GC_Defaults = {
GC_DECODED_ID_TOKEN: '',
GC_DOMAIN: '',
GC_DRIVE_DIR: '',
GC_ENABLE_DASA: False,
GC_NO_BROWSER: False,
GC_NO_CACHE: False,
GC_NO_SHORT_URLS: False,
@ -1263,6 +1266,9 @@ GC_VAR_INFO = {
GC_DRIVE_DIR: {
GC_VAR_TYPE: GC_TYPE_DIRECTORY
},
GC_ENABLE_DASA: {
GC_VAR_TYPE: GC_TYPE_BOOLEAN
},
GC_NO_BROWSER: {
GC_VAR_TYPE: GC_TYPE_BOOLEAN
},