Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

update auth to newest version

Browse Source
This commit is contained in:
Marcel Märtens 2020-07-29 19:28:22 +02:00
parent 9f53a4a19f
commit 0d5e61c4b6
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -222,7 +222,7 @@ dependencies = [
[[package]] [[package]]
name = "auth-common" name = "auth-common"
version = "0.1.0" 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 = [ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"serde", "serde",
@ -232,7 +232,7 @@ dependencies = [
[[package]] [[package]]
name = "authc" name = "authc"
version = "1.0.0" 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 = [ dependencies = [
"auth-common", "auth-common",
"fxhash", "fxhash",

2
client/Cargo.toml
View File

@ -19,4 +19,4 @@ tracing = { version = "0.1", default-features = false }
specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" } specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
vek = { version = "0.11.0", features = ["serde"] } vek = { version = "0.11.0", features = ["serde"] }
hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } 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" }

2
common/Cargo.toml
View File

@ -29,7 +29,7 @@ crossbeam = "0.7"
notify = "5.0.0-pre.3" notify = "5.0.0-pre.3"
indexmap = "1.3.0" indexmap = "1.3.0"
sum_type = "0.2.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] [dev-dependencies]
criterion = "0.3" criterion = "0.3"

2
server/Cargo.toml
View File

@ -34,7 +34,7 @@ crossbeam = "0.7.2"
prometheus = { version = "0.9", default-features = false} prometheus = { version = "0.9", default-features = false}
tiny_http = "0.7.0" tiny_http = "0.7.0"
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs" } 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"] } libsqlite3-sys = { version = "0.18", features = ["bundled"] }
diesel = { version = "1.4.3", features = ["sqlite"] } diesel = { version = "1.4.3", features = ["sqlite"] }
diesel_migrations = "1.4.0" diesel_migrations = "1.4.0"

8
voxygen/src/menu/main/mod.rs
View File

@ -152,9 +152,11 @@ impl PlayState for MainMenuState {
e e
), ),
// TODO: remove parentheses // TODO: remove parentheses
client::AuthClientError::RequestError => localized_strings client::AuthClientError::RequestError(e) => format!(
.get("main.login.failed_sending_request") "{}: {}",
.to_owned(), localized_strings.get("main.login.failed_sending_request"),
e
),
client::AuthClientError::ServerError(_, e) => e, client::AuthClientError::ServerError(_, e) => e,
}, },
}, },