vw_small

commit 16056626b0d34087b75e75470b3c8a6975faef55
parent 626a3c93ba21862e35cc6b01ebd8a076dc14ec82
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Mon, 13 Aug 2018 14:38:30 +0200

Merge pull request #131 from mprasil/revision_date

Implement update_revision trigger
Diffstat:
M
src/api/core/ciphers.rs
 | 
6
+++++-
M
src/db/models/user.rs
 | 
10
++++++++++

2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -244,7 +244,11 @@ fn post_ciphers_import(data: JsonUpcase<ImportData>, headers: Headers, conn: DbC
         cipher.move_to_folder(folder_uuid, &headers.user.uuid.clone(), &conn).ok();
     }
 
-    Ok(())
+    let mut user = headers.user;
+    match user.update_revision(&conn) {
+        Ok(()) => Ok(()),
+        Err(_) => err!("Failed to update the revision, please log out and log back in to finish import.")
+    }
 }
 
 #[post("/ciphers/<uuid>/admin", data = "<data>")]
diff --git a/src/db/models/user.rs b/src/db/models/user.rs
@@ -154,6 +154,16 @@ impl User {
         }
     }
 
+    pub fn update_revision(&mut self, conn: &DbConn) -> QueryResult<()> {
+        diesel::update(
+            users::table.filter(
+                users::uuid.eq(&self.uuid)
+            )
+        )
+        .set(users::updated_at.eq(Utc::now().naive_utc()))
+        .execute(&**conn).and(Ok(()))
+    }
+
     pub fn find_by_mail(mail: &str, conn: &DbConn) -> Option<Self> {
         let lower_mail = mail.to_lowercase();
         users::table