TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 21:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: change force local mfa on org (#6432)

Browse Source 
* fix: change force local mfa on org

* fix test

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Elio Bischof
2023-08-25 15:17:12 +02:00
committed by GitHub
parent 94d13fd3e1
commit 54508ebd82
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/command/org_policy_login.go
View File

@@ -473,6 +473,7 @@ func prepareChangeLoginPolicy(a *org.Aggregate, policy *ChangeLoginPolicy) prepa
policy.AllowRegister, policy.AllowRegister,
policy.AllowExternalIDP, policy.AllowExternalIDP,
policy.ForceMFA, policy.ForceMFA,
policy.ForceMFALocalOnly,
policy.HidePasswordReset, policy.HidePasswordReset,
policy.IgnoreUnknownUsernames, policy.IgnoreUnknownUsernames,
policy.AllowDomainDiscovery, policy.AllowDomainDiscovery,

4
internal/command/org_policy_login_model.go
View File

@@ -67,6 +67,7 @@ func (wm *OrgLoginPolicyWriteModel) NewChangedEvent(
allowRegister, allowRegister,
allowExternalIDP, allowExternalIDP,
forceMFA, forceMFA,
forceMFALocalOnly,
hidePasswordReset, hidePasswordReset,
ignoreUnknownUsernames, ignoreUnknownUsernames,
allowDomainDiscovery, allowDomainDiscovery,
@@ -94,6 +95,9 @@ func (wm *OrgLoginPolicyWriteModel) NewChangedEvent(
if wm.ForceMFA != forceMFA { if wm.ForceMFA != forceMFA {
changes = append(changes, policy.ChangeForceMFA(forceMFA)) changes = append(changes, policy.ChangeForceMFA(forceMFA))
} }
if wm.ForceMFALocalOnly != forceMFALocalOnly {
changes = append(changes, policy.ChangeForceMFALocalOnly(forceMFALocalOnly))
}
if wm.HidePasswordReset != hidePasswordReset { if wm.HidePasswordReset != hidePasswordReset {
changes = append(changes, policy.ChangeHidePasswordReset(hidePasswordReset)) changes = append(changes, policy.ChangeHidePasswordReset(hidePasswordReset))
} }

4
internal/command/org_policy_login_test.go
View File

@@ -574,6 +574,7 @@ func TestCommandSide_ChangeLoginPolicy(t *testing.T) {
false, false,
false, false,
false, false,
false,
domain.PasswordlessTypeNotAllowed, domain.PasswordlessTypeNotAllowed,
"", "",
&duration10, &duration10,
@@ -2196,7 +2197,7 @@ func TestCommandSide_RemoveMultiFactorLoginPolicy(t *testing.T) {
} }
func newLoginPolicyChangedEvent(ctx context.Context, orgID string, func newLoginPolicyChangedEvent(ctx context.Context, orgID string,
usernamePassword, register, externalIDP, mfa, passwordReset, ignoreUnknownUsernames, allowDomainDiscovery, disableLoginWithEmail, disableLoginWithPhone bool, usernamePassword, register, externalIDP, mfa, mfaLocalOnly, passwordReset, ignoreUnknownUsernames, allowDomainDiscovery, disableLoginWithEmail, disableLoginWithPhone bool,
passwordlessType domain.PasswordlessType, passwordlessType domain.PasswordlessType,
redirectURI string, redirectURI string,
passwordLifetime, externalLoginLifetime, mfaInitSkipLifetime, secondFactorLifetime, multiFactorLifetime *time.Duration) *org.LoginPolicyChangedEvent { passwordLifetime, externalLoginLifetime, mfaInitSkipLifetime, secondFactorLifetime, multiFactorLifetime *time.Duration) *org.LoginPolicyChangedEvent {
@@ -2205,6 +2206,7 @@ func newLoginPolicyChangedEvent(ctx context.Context, orgID string,
policy.ChangeAllowRegister(register), policy.ChangeAllowRegister(register),
policy.ChangeAllowExternalIDP(externalIDP), policy.ChangeAllowExternalIDP(externalIDP),
policy.ChangeForceMFA(mfa), policy.ChangeForceMFA(mfa),
policy.ChangeForceMFALocalOnly(mfaLocalOnly),
policy.ChangeHidePasswordReset(passwordReset), policy.ChangeHidePasswordReset(passwordReset),
policy.ChangeIgnoreUnknownUsernames(ignoreUnknownUsernames), policy.ChangeIgnoreUnknownUsernames(ignoreUnknownUsernames),
policy.ChangeAllowDomainDiscovery(allowDomainDiscovery), policy.ChangeAllowDomainDiscovery(allowDomainDiscovery),