deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 21:53:36 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Fix setCurrentAPIScopes to work for both buildGAPIObject and OAuthInfo

Browse Source
This commit is contained in:
Ross Scroggs
2016-01-03 20:39:34 -08:00
parent 5697580bd0
commit 69689e286b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gam.py
View File

@ -801,12 +801,9 @@ def getAPIVer(api):
def setCurrentAPIScopes(service, api, version): def setCurrentAPIScopes(service, api, version):
if GM_Globals[GM_GAMSCOPES_LIST]: if GM_Globals[GM_GAMSCOPES_LIST]:
selected_api_scopes = list(set(service._rootDesc[u'auth'][u'oauth2'][u'scopes'].keys()).intersection(GM_Globals[GM_GAMSCOPES_LIST])) return list(set(service._rootDesc[u'auth'][u'oauth2'][u'scopes'].keys()).intersection(GM_Globals[GM_GAMSCOPES_LIST]))
else: else:
selected_api_scopes = service._rootDesc[u'auth'][u'oauth2'][u'scopes'].keys() return service._rootDesc[u'auth'][u'oauth2'][u'scopes'].keys()
if len(selected_api_scopes) < 1:
systemErrorExit(15, MESSAGE_NO_SCOPES_FOR_API.format(api, version))
return selected_api_scopes + [u'email']
def getServiceFromDiscoveryDocument(api, version, http=None): def getServiceFromDiscoveryDocument(api, version, http=None):
disc_filename = u'%s-%s.json' % (api, version) disc_filename = u'%s-%s.json' % (api, version)
@ -854,7 +851,9 @@ def buildGAPIObject(api, act_as=None, soft_errors=False):
service = getServiceFromDiscoveryDocument(api, version, http) service = getServiceFromDiscoveryDocument(api, version, http)
except httplib2.ServerNotFoundError as e: except httplib2.ServerNotFoundError as e:
systemErrorExit(4, e) systemErrorExit(4, e)
scopes = setCurrentAPIScopes(service, api, version) scopes = setCurrentAPIScopes(service, api, version) + [u'email']
if len(scopes) == 1:
systemErrorExit(15, MESSAGE_NO_SCOPES_FOR_API.format(api, version))
credentials = oauth2client.client.SignedJwtAssertionCredentials(GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_EMAIL], credentials = oauth2client.client.SignedJwtAssertionCredentials(GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_EMAIL],
GM_Globals[GM_OAUTH2SERVICE_KEY], GM_Globals[GM_OAUTH2SERVICE_KEY],
scope=scopes, user_agent=GAM_INFO, sub=sub) scope=scopes, user_agent=GAM_INFO, sub=sub)
@ -8738,8 +8737,6 @@ def OAuthInfo():
except httplib2.ServerNotFoundError as e: except httplib2.ServerNotFoundError as e:
systemErrorExit(4, e) systemErrorExit(4, e)
scopes = setCurrentAPIScopes(service, api, version) scopes = setCurrentAPIScopes(service, api, version)
if u'email' in scopes:
scopes.remove(u'email')
if scopes: if scopes:
for scope in scopes: for scope in scopes:
print u' {0}'.format(scope) print u' {0}'.format(scope)