deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-03 22:01:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update guest user support #1874

Browse Source
This commit is contained in:
Ross Scroggs
2026-04-28 15:27:41 -07:00
parent 2a49e1ebe2
commit 1b7e736caf
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GamUpdate.txt
View File

@@ -1,6 +1,6 @@
7.43.00
Updated `gam info user` to display guest user attributes: `isGuestUser, guestAccountInfo`
Updated `gam info user` and `gam print users` to display guest user attributes: `isGuestUser, guestAccountInfo`
Expanded `<UserTypeEntity>` to allow specification of guest users.
* See [Collections of Users](Collections-of-Users)

13
src/gam/__init__.py
View File

@@ -45962,6 +45962,8 @@ def getUserAttributes(cd, updateCmd, noUid=False):
elif updateCmd and myarg == 'updateprimaryemail':
updatePrimaryEmail = list(getREPatternSubstitution(re.IGNORECASE))
updatePrimaryEmail.append(checkArgumentPresent(['preview']))
elif updateCmd and myarg == 'primaryguestemail':
body['guestAccountInfo'] = {'primaryGuestEmail': getEmailAddress(noUid=True)}
elif myarg == 'json':
body.update(getJSON(USER_JSON_SKIP_FIELDS))
if 'name' in body and 'fullName' in body['name']:
@@ -47253,7 +47255,7 @@ def infoUsers(entityList):
ci = None
setTrueCustomerId(cd)
getAliases = getBuildingNames = getCIGroupsTree = getGroups = getLicenses = getSchemas = not GC.Values[GC.QUICK_INFO_USER]
getGroupsTree = False
getGroupsTree = getIsGuestUser = False
FJQC = FormatJSONQuoteChar()
schemaParms = _initSchemaParms('full')
viewType = 'admin_view'
@@ -47308,6 +47310,7 @@ def infoUsers(entityList):
fieldsList.append('customSchemas')
if getAliases:
fieldsList.extend(['aliases', 'nonEditableAliases'])
getIsGuestUser = not fieldsList or 'isGuestUser' in fieldsList
fields = getFieldsFromFieldsList(fieldsList)
if getLicenses:
lic = buildGAPIObject(API.LICENSING)
@@ -47324,6 +47327,8 @@ def infoUsers(entityList):
throwReasons=GAPI.USER_GET_THROW_REASONS+[GAPI.INVALID_INPUT, GAPI.RESOURCE_NOT_FOUND],
userKey=userEmail, projection=schemaParms['projection'], customFieldMask=schemaParms['customFieldMask'],
viewType=viewType, fields=fields)
if getIsGuestUser and 'isGetUser' not in user:
user['isGuestUser'] = False
if userMultiAttributeFilters:
_filterUserMultiAttributes(user, userMultiAttributeFilters)
groups = []
@@ -47767,6 +47772,8 @@ def doPrintUsers(entityList=None):
(isArchived == userEntity.get('archived', isArchived)))
if not showUser:
return
if getIsGuestUser and 'isGuestUser' not in userEntity:
userEntity['isGuestUser'] = False
if showValidColumn:
userEntity[showValidColumn] = True
if userMultiAttributeFilters:
@@ -47905,7 +47912,7 @@ def doPrintUsers(entityList=None):
maxResults = GC.Values[GC.USER_MAX_RESULTS]
schemaParms = _initSchemaParms('basic')
projectionSet = False
oneLicensePerRow = quotePlusPhoneNumbers = showDeleted = False
getIsGuestUser = oneLicensePerRow = quotePlusPhoneNumbers = showDeleted = False
aliasMatchPattern = isArchived = isSuspended = orgUnitPath = orgUnitPathLower = orderBy = sortOrder = None
viewType = 'admin_view'
delimiter = GC.Values[GC.CSV_OUTPUT_FIELD_DELIMITER]
@@ -48043,6 +48050,7 @@ def doPrintUsers(entityList=None):
sortRows = False
if orgUnitPath is not None and fieldsList:
fieldsList.append('orgUnitPath')
getIsGuestUser = not fieldsList or 'isGuestUser' in fieldsList
fields = getItemFieldsFromFieldsList('users', fieldsList)
itemCount = 0
for kwargsQuery in makeUserGroupDomainQueryFilters(kwargsDict):
@@ -48111,6 +48119,7 @@ def doPrintUsers(entityList=None):
return
sortRows = True
# If no individual fields were specified (allfields, basic, full) or individual fields other than primaryEmail were specified, look up each user
getIsGuestUser = not fieldsList or 'isGuestUser' in fieldsList
if isSuspended is not None and fieldsList:
fieldsList.append('suspended')
if isArchived is not None and fieldsList: