deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-16 20:21:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jay0lee/master'

Browse Source
This commit is contained in:
Ross Scroggs
2015-12-30 11:39:07 -08:00
parent 0207e84551 900fc9c4e3
commit 6ae4cf495d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gam.py
View File

@@ -185,7 +185,7 @@ GC_Defaults = {
GC_CACHE_DIR: u'',
GC_CHARSET: u'utf-8',
GC_CONFIG_DIR: u'',
GC_CUSTOMER_ID: u'',
GC_CUSTOMER_ID: u'my_customer',
GC_DEBUG_LEVEL: 0,
GC_DEVICE_MAX_RESULTS: 500,
GC_DOMAIN: u'',
@@ -580,7 +580,7 @@ def tryOAuth(gdataObject, scope):
sys.exit(4)
gdataObject.additional_headers = {u'Authorization': u'Bearer %s' % credentials.access_token}
if not GC_Values[GC_DOMAIN]:
GC_Values[GC_DOMAIN] = credentials.id_token.get(u'hd', UNKNOWN).lower()
GC_Values[GC_DOMAIN] = GC_Values[GC_ADMIN][GC_Values[GC_ADMIN].find(u'@'):].lower()
if not GC_Values[GC_CUSTOMER_ID]:
GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
gdataObject.domain = GC_Values[GC_DOMAIN]