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

Set flag to honor admin console conflict account resolution setting by default

Browse Source
This commit is contained in:
Jay Lee
2023-08-17 12:24:40 +00:00
parent 09581ae654
commit f1229fe8ce
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gam/__init__.py
View File

@@ -39940,6 +39940,7 @@ def getUserAttributes(cd, updateCmd, noUid=False):
addGroups = {} addGroups = {}
addAliases = [] addAliases = []
PwdOpts = PasswordOptions(updateCmd) PwdOpts = PasswordOptions(updateCmd)
resolveConflictAccount = True
while Cmd.ArgumentsRemaining(): while Cmd.ArgumentsRemaining():
myarg = getArgument() myarg = getArgument()
if myarg == 'notify': if myarg == 'notify':
@@ -39967,6 +39968,8 @@ def getUserAttributes(cd, updateCmd, noUid=False):
unknownArgumentExit() unknownArgumentExit()
elif myarg == 'verifynotinvitable': elif myarg == 'verifynotinvitable':
parameters['verifyNotInvitable'] = True parameters['verifyNotInvitable'] = True
elif myarg == 'alwaysevict':
resolveConflictAccount = False
elif updateCmd and myarg == 'createifnotfound': elif updateCmd and myarg == 'createifnotfound':
parameters['createIfNotFound'] = True parameters['createIfNotFound'] = True
elif updateCmd and myarg == 'noactionifalias': elif updateCmd and myarg == 'noactionifalias':
@@ -40340,7 +40343,9 @@ def getUserAttributes(cd, updateCmd, noUid=False):
unknownArgumentExit() unknownArgumentExit()
if not PwdOpts.makeUniqueRandomPassword: if not PwdOpts.makeUniqueRandomPassword:
PwdOpts.AssignPassword(body, notify, notFoundBody, parameters['createIfNotFound']) PwdOpts.AssignPassword(body, notify, notFoundBody, parameters['createIfNotFound'])
return (body, notify, tagReplacements, addGroups, addAliases, PwdOpts, updatePrimaryEmail, notFoundBody, groupOrgUnitMap, parameters) return (body, notify, tagReplacements, addGroups, addAliases, PwdOpts,
updatePrimaryEmail, notFoundBody, groupOrgUnitMap, parameters,
resolveConflictAccount)
def createUserAddToGroups(cd, user, addGroups, i, count): def createUserAddToGroups(cd, user, addGroups, i, count):
action = Act.Get() action = Act.Get()
@@ -40374,7 +40379,10 @@ def createUserAddAliases(cd, user, aliasList, i, count):
# [addnumericsuffixonduplicate <Number>] # [addnumericsuffixonduplicate <Number>]
def doCreateUser(): def doCreateUser():
cd = buildGAPIObject(API.DIRECTORY) cd = buildGAPIObject(API.DIRECTORY)
body, notify, tagReplacements, addGroups, addAliases, PwdOpts, _, _, _, parameters = getUserAttributes(cd, False, noUid=True) body, notify, tagReplacements, addGroups, addAliases, PwdOpts, _, _, _, \
parameters, resolveConflictAccount = getUserAttributes(cd,
False,
noUid=True)
suffix = 0 suffix = 0
originalEmail = body['primaryEmail'] originalEmail = body['primaryEmail']
atLoc = originalEmail.find('@') atLoc = originalEmail.find('@')
@@ -40392,7 +40400,9 @@ def doCreateUser():
GAPI.DOMAIN_CANNOT_USE_APIS, GAPI.FORBIDDEN, GAPI.DOMAIN_CANNOT_USE_APIS, GAPI.FORBIDDEN,
GAPI.INVALID, GAPI.INVALID_INPUT, GAPI.INVALID_PARAMETER, GAPI.INVALID, GAPI.INVALID_INPUT, GAPI.INVALID_PARAMETER,
GAPI.INVALID_ORGUNIT, GAPI.INVALID_SCHEMA_VALUE], GAPI.INVALID_ORGUNIT, GAPI.INVALID_SCHEMA_VALUE],
body=body, fields=fields) body=body,
fields=fields,
resolveConflictAccount=resolveConflictAccount)
entityActionPerformed([Ent.USER, user]) entityActionPerformed([Ent.USER, user])
break break
except GAPI.duplicate: except GAPI.duplicate:
@@ -40471,7 +40481,9 @@ def verifyUserPrimaryEmail(cd, user, createIfNotFound, i, count):
def updateUsers(entityList): def updateUsers(entityList):
cd = buildGAPIObject(API.DIRECTORY) cd = buildGAPIObject(API.DIRECTORY)
ci = None ci = None
body, notify, tagReplacements, addGroups, addAliases, PwdOpts, updatePrimaryEmail, notFoundBody, groupOrgUnitMap, parameters = getUserAttributes(cd, True) body, notify, tagReplacements, addGroups, addAliases, PwdOpts, \
updatePrimaryEmail, notFoundBody, groupOrgUnitMap, parameters, \
_ = getUserAttributes(cd, True)
vfe = 'primaryEmail' in body and body['primaryEmail'][:4].lower() == 'vfe@' vfe = 'primaryEmail' in body and body['primaryEmail'][:4].lower() == 'vfe@'
if body.get('orgUnitPath', '') and parameters['immutableOUs']: if body.get('orgUnitPath', '') and parameters['immutableOUs']:
ubody = body.copy() ubody = body.copy()