Merge pull request #3427 from stefan0xC/check-if-policies-enabled

check if reset password policy is enabled
pull/3404/head
Daniel García 2 years ago committed by GitHub
commit 3bd4e42fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -309,7 +309,7 @@ impl OrgPolicy {
match OrgPolicy::find_by_org_and_type(org_uuid, OrgPolicyType::ResetPassword, conn).await { match OrgPolicy::find_by_org_and_type(org_uuid, OrgPolicyType::ResetPassword, conn).await {
Some(policy) => match serde_json::from_str::<UpCase<ResetPasswordDataModel>>(&policy.data) { Some(policy) => match serde_json::from_str::<UpCase<ResetPasswordDataModel>>(&policy.data) {
Ok(opts) => { Ok(opts) => {
return opts.data.AutoEnrollEnabled; return policy.enabled && opts.data.AutoEnrollEnabled;
} }
_ => error!("Failed to deserialize ResetPasswordDataModel: {}", policy.data), _ => error!("Failed to deserialize ResetPasswordDataModel: {}", policy.data),
}, },

Loading…
Cancel
Save