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

Use profile instead of email scope since it's 1 less scope ultimately

Browse Source
This commit is contained in:
Jay Lee
2017-01-24 14:50:26 -05:00
parent 2d997fb046
commit b54eb97f6b
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

@ -9241,13 +9241,11 @@ def OAuthInfo():
print u"Secret: %s" % credentials.client_secret print u"Secret: %s" % credentials.client_secret
except UnboundLocalError: except UnboundLocalError:
pass pass
print u'Scopes:' scopes = token_info[u'scope'].split(u' ')
for scope in token_info[u'scope'].split(u' '): print u'Scopes (%s):' % len(scopes)
for scope in scopes:
print u' %s' % scope print u' %s' % scope
try: print u'G Suite Admin: %s' % credentials.id_token.get(u'email', u'Unknown')
print u'G Suite Admin: %s' % token_info[u'email']
except KeyError:
print u'G Suite Admin: Unknown'
def doDeleteOAuth(): def doDeleteOAuth():
_, credentials = getOauth2TxtStorageCredentials() _, credentials = getOauth2TxtStorageCredentials()
@ -9326,7 +9324,6 @@ OAUTH2_SCOPES = [
u'subscopes': [], u'subscopes': [],
u'scopes': u'https://www.googleapis.com/auth/admin.directory.notifications'}, u'scopes': u'https://www.googleapis.com/auth/admin.directory.notifications'},
{u'name': u'Site Verification API', {u'name': u'Site Verification API',
u'offByDefault': True,
u'subscopes': [], u'subscopes': [],
u'scopes': u'https://www.googleapis.com/auth/siteverification'}, u'scopes': u'https://www.googleapis.com/auth/siteverification'},
{u'name': u'Gmail API - send report docs todrive notifications only', {u'name': u'Gmail API - send report docs todrive notifications only',
@ -9396,7 +9393,7 @@ def doRequestOAuth(login_hint=None):
return (False, u'ERROR: {0} scopes selected, maximum is {1}, please unselect some.\n'.format(len(scopes), MAXIMUM_SCOPES)) return (False, u'ERROR: {0} scopes selected, maximum is {1}, please unselect some.\n'.format(len(scopes), MAXIMUM_SCOPES))
if len(scopes) == 0: if len(scopes) == 0:
return (False, u'ERROR: No scopes selected, please select at least one.\n') return (False, u'ERROR: No scopes selected, please select at least one.\n')
scopes.insert(0, u'email') # Email Display Scope, always included scopes.insert(0, u'profile') # Email Display Scope, always included
return (True, u'') return (True, u'')
MISSING_CLIENT_SECRETS_MESSAGE = u'''To use GAM you need to create an API project. Please run: MISSING_CLIENT_SECRETS_MESSAGE = u'''To use GAM you need to create an API project. Please run: