mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-25 14:25:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #217 from janost/refactor-device-save

Browse source 
Device::save() should return QueryResult instead of bool
This commit is contained in:
Daniel García 2018-10-14 17:35:59 +02:00 committed by GitHub
commit faec050a6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/api/identity.rs
View file

@ -46,16 +46,17 @@ fn _refresh_login(data: &ConnectData, _device_type: DeviceType, conn: DbConn) ->
let orgs = UserOrganization::find_by_user(&user.uuid, &conn); let orgs = UserOrganization::find_by_user(&user.uuid, &conn);
let (access_token, expires_in) = device.refresh_tokens(&user, orgs); let (access_token, expires_in) = device.refresh_tokens(&user, orgs);
device.save(&conn); match device.save(&conn) {
Ok(()) => Ok(Json(json!({
Ok(Json(json!({ "access_token": access_token,
"access_token": access_token, "expires_in": expires_in,
"expires_in": expires_in, "token_type": "Bearer",
"token_type": "Bearer", "refresh_token": device.refresh_token,
"refresh_token": device.refresh_token, "Key": user.key,
"Key": user.key, "PrivateKey": user.private_key,
"PrivateKey": user.private_key, }))),
}))) Err(_) => err!("Failed to add device to user")
}
} }
fn _password_login(data: &ConnectData, device_type: DeviceType, conn: DbConn, remote: Option<SocketAddr>) -> JsonResult { fn _password_login(data: &ConnectData, device_type: DeviceType, conn: DbConn, remote: Option<SocketAddr>) -> JsonResult {
@ -128,7 +129,9 @@ fn _password_login(data: &ConnectData, device_type: DeviceType, conn: DbConn, re
let orgs = UserOrganization::find_by_user(&user.uuid, &conn); let orgs = UserOrganization::find_by_user(&user.uuid, &conn);
let (access_token, expires_in) = device.refresh_tokens(&user, orgs); let (access_token, expires_in) = device.refresh_tokens(&user, orgs);
device.save(&conn); if device.save(&conn).is_err() {
err!("Failed to add device to user")
}
let mut result = json!({ let mut result = json!({
"access_token": access_token, "access_token": access_token,

10
src/db/models/device.rs
View file

@ -112,15 +112,11 @@ use db::schema::devices;
/// Database methods /// Database methods
impl Device { impl Device {
pub fn save(&mut self, conn: &DbConn) -> bool { pub fn save(&mut self, conn: &DbConn) -> QueryResult<()> {
self.updated_at = Utc::now().naive_utc(); self.updated_at = Utc::now().naive_utc();
match diesel::replace_into(devices::table) diesel::replace_into(devices::table)
.values(&*self) .values(&*self).execute(&**conn).and(Ok(()))
.execute(&**conn) {
Ok(1) => true, // One row inserted
_ => false,
}
} }
pub fn delete(self, conn: &DbConn) -> QueryResult<()> { pub fn delete(self, conn: &DbConn) -> QueryResult<()> {