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

user suspend/archive time support. #1920

Browse Source
This commit is contained in:
Jay Lee
2026-05-26 16:15:03 +00:00
parent cd8c43a0cc
commit 23ed20a298
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gam/__init__.py
View File

@@ -47013,7 +47013,9 @@ USER_SCALAR_PROPERTY_PRINT_ORDER = [
'ipWhitelisted', 'ipWhitelisted',
'suspended', 'suspended',
'suspensionReason', 'suspensionReason',
'suspensionTime',
'archived', 'archived',
'archivalTime',
'changePasswordAtNextLogin', 'changePasswordAtNextLogin',
'id', 'id',
'customerId', 'customerId',
@@ -47104,7 +47106,7 @@ USER_FIELDS_CHOICE_MAP = {
'agreed2terms': 'agreedToTerms', 'agreed2terms': 'agreedToTerms',
'agreedtoterms': 'agreedToTerms', 'agreedtoterms': 'agreedToTerms',
'aliases': ['aliases', 'nonEditableAliases'], 'aliases': ['aliases', 'nonEditableAliases'],
'archived': 'archived', 'archived': ['archived', 'archivalTime'],
'changepassword': 'changePasswordAtNextLogin', 'changepassword': 'changePasswordAtNextLogin',
'changepasswordatnextlogin': 'changePasswordAtNextLogin', 'changepasswordatnextlogin': 'changePasswordAtNextLogin',
'creationtime': 'creationTime', 'creationtime': 'creationTime',
@@ -47174,7 +47176,7 @@ USER_FIELDS_CHOICE_MAP = {
'ssh': 'sshPublicKeys', 'ssh': 'sshPublicKeys',
'sshkeys': 'sshPublicKeys', 'sshkeys': 'sshPublicKeys',
'sshpublickeys': 'sshPublicKeys', 'sshpublickeys': 'sshPublicKeys',
'suspended': ['suspended', 'suspensionReason'], 'suspended': ['suspended', 'suspensionReason', 'suspensionTime'],
'thumbnailphotourl': 'thumbnailPhotoUrl', 'thumbnailphotourl': 'thumbnailPhotoUrl',
'username': 'primaryEmail', 'username': 'primaryEmail',
'website': 'websites', 'website': 'websites',
@@ -47210,7 +47212,7 @@ USER_MULTI_ATTR_FILTER_CHOICE_MAP = {
INFO_USER_OPTIONS = {'noaliases', 'nobuildingnames', 'nogroups', 'nolicenses', 'nolicences', 'noschemas', 'schemas', 'userview'} INFO_USER_OPTIONS = {'noaliases', 'nobuildingnames', 'nogroups', 'nolicenses', 'nolicences', 'noschemas', 'schemas', 'userview'}
USER_SKIP_OBJECTS = {'thumbnailPhotoEtag'} USER_SKIP_OBJECTS = {'thumbnailPhotoEtag'}
USER_TIME_OBJECTS = {'creationTime', 'deletionTime', 'lastLoginTime'} USER_TIME_OBJECTS = {'creationTime', 'deletionTime', 'lastLoginTime', 'suspensionTime', 'archivalTime'}
def _getUserMultiAttributeFilters(myarg, userMultiAttributeFilters): def _getUserMultiAttributeFilters(myarg, userMultiAttributeFilters):
up = getChoice(USER_MULTI_ATTR_FILTER_CHOICE_MAP, mapChoice=True) up = getChoice(USER_MULTI_ATTR_FILTER_CHOICE_MAP, mapChoice=True)

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

@@ -145,10 +145,14 @@ PROPERTIES = {
{CLASS: PC_BOOLEAN, TITLE: 'IP Whitelisted',}, {CLASS: PC_BOOLEAN, TITLE: 'IP Whitelisted',},
'archived': 'archived':
{CLASS: PC_BOOLEAN, TITLE: 'Is Archived',}, {CLASS: PC_BOOLEAN, TITLE: 'Is Archived',},
'archivalTime':
{CLASS: PC_TIME, TITLE: 'Archival Time',},
'suspended': 'suspended':
{CLASS: PC_BOOLEAN, TITLE: 'Account Suspended',}, {CLASS: PC_BOOLEAN, TITLE: 'Account Suspended',},
'suspensionReason': 'suspensionReason':
{CLASS: PC_STRING, TITLE: 'Suspension Reason',}, {CLASS: PC_STRING, TITLE: 'Suspension Reason',},
'suspensionTime':
{CLASS: PC_TIME, TITLE: 'Suspension Time',},
'changePasswordAtNextLogin': 'changePasswordAtNextLogin':
{CLASS: PC_BOOLEAN, TITLE: 'Must Change Password',}, {CLASS: PC_BOOLEAN, TITLE: 'Must Change Password',},
'recoveryEmail': 'recoveryEmail':