diff --git a/Cargo.lock b/Cargo.lock index 0862641838..b077a3f45a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,7 +222,7 @@ dependencies = [ [[package]] name = "auth-common" version = "0.1.0" -source = "git+https://gitlab.com/veloren/auth.git?rev=57784d2135a2c81ff0266f52a528da092ddf89e6#57784d2135a2c81ff0266f52a528da092ddf89e6" +source = "git+https://gitlab.com/veloren/auth.git?rev=93c5819c502bd912cca6fc2fff9d9817564b1de1#93c5819c502bd912cca6fc2fff9d9817564b1de1" dependencies = [ "rand 0.7.3", "serde", @@ -232,7 +232,7 @@ dependencies = [ [[package]] name = "authc" version = "1.0.0" -source = "git+https://gitlab.com/veloren/auth.git?rev=57784d2135a2c81ff0266f52a528da092ddf89e6#57784d2135a2c81ff0266f52a528da092ddf89e6" +source = "git+https://gitlab.com/veloren/auth.git?rev=93c5819c502bd912cca6fc2fff9d9817564b1de1#93c5819c502bd912cca6fc2fff9d9817564b1de1" dependencies = [ "auth-common", "fxhash", diff --git a/client/Cargo.toml b/client/Cargo.toml index 02d330e7fc..ea29d3e3ef 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -19,4 +19,4 @@ tracing = { version = "0.1", default-features = false } specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" } vek = { version = "0.11.0", features = ["serde"] } hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "57784d2135a2c81ff0266f52a528da092ddf89e6" } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "93c5819c502bd912cca6fc2fff9d9817564b1de1" } diff --git a/common/Cargo.toml b/common/Cargo.toml index 7cba42f0f3..ffef770198 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -29,7 +29,7 @@ crossbeam = "0.7" notify = "5.0.0-pre.3" indexmap = "1.3.0" sum_type = "0.2.0" -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "57784d2135a2c81ff0266f52a528da092ddf89e6" } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "93c5819c502bd912cca6fc2fff9d9817564b1de1" } [dev-dependencies] criterion = "0.3" diff --git a/server/Cargo.toml b/server/Cargo.toml index 6553cbad2d..451b1916ff 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -34,7 +34,7 @@ crossbeam = "0.7.2" prometheus = { version = "0.9", default-features = false} tiny_http = "0.7.0" portpicker = { git = "https://github.com/xMAC94x/portpicker-rs" } -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "57784d2135a2c81ff0266f52a528da092ddf89e6" } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "93c5819c502bd912cca6fc2fff9d9817564b1de1" } libsqlite3-sys = { version = "0.18", features = ["bundled"] } diesel = { version = "1.4.3", features = ["sqlite"] } diesel_migrations = "1.4.0" diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs index 4d1b9b7b84..2366e82e45 100644 --- a/voxygen/src/menu/main/mod.rs +++ b/voxygen/src/menu/main/mod.rs @@ -152,9 +152,11 @@ impl PlayState for MainMenuState { e ), // TODO: remove parentheses - client::AuthClientError::RequestError => localized_strings - .get("main.login.failed_sending_request") - .to_owned(), + client::AuthClientError::RequestError(e) => format!( + "{}: {}", + localized_strings.get("main.login.failed_sending_request"), + e + ), client::AuthClientError::ServerError(_, e) => e, }, },