From 96cde882ef89404ca1e8ff3a730e014270f38e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Wed, 29 Jul 2020 00:05:23 +0200
Subject: [PATCH] update auth to the newest version and remove useless dep

---
 Cargo.lock                   | 13 ++++++-------
 client/Cargo.toml            |  2 +-
 common/Cargo.toml            |  2 +-
 server/Cargo.toml            |  2 +-
 voxygen/Cargo.toml           |  1 -
 voxygen/src/menu/main/mod.rs |  2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b3401d012..0862641838 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=223a4097f7ebc8d451936dccb5e6517194bbf086#223a4097f7ebc8d451936dccb5e6517194bbf086"
+source = "git+https://gitlab.com/veloren/auth.git?rev=57784d2135a2c81ff0266f52a528da092ddf89e6#57784d2135a2c81ff0266f52a528da092ddf89e6"
 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=223a4097f7ebc8d451936dccb5e6517194bbf086#223a4097f7ebc8d451936dccb5e6517194bbf086"
+source = "git+https://gitlab.com/veloren/auth.git?rev=57784d2135a2c81ff0266f52a528da092ddf89e6#57784d2135a2c81ff0266f52a528da092ddf89e6"
 dependencies = [
  "auth-common",
  "fxhash",
@@ -500,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "chunked_transfer"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b89647f09b9f4c838cb622799b2843e4e13bff64661dab9a0362bb92985addd"
+checksum = "1d29eb15132782371f71da8f947dba48b3717bdb6fa771b9b434d645e40a7193"
 
 [[package]]
 name = "clang-sys"
@@ -4411,9 +4411,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "1.1.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b777d3fc1e1a5cf8e4675c9016ae748a26ba6a73f4030b9110bb3c8a70499c76"
+checksum = "677df6896edc382f1a2abcbb3e4058edfe973cdc4e1ed764b11891a7a289bfc0"
 dependencies = [
  "base64 0.12.1",
  "chunked_transfer",
@@ -4611,7 +4611,6 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.6.0"
 dependencies = [
- "authc",
  "backtrace",
  "bincode",
  "chrono",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index e9b815a568..02d330e7fc 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 = "223a4097f7ebc8d451936dccb5e6517194bbf086" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "57784d2135a2c81ff0266f52a528da092ddf89e6" }
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 47dd092a67..7cba42f0f3 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 = "223a4097f7ebc8d451936dccb5e6517194bbf086" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "57784d2135a2c81ff0266f52a528da092ddf89e6" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 8d52f0b276..6553cbad2d 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 = "223a4097f7ebc8d451936dccb5e6517194bbf086" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "57784d2135a2c81ff0266f52a528da092ddf89e6" }
 libsqlite3-sys = { version = "0.18", features = ["bundled"] }
 diesel = { version = "1.4.3", features = ["sqlite"] }
 diesel_migrations = "1.4.0"
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 7576819aed..dde2880348 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -68,7 +68,6 @@ chrono = "0.4.9"
 bincode = "1.2"
 deunicode = "1.0"
 uvth = "3.1.1"
-authc = { git = "https://gitlab.com/veloren/auth.git", rev = "223a4097f7ebc8d451936dccb5e6517194bbf086" }
 const-tweaker = { version = "0.3.1", optional = true }
 
 # Logging
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index c73883218d..4d1b9b7b84 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -152,7 +152,7 @@ impl PlayState for MainMenuState {
                                     e
                                 ),
                                 // TODO: remove parentheses
-                                client::AuthClientError::RequestError() => localized_strings
+                                client::AuthClientError::RequestError => localized_strings
                                     .get("main.login.failed_sending_request")
                                     .to_owned(),
                                 client::AuthClientError::ServerError(_, e) => e,