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

Meet API fixes #1822

Browse Source
This commit is contained in:
Ross Scroggs
2025-08-21 12:40:58 -07:00
parent 70cf32f6ed
commit 04371eee53
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GamUpdate.txt
View File

@@ -4,8 +4,8 @@ Eliminated `drive_v3_beta` and `meet_v2_beta` from `gam.cfg` as the API betas ar
Updated `Meet API` scopes so that GAM can read metadata about additional Meet spaces. Updated `Meet API` scopes so that GAM can read metadata about additional Meet spaces.
``` ```
[*] 34) Meet API - Display Meet Conference Records [*] 34) Meet API - Manage/Display Meeting Spaces
[*] 35) Meet API - Manage/Display Meet Spaces [*] 35) Meet API - Read Meeting Spaces metadata
``` ```
7.18.07 7.18.07

7
src/gam/__init__.py
View File

@@ -4795,7 +4795,10 @@ def defaultSvcAcctScopes():
for scope in scopesList: for scope in scopesList:
if not scope.get('offByDefault'): if not scope.get('offByDefault'):
saScopes.setdefault(scope['api'], []) saScopes.setdefault(scope['api'], [])
if not isinstance(scope['scope'], list):
saScopes[scope['api']].append(scope['scope']) saScopes[scope['api']].append(scope['scope'])
else:
saScopes[scope['api']].extend(scope['scope'])
saScopes[API.DRIVEACTIVITY].append(API.DRIVE_SCOPE) saScopes[API.DRIVEACTIVITY].append(API.DRIVE_SCOPE)
saScopes[API.DRIVE2] = saScopes[API.DRIVE3] saScopes[API.DRIVE2] = saScopes[API.DRIVE3]
saScopes[API.DRIVETD] = saScopes[API.DRIVE3] saScopes[API.DRIVETD] = saScopes[API.DRIVE3]
@@ -28533,7 +28536,7 @@ def printShowMeetConferences(users):
i, count, users = getEntityArgument(users) i, count, users = getEntityArgument(users)
for user in users: for user in users:
i += 1 i += 1
user, meet, kvList = buildMeetServiceObject(API.MEET_CONFRECS, user, i, count, [Ent.MEET_CONFERENCE, None]) user, meet, kvList = buildMeetServiceObject(API.MEET_READONLY, user, i, count, [Ent.MEET_CONFERENCE, None])
if not meet: if not meet:
continue continue
try: try:
@@ -28609,7 +28612,7 @@ def _printShowMeetItems(users, entityType):
i, count, users = getEntityArgument(users) i, count, users = getEntityArgument(users)
for user in users: for user in users:
i += 1 i += 1
user, meet, kvList = buildMeetServiceObject(API.MEET_CONFRECS, user, i, count, [Ent.MEET_CONFERENCE, parent]) user, meet, kvList = buildMeetServiceObject(API.MEET_READONLY, user, i, count, [Ent.MEET_CONFERENCE, parent])
if not meet: if not meet:
continue continue
if entityType == Ent.MEET_PARTICIPANT: if entityType == Ent.MEET_PARTICIPANT:

16
src/gam/gamlib/glapi.py
View File

@@ -75,8 +75,8 @@ IAM_CREDENTIALS = 'iamcredentials'
KEEP = 'keep' KEEP = 'keep'
LICENSING = 'licensing' LICENSING = 'licensing'
LOOKERSTUDIO = 'datastudio' LOOKERSTUDIO = 'datastudio'
MEET_CONFRECS = 'meetreadonly'
MEET_SPACES = 'meet' MEET_SPACES = 'meet'
MEET_READONLY = 'meetreadonly'
OAUTH2 = 'oauth2' OAUTH2 = 'oauth2'
ORGPOLICY = 'orgpolicy' ORGPOLICY = 'orgpolicy'
PEOPLE = 'people' PEOPLE = 'people'
@@ -267,8 +267,8 @@ _INFO = {
KEEP: {'name': 'Keep API', 'version': 'v1', 'v2discovery': True}, KEEP: {'name': 'Keep API', 'version': 'v1', 'v2discovery': True},
LICENSING: {'name': 'License Manager API', 'version': 'v1', 'v2discovery': True}, LICENSING: {'name': 'License Manager API', 'version': 'v1', 'v2discovery': True},
LOOKERSTUDIO: {'name': 'Looker Studio API', 'version': 'v1', 'v2discovery': True, 'localjson': True}, LOOKERSTUDIO: {'name': 'Looker Studio API', 'version': 'v1', 'v2discovery': True, 'localjson': True},
MEET_CONFRECS: {'name': 'Meet API - Display Meet Conference Records', 'version': 'v2', 'v2discovery': True, 'mappedAPI': MEET_SPACES}, MEET_SPACES: {'name': 'Meet API - Manage/Display Meeting Spaces', 'version': 'v2', 'v2discovery': True},
MEET_SPACES: {'name': 'Meet API - Manage/Display Meet Spaces', 'version': 'v2', 'v2discovery': True}, MEET_READONLY: {'name': 'Meet API - Read Meeting Spaces metadata', 'version': 'v2', 'v2discovery': True, 'mappedAPI': MEET_SPACES},
OAUTH2: {'name': 'OAuth2 API', 'version': 'v2', 'v2discovery': False}, OAUTH2: {'name': 'OAuth2 API', 'version': 'v2', 'v2discovery': False},
ORGPOLICY: {'name': 'Organization Policy API', 'version': 'v2', 'v2discovery': True}, ORGPOLICY: {'name': 'Organization Policy API', 'version': 'v2', 'v2discovery': True},
PEOPLE: {'name': 'People API', 'version': 'v1', 'v2discovery': True}, PEOPLE: {'name': 'People API', 'version': 'v1', 'v2discovery': True},
@@ -689,15 +689,15 @@ _SVCACCT_SCOPES = [
'api': LOOKERSTUDIO, 'api': LOOKERSTUDIO,
'subscopes': READONLY, 'subscopes': READONLY,
'scope': 'https://www.googleapis.com/auth/datastudio'}, 'scope': 'https://www.googleapis.com/auth/datastudio'},
{'name': 'Meet API - Display Meet Conference Records', {'name': 'Meet API - Manage/Display Meeting Spaces',
'api': MEET_CONFRECS,
'subscopes': [],
'scope': 'https://www.googleapis.com/auth/meetings.space.readonly'},
{'name': 'Meet API - Manage/Display Meet Spaces',
'api': MEET_SPACES, 'api': MEET_SPACES,
'subscopes': [], 'subscopes': [],
'scope': ['https://www.googleapis.com/auth/meetings.space.created', 'scope': ['https://www.googleapis.com/auth/meetings.space.created',
'https://www.googleapis.com/auth/meetings.space.settings']}, 'https://www.googleapis.com/auth/meetings.space.settings']},
{'name': 'Meet API - Read Meeting Spaces metadata',
'api': MEET_READONLY,
'subscopes': [],
'scope': 'https://www.googleapis.com/auth/meetings.space.readonly'},
{'name': 'OAuth2 API', {'name': 'OAuth2 API',
'api': OAUTH2, 'api': OAUTH2,
'subscopes': [], 'subscopes': [],