deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 05:33:34 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

add user schema api scopes

Browse Source
This commit is contained in:
Jay Lee
2014-09-23 20:09:05 -04:00
parent 0f111e6eaf
commit e8e25c352b
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gam.py
View File

@ -6829,14 +6829,14 @@ found at:
%s %s
with information from the APIs Console <https://code.google.com/apis/console>. with information from the APIs Console <https://cloud.google.com/console>.
See https://code.google.com/p/google-apps-manager/wiki/CreatingClientSecretsFile See https://code.google.com/p/google-apps-manager/wiki/CreatingClientSecretsFile
for instructions. for instructions.
""" % CLIENT_SECRETS """ % CLIENT_SECRETS
selected_scopes = [u'*'] * 19 selected_scopes = [u'*'] * 20
menu = u'''Select the authorized scopes for this token. Include a 'r' to grant read-only menu = u'''Select the authorized scopes for this token. Include a 'r' to grant read-only
access or an 'a' to grant action-only access. access or an 'a' to grant action-only access.
@ -6859,10 +6859,11 @@ access or an 'a' to grant action-only access.
[%s] 16) Notifications Directory API [%s] 16) Notifications Directory API
[%s] 17) Site Verification API [%s] 17) Site Verification API
(%s) 18) IMAP/SMTP Access (send notifications to admin) (%s) 18) IMAP/SMTP Access (send notifications to admin)
(%s) 19) User Schemas (supports read-only)
19) Select all scopes 20) Select all scopes
20) Unselect all scopes 21) Unselect all scopes
21) Continue 22) Continue
''' '''
os.system([u'clear', u'cls'][os.name == u'nt']) os.system([u'clear', u'cls'][os.name == u'nt'])
while True: while True:
@ -6870,7 +6871,7 @@ access or an 'a' to grant action-only access.
try: try:
if selection.lower().find(u'r') != -1: if selection.lower().find(u'r') != -1:
selection = int(selection.lower().replace(u'r', u'')) selection = int(selection.lower().replace(u'r', u''))
if selection not in [0, 1, 2, 3, 4, 10]: if selection not in [0, 1, 2, 3, 4, 10, 19]:
os.system([u'clear', u'cls'][os.name == u'nt']) os.system([u'clear', u'cls'][os.name == u'nt'])
print u'THAT SCOPE DOES NOT SUPPORT READ-ONLY MODE!\n' print u'THAT SCOPE DOES NOT SUPPORT READ-ONLY MODE!\n'
continue continue
@ -6882,18 +6883,18 @@ access or an 'a' to grant action-only access.
print u'THAT SCOPE DOES NOT SUPPORT ACTION-ONLY MODE!\n' print u'THAT SCOPE DOES NOT SUPPORT ACTION-ONLY MODE!\n'
continue continue
selected_scopes[selection] = u'A' selected_scopes[selection] = u'A'
elif int(selection) > -1 and int(selection) <= 18: elif int(selection) > -1 and int(selection) <= 19:
if selected_scopes[int(selection)] == u' ': if selected_scopes[int(selection)] == u' ':
selected_scopes[int(selection)] = u'*' selected_scopes[int(selection)] = u'*'
else: else:
selected_scopes[int(selection)] = u' ' selected_scopes[int(selection)] = u' '
elif selection == u'19':
for i in range(0, len(selected_scopes)):
selected_scopes[i] = u'*'
elif selection == u'20': elif selection == u'20':
for i in range(0, len(selected_scopes)): for i in range(0, len(selected_scopes)):
selected_scopes[i] = u' ' selected_scopes[i] = u'*'
elif selection == u'21': elif selection == u'21':
for i in range(0, len(selected_scopes)):
selected_scopes[i] = u' '
elif selection == u'22':
at_least_one = False at_least_one = False
for i in range(0, len(selected_scopes)): for i in range(0, len(selected_scopes)):
if selected_scopes[i] in [u'*', u'R', u'A']: if selected_scopes[i] in [u'*', u'R', u'A']:
@ -6932,7 +6933,8 @@ access or an 'a' to grant action-only access.
u'https://www.googleapis.com/auth/admin.directory.user.security', # User Security Directory API u'https://www.googleapis.com/auth/admin.directory.user.security', # User Security Directory API
u'https://www.googleapis.com/auth/admin.directory.notifications', # Notifications Directory API u'https://www.googleapis.com/auth/admin.directory.notifications', # Notifications Directory API
u'https://www.googleapis.com/auth/siteverification', # Site Verification API u'https://www.googleapis.com/auth/siteverification', # Site Verification API
u'https://mail.google.com/'] # IMAP/SMTP authentication for admin notifications u'https://mail.google.com/', # IMAP/SMTP authentication for admin notifications
u'https://www.googleapis.com/auth/admin.directory.userschema'] # Customer User Schema
if incremental_auth: if incremental_auth:
scopes = [] scopes = []
else: else:

2
oauth2client/client.py
View File

@ -1269,7 +1269,7 @@ class OAuth2WebServerFlow(Flow):
'client_secret': self.client_secret, 'client_secret': self.client_secret,
'code': code, 'code': code,
'redirect_uri': self.redirect_uri, 'redirect_uri': self.redirect_uri,
'scope': self.scope, # 'scope': self.scope,
}) })
headers = { headers = {
'content-type': 'application/x-www-form-urlencoded', 'content-type': 'application/x-www-form-urlencoded',