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

Remove some required values during login, now uses default values

Browse source
This commit is contained in:
Daniel García 2018-12-07 14:32:40 +01:00
commit cb930a0858
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
8 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/api/identity.rs
View file

@ -92,9 +92,9 @@ fn _password_login(data: ConnectData, conn: DbConn, remote: Option<SocketAddr>)
))
}
let device_type: i32 = util::try_parse_string(data.device_type.as_ref()).expect("Invalid type");
let device_id = data.device_identifier.clone().expect("Missing device id");
let device_name = data.device_name.clone().expect("Missing device name");
let device_type = util::try_parse_string(data.device_type.as_ref()).unwrap_or(0);
let device_id = data.device_identifier.clone().unwrap_or_else(|| crate::util::get_uuid());
let device_name = data.device_name.clone().unwrap_or("unknown_device".into());
// Find device or create new
let mut device = match Device::find_by_uuid(&device_id, &conn) {
@ -325,10 +325,7 @@ fn validate_data(data: &ConnectData) -> EmptyResult {
_check_is_some(&data.client_id, "client_id cannot be blank")?;
_check_is_some(&data.password, "password cannot be blank")?;
_check_is_some(&data.scope, "scope cannot be blank")?;
_check_is_some(&data.username, "username cannot be blank")?;
_check_is_some(&data.device_identifier, "device_identifier cannot be blank")?;
_check_is_some(&data.device_name, "device_name cannot be blank")?;
_check_is_some(&data.device_type, "device_type cannot be blank")
_check_is_some(&data.username, "username cannot be blank")
}
}
}