Skip to content

Commit

Permalink
WIP: Fix web-vault issues
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackDex committed Feb 26, 2023
1 parent af6d17b commit ea3fb0e
Show file tree
Hide file tree
Showing 13 changed files with 473 additions and 165 deletions.
145 changes: 76 additions & 69 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Expand Up @@ -3,7 +3,7 @@ name = "vaultwarden"
version = "1.0.0"
authors = ["Daniel García <dani-garcia@users.noreply.github.com>"]
edition = "2021"
rust-version = "1.61.0"
rust-version = "1.63.0"
resolver = "2"

repository = "https://github.com/dani-garcia/vaultwarden"
Expand Down Expand Up @@ -92,7 +92,7 @@ uuid = { version = "1.3.0", features = ["v4"] }
# Date and time libraries
chrono = { version = "0.4.23", features = ["clock", "serde"], default-features = false }
chrono-tz = "0.8.1"
time = "0.3.19"
time = "0.3.20"

# Job scheduler
job_scheduler_ng = "2.0.4"
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
@@ -1 +1 @@
msrv = "1.61.0"
msrv = "1.63.0"
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
1.67.0
1.67.1
3 changes: 3 additions & 0 deletions src/api/core/accounts.rs
Expand Up @@ -841,6 +841,8 @@ async fn _api_key(
headers: Headers,
mut conn: DbConn,
) -> JsonResult {
use crate::util::format_date;

let data: SecretVerificationRequest = data.into_inner().data;
let mut user = headers.user;

Expand All @@ -855,6 +857,7 @@ async fn _api_key(

Ok(Json(json!({
"ApiKey": user.api_key,
"RevisionDate": format_date(&user.updated_at),
"Object": "apiKey",
})))
}
Expand Down

0 comments on commit ea3fb0e

Please sign in to comment.