1
0
Fork 0

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:
Nick Slowinski 2023-04-10 14:46:03 +02:00 committet von Nicks Git-Service
Commit 2c1522ed88
Signiert von: Nicks Git-Service
GPG-Schlüssel-ID: 71E74D538F99C01A

Datei anzeigen

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