saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-08 12:04:10 +00:00
Code Activity

Merge remote-tracking branch 'origin/master' into fmt

Browse source
This commit is contained in:
Jake Howard 2021-04-06 21:55:28 +01:00
commit 994669fb69
No known key found for this signature in database
GPG key ID: 57AFB45680EDD477
25 changed files with 326 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/identity.rs
View file

@ -72,7 +72,8 @@ fn _refresh_login(data: ConnectData, conn: DbConn) -> JsonResult {
"Kdf": user.client_kdf_type,
"KdfIterations": user.client_kdf_iter,
"ResetMasterPassword": false, // TODO: according to official server seems something like: user.password_hash.is_empty(), but would need testing
"scope": "api offline_access"
"scope": "api offline_access",
"unofficialServer": true,
})))
}
@ -163,7 +164,8 @@ fn _password_login(data: ConnectData, conn: DbConn, ip: &ClientIp) -> JsonResult
"Kdf": user.client_kdf_type,
"KdfIterations": user.client_kdf_iter,
"ResetMasterPassword": false,// TODO: Same as above
"scope": "api offline_access"
"scope": "api offline_access",
"unofficialServer": true,
});
if let Some(token) = twofactor_token {