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

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

62
src/gam/gamlib/glclargs.py
View File

@@ -114,6 +114,14 @@ class GamCLArgs():
ENTITY_USERS_NA_NS = 'users_na_ns'
ENTITY_USERS_ARCH_OR_SUSP = 'users_arch_or_susp'
ENTITY_USERS_NS_SUSP = 'users_ns_susp'
ENTITY_USERS_AND_GUESTS = 'users_and_guests'
ENTITY_USERS_AND_GUESTS_NS = 'users_and_guests_ns'
ENTITY_USERS_AND_GUESTS_SUSP = 'users_and_guests_susp'
ENTITY_USERS_AND_GUESTS_NS_SUSP = 'users_and_guests_ns_susp'
ENTITY_GUESTS = 'guests'
ENTITY_GUESTS_NS = 'guests_ns'
ENTITY_GUESTS_SUSP = 'guests_susp'
ENTITY_GUESTS_NS_SUSP = 'guests_ns_susp'
#
BROWSER_ENTITIES = [
ENTITY_BROWSER,
@@ -398,6 +406,14 @@ class GamCLArgs():
ENTITY_USERS_ARCH_OR_SUSP,
ENTITY_USERS_NA_NS,
ENTITY_USERS_NS_SUSP,
ENTITY_USERS_AND_GUESTS,
ENTITY_USERS_AND_GUESTS_NS,
ENTITY_USERS_AND_GUESTS_SUSP,
ENTITY_USERS_AND_GUESTS_NS_SUSP,
ENTITY_GUESTS,
ENTITY_GUESTS_NS,
ENTITY_GUESTS_SUSP,
ENTITY_GUESTS_NS_SUSP,
]
#
ENTITY_ALL_CROS = ENTITY_SELECTOR_ALL+' '+ENTITY_CROS
@@ -409,6 +425,14 @@ class GamCLArgs():
ENTITY_ALL_USERS_NA_NS = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_NA_NS
ENTITY_ALL_USERS_ARCH_OR_SUSP = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_ARCH_OR_SUSP
ENTITY_ALL_USERS_NS_SUSP = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_NS_SUSP
ENTITY_ALL_USERS_AND_GUESTS = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_AND_GUESTS
ENTITY_ALL_USERS_AND_GUESTS_NS = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_AND_GUESTS_NS
ENTITY_ALL_USERS_AND_GUESTS_SUSP = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_AND_GUESTS_SUSP
ENTITY_ALL_USERS_AND_GUESTS_NS_SUSP = ENTITY_SELECTOR_ALL+' '+ENTITY_USERS_AND_GUESTS_NS_SUSP
ENTITY_ALL_GUESTS = ENTITY_SELECTOR_ALL+' '+ENTITY_GUESTS
ENTITY_ALL_GUESTS_NS = ENTITY_SELECTOR_ALL+' '+ENTITY_GUESTS_NS
ENTITY_ALL_GUESTS_SUSP = ENTITY_SELECTOR_ALL+' '+ENTITY_GUESTS_SUSP
ENTITY_ALL_GUESTS_NS_SUSP = ENTITY_SELECTOR_ALL+' '+ENTITY_GUESTS_NS_SUSP
#
ALL_USER_ENTITY_TYPES = {
ENTITY_ALL_USERS,
@@ -418,6 +442,14 @@ class GamCLArgs():
ENTITY_ALL_USERS_SUSP,
ENTITY_ALL_USERS_NA_NS,
ENTITY_ALL_USERS_NS_SUSP,
ENTITY_ALL_USERS_AND_GUESTS,
ENTITY_ALL_USERS_AND_GUESTS_NS,
ENTITY_ALL_USERS_AND_GUESTS_SUSP,
ENTITY_ALL_USERS_AND_GUESTS_NS_SUSP,
ENTITY_ALL_GUESTS,
ENTITY_ALL_GUESTS_NS,
ENTITY_ALL_GUESTS_SUSP,
ENTITY_ALL_GUESTS_NS_SUSP,
}
DOMAIN_ENTITY_TYPES = {
ENTITY_DOMAINS,
@@ -534,13 +566,21 @@ class GamCLArgs():
}
#
ALL_USERS_QUERY_MAP = {
ENTITY_ALL_USERS: 'isSuspended=False',
ENTITY_ALL_USERS_NA: 'isArchived=False',
ENTITY_ALL_USERS_ARCH: 'isArchived=True',
ENTITY_ALL_USERS_NS: 'isSuspended=False',
ENTITY_ALL_USERS_SUSP: 'isSuspended=True',
ENTITY_ALL_USERS_NA_NS: 'isArchived=False isSuspended=False',
ENTITY_ALL_USERS_NS_SUSP: None,
ENTITY_ALL_USERS: 'isSuspended=False isGuest=False',
ENTITY_ALL_USERS_NA: 'isArchived=False isGuest=False',
ENTITY_ALL_USERS_ARCH: 'isArchived=True isGuest=False',
ENTITY_ALL_USERS_NS: 'isSuspended=False isGuest=False',
ENTITY_ALL_USERS_SUSP: 'isSuspended=True isGuest=False',
ENTITY_ALL_USERS_NA_NS: 'isArchived=False isSuspended=False isGuest=False',
ENTITY_ALL_USERS_NS_SUSP: 'isGuest=False',
ENTITY_ALL_USERS_AND_GUESTS: 'isSuspended=False',
ENTITY_ALL_USERS_AND_GUESTS_NS: 'isSuspended=False',
ENTITY_ALL_USERS_AND_GUESTS_SUSP: 'isSuspended=True',
ENTITY_ALL_USERS_AND_GUESTS_NS_SUSP: None,
ENTITY_ALL_GUESTS: 'isSuspended=False isGuest=True',
ENTITY_ALL_GUESTS_NS: 'isSuspended=False isGuest=True',
ENTITY_ALL_GUESTS_SUSP: 'isSuspended=True isGuest=True',
ENTITY_ALL_GUESTS_NS_SUSP: 'isGuest=True',
}
DOMAINS_QUERY_MAP = {
ENTITY_DOMAINS: None,
@@ -602,6 +642,14 @@ class GamCLArgs():
ENTITY_USERS_NA_NS: ENTITY_ALL_USERS_NA_NS,
ENTITY_USERS_ARCH_OR_SUSP: ENTITY_ALL_USERS_ARCH_OR_SUSP,
ENTITY_USERS_NS_SUSP: ENTITY_ALL_USERS_NS_SUSP,
ENTITY_USERS_AND_GUESTS: ENTITY_ALL_USERS_AND_GUESTS,
ENTITY_USERS_AND_GUESTS_NS: ENTITY_ALL_USERS_AND_GUESTS_NS,
ENTITY_USERS_AND_GUESTS_SUSP: ENTITY_ALL_USERS_AND_GUESTS_SUSP,
ENTITY_USERS_AND_GUESTS_NS_SUSP: ENTITY_ALL_USERS_AND_GUESTS_NS_SUSP,
ENTITY_GUESTS: ENTITY_ALL_GUESTS,
ENTITY_GUESTS_NS: ENTITY_ALL_GUESTS_NS,
ENTITY_GUESTS_SUSP: ENTITY_ALL_GUESTS_SUSP,
ENTITY_GUESTS_NS_SUSP: ENTITY_ALL_GUESTS_NS_SUSP,
}
# Allowed values for CL source selector datafile, csvkmd
CROS_ENTITY_SELECTOR_DATAFILE_CSVKMD_SUBTYPES = [

4
src/gam/gamlib/gluprop.py
View File

@@ -117,6 +117,8 @@ PROPERTIES = {
{CLASS: PC_STRING, TITLE: 'Full Name',},
'displayName':
{CLASS: PC_STRING, TITLE: 'Display Name',},
'primaryGuestEmail':
{CLASS: PC_STRING, TITLE: 'Primary Guest Email',},
'languages':
{CLASS: PC_LANGUAGES, TITLE: 'Languages',},
'languageCode':
@@ -131,6 +133,8 @@ PROPERTIES = {
{CLASS: PC_BOOLEAN, TITLE: 'Is a Super Admin',},
'isDelegatedAdmin':
{CLASS: PC_BOOLEAN, TITLE: 'Is Delegated Admin',},
'isGuestUser':
{CLASS: PC_BOOLEAN, TITLE: 'Is a Guest User',},
'isEnrolledIn2Sv':
{CLASS: PC_BOOLEAN, TITLE: '2-step enrolled',},
'isEnforcedIn2Sv':