saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-07-05 20:14:58 +00:00
Code Activity

Merge remote-tracking branch 'dani/main' into sso-support

Browse source
This commit is contained in:
Timshel 2025-06-02 23:38:32 +02:00
commit ab5cae5341
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/identity.rs
View file

@ -472,7 +472,7 @@ async fn authenticated_response(
// Save to update `device.updated_at` to track usage and toggle new status // Save to update `device.updated_at` to track usage and toggle new status
device.save(conn).await?; device.save(conn).await?;
let mp_policy = master_password_policy(user, conn).await; let master_password_policy = master_password_policy(user, conn).await;
let mut result = json!({ let mut result = json!({
"access_token": auth_tokens.access_token(), "access_token": auth_tokens.access_token(),
@ -486,7 +486,7 @@ async fn authenticated_response(
"KdfParallelism": user.client_kdf_parallelism, "KdfParallelism": user.client_kdf_parallelism,
"ResetMasterPassword": false, // TODO: Same as above "ResetMasterPassword": false, // TODO: Same as above
"ForcePasswordReset": false, "ForcePasswordReset": false,
"MasterPasswordPolicy": mp_policy, "MasterPasswordPolicy": master_password_policy,
"scope": auth_tokens.scope(), "scope": auth_tokens.scope(),
"UserDecryptionOptions": { "UserDecryptionOptions": {
"HasMasterPassword": !user.password_hash.is_empty(), "HasMasterPassword": !user.password_hash.is_empty(),

1
src/api/mod.rs
View file

@ -116,6 +116,7 @@ async fn master_password_policy(user: &User, conn: &DbConn) -> Value {
json!({}) json!({})
}; };
// NOTE: Upstream still uses PascalCase here for `Object`!
mpp_json["Object"] = json!("masterPasswordPolicy"); mpp_json["Object"] = json!("masterPasswordPolicy");
mpp_json mpp_json
} }