From 48f535afa1cef12a7b85d91609ce2ddb83eb68a6 Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Thu, 8 Dec 2022 08:11:49 +0100 Subject: [PATCH] fix: remove domain and user correctly in DomainPolicyUsernamesWriteModel (#4850) fix: remove Domain and User correctly in DomainPolicyUsernamesWriteModel --- internal/command/policy_org_model.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/command/policy_org_model.go b/internal/command/policy_org_model.go index 71b4a4015c..cc0c8bcd6f 100644 --- a/internal/command/policy_org_model.go +++ b/internal/command/policy_org_model.go @@ -109,23 +109,23 @@ func (wm *DomainPolicyUsernamesWriteModel) Reduce() error { func (wm *DomainPolicyUsernamesWriteModel) removeDomain(domain string) { for i, verifiedDomain := range wm.VerifiedDomains { - if verifiedDomain != domain { - continue + if verifiedDomain == domain { + wm.VerifiedDomains[i] = wm.VerifiedDomains[len(wm.VerifiedDomains)-1] + wm.VerifiedDomains[len(wm.VerifiedDomains)-1] = "" + wm.VerifiedDomains = wm.VerifiedDomains[:len(wm.VerifiedDomains)-1] + return } - wm.VerifiedDomains[i] = wm.VerifiedDomains[len(wm.VerifiedDomains)-1] - wm.VerifiedDomains[len(wm.VerifiedDomains)-1] = "" - wm.VerifiedDomains = wm.VerifiedDomains[:len(wm.VerifiedDomains)-1] } } func (wm *DomainPolicyUsernamesWriteModel) removeUser(userID string) { for i, user := range wm.Users { - if user.id != userID { - continue + if user.id == userID { + wm.Users[i] = wm.Users[len(wm.Users)-1] + wm.Users[len(wm.Users)-1] = nil + wm.Users = wm.Users[:len(wm.Users)-1] + return } - wm.Users[i] = wm.Users[len(wm.Users)-1] - wm.Users[len(wm.Users)-1] = nil - wm.Users = wm.Users[len(wm.Users)-1:] } }