Browse Source
Merge pull request #131 from mprasil/revision_date
Implement update_revision trigger
pull/134/head
Daniel García
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
15 additions and
1 deletions
-
src/api/core/ciphers.rs
-
src/db/models/user.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>")] |
|
|
|
|
|
@ -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 |
|
|
|