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

Device::save() should return QueryResult instead of bool

src/api/identity.rs

@@ -46,16 +46,17 @@ fn _refresh_login(data: &ConnectData, _device_type: DeviceType, conn: DbConn) ->
     let orgs = UserOrganization::find_by_user(&user.uuid, &conn);
 
     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 {
@@ -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 (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!({
         "access_token": access_token,

src/db/models/device.rs

@@ -112,15 +112,11 @@ use db::schema::devices;
 
 /// Database methods
 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();
 
-        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<()> {