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

Updated to latest and greatest auth version.

Browse Source
This commit is contained in:
Acrimon 2020-01-01 19:41:42 +01:00 committed by Marcel Märtens
parent 50b845d1c3
commit 584dcddba9
4 changed files with 496 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

810
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
server/Cargo.toml
View File

@ -31,4 +31,4 @@ prometheus = "0.7"
prometheus-static-metric = "0.2" prometheus-static-metric = "0.2"
rouille = "3.0.0" rouille = "3.0.0"
portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" } portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
authc = { git = "https://gitlab.com/veloren/auth.git" } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }

2
voxygen/Cargo.toml
View File

@ -64,7 +64,7 @@ rust-argon2 = "0.5"
bincode = "1.2" bincode = "1.2"
deunicode = "1.0" deunicode = "1.0"
uvth = "3.1.1" uvth = "3.1.1"
authc = { git = "https://gitlab.com/veloren/auth.git" } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "7c1abde83f0ea7d83b0e7c655fac82eb9bb3d7ad" }
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
dispatch = "0.1.4" dispatch = "0.1.4"

6
voxygen/src/menu/main/client_init.rs
View File

@ -80,11 +80,7 @@ impl ClientInit {
&player.alias, &player.alias,
&password &password
); );
match auth_client.sign_in( match auth_client.sign_in(&player.alias, &password) {
&player.alias,
&password,
socket_addr.ip(),
) {
Ok(token) => token.serialize(), Ok(token) => token.serialize(),
// TODO: Properly deal with it // TODO: Properly deal with it
Err(e) => panic!( Err(e) => panic!(