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

Merge pull request #179 from taers232c/master

Browse Source 
Optionally get admin email address from command line in doRequestOauth
This commit is contained in:
Jay Lee
2016-01-27 14:33:30 -05:00
parent 10fcf566b8 0a41b4ec68
commit 0aabe4ae9b
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gam.py
View File

@@ -8814,38 +8814,28 @@ def doDeleteOAuth():
sys.stderr.write(u'{0}{1}\n'.format(WARNING_PREFIX, e)) sys.stderr.write(u'{0}{1}\n'.format(WARNING_PREFIX, e))
EMAIL_PATTERN = re.compile(r'^(.+)@(.+\..+)$') EMAIL_PATTERN = re.compile(r'^(.+)@(.+\..+)$')
EMAIL_FORMAT_REQUIRED = u'<Name>@<Name>.<TLD>' EMAIL_FORMAT_REQUIRED = u'<Name>@<Domain>'
UBER_SCOPES = {u'gmail-v1': [u'https://mail.google.com/'],} UBER_SCOPES = {u'gmail-v1': [u'https://mail.google.com/'],}
def doRequestOAuth(): def doRequestOAuth():
def _getAdminDomain(): def _setAdminDomain(value):
srcFile = os.path.expanduser(os.environ.get(u'OAUTHFILE', u'oauth2.txt'))
if not os.path.isabs(srcFile):
srcFile = os.path.expanduser(os.path.join(GC_Values[GC_CONFIG_DIR], srcFile))
if os.path.isfile(srcFile):
json_string = readFile(srcFile, continueOnError=True, displayError=False)
if json_string:
try:
json_data = json.loads(json_string)
GM_Globals[GM_ADMIN] = json_data.get(u'id_token', {}).get(u'email', None)
if not GC_Values[GC_DOMAIN]:
GC_Values[GC_DOMAIN] = json_data.get(u'id_token', {}).get(u'hd', GC_Defaults[GC_DOMAIN])
except ValueError:
pass
if GM_Globals[GM_ADMIN]:
return
print u''
while True:
value = raw_input(u'Enter Admin email address: ').strip().lower()
ema = EMAIL_PATTERN.match(value) ema = EMAIL_PATTERN.match(value)
if ema: if ema:
GM_Globals[GM_ADMIN] = value GM_Globals[GM_ADMIN] = value
if not GC_Values[GC_DOMAIN]: if not GC_Values[GC_DOMAIN]:
GC_Values[GC_DOMAIN] = ema.group(2) GC_Values[GC_DOMAIN] = ema.group(2)
return True
print u'{0}Admin email address must be: {1}'.format(ERROR_PREFIX, EMAIL_FORMAT_REQUIRED)
return False
def _getAdminDomain():
print u''
while True:
value = raw_input(u'Enter Admin email address: ').strip().lower()
if _setAdminDomain(value):
return return
print u'{0}Enter full email address: {1}'.format(ERROR_PREFIX, EMAIL_FORMAT_REQUIRED)
def _select_default_scopes(apis): def _select_default_scopes(apis):
for api_name, api in apis.items(): for api_name, api in apis.items():
@@ -8881,6 +8871,12 @@ def doRequestOAuth():
else: else:
print u'ERROR: please enter numbers only' print u'ERROR: please enter numbers only'
if len(sys.argv) > 3:
GM_Globals[GM_ADMIN] = u''
if not _setAdminDomain(sys.argv[3].lower()):
_getAdminDomain()
elif not GM_Globals[GM_ADMIN]:
_getAdminDomain()
all_apis = {} all_apis = {}
api_titles = {} api_titles = {}
for api in API_VER_MAPPING.keys(): for api in API_VER_MAPPING.keys():