geforkt von mirrored/vaultwarden
Merge pull request 'update from upstream' (#1) from mirrored/vaultwarden:main into main
Reviewed-on: https://git.nick-slowinski.de/NickSlowinski/vaultwarden-test/pulls/1
Dieser Commit ist enthalten in:
Commit
2c1522ed88
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
|
@ -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),
|
||||||
},
|
},
|
||||||
|
|
Laden …
In neuem Issue referenzieren