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

Update guest user support #1874

Browse Source
This commit is contained in:
Ross Scroggs
2026-04-27 19:47:49 -07:00
parent 0f50ce18b3
commit 4075bef468
5 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gam/__init__.py
View File

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
"""
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.42.00'
__version__ = '7.43.00'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
# pylint: disable=wrong-import-position
@@ -46929,10 +46929,15 @@ USER_NAME_PROPERTY_PRINT_ORDER = [
'fullName',
'displayName',
]
USER_GUEST_PROPERTY_PRINT_ORDER = [
'primaryGuestEmail',
]
USER_LANGUAGE_PROPERTY_PRINT_ORDER = [
'languages',
]
USER_SCALAR_PROPERTY_PRINT_ORDER = [
'isGuestUser',
'guestAccountInfo',
'isAdmin',
'isDelegatedAdmin',
'isEnrolledIn2Sv',
@@ -47050,7 +47055,7 @@ USER_FIELDS_CHOICE_MAP = {
'gal': 'includeInGlobalAddressList',
'gender': ['gender.type', 'gender.customGender', 'gender.addressMeAs'],
'givenname': 'name.givenName',
'guestaccountinfo': 'guestAccountInfo',
'guestaccountinfo': ['guestAccountInfo.primaryGuestEmail'],
'id': 'id',
'im': 'ims',
'ims': 'ims',
@@ -47368,17 +47373,23 @@ def infoUsers(entityList):
Ind.Increment()
printKeyValueList(['Settings', None])
Ind.Increment()
if 'name' in user:
for up in USER_NAME_PROPERTY_PRINT_ORDER:
if up in user['name']:
printKeyValueList([UProp.PROPERTIES[up][UProp.TITLE], user['name'][up]])
up = 'name'
if up in user:
for nup in USER_NAME_PROPERTY_PRINT_ORDER:
if nup in user[up]:
printKeyValueList([UProp.PROPERTIES[nup][UProp.TITLE], user[up][nup]])
up = 'languages'
if up in user:
printKeyValueList([UProp.PROPERTIES[up][UProp.TITLE], _formatLanguagesList(user[up], ',')])
for up in USER_SCALAR_PROPERTY_PRINT_ORDER:
if up in user:
if up not in USER_TIME_OBJECTS:
printKeyValueList([UProp.PROPERTIES[up][UProp.TITLE], user[up]])
if up != 'guestAccountInfo':
printKeyValueList([UProp.PROPERTIES[up][UProp.TITLE], user[up]])
else:
for gup in USER_GUEST_PROPERTY_PRINT_ORDER:
if gup in user[up]:
printKeyValueList([UProp.PROPERTIES[gup][UProp.TITLE], user[up][gup]])
else:
printKeyValueList([UProp.PROPERTIES[up][UProp.TITLE], formatLocalTime(user[up])])
Ind.Decrement()