From 273068c362068423a787d9b12aa1f6a1d756ccee Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 30 Mar 2019 09:33:18 -0700
Subject: [PATCH] use jsonwebtoken repo as temp solution to ring dep

---
 .travis.yml                   | 35 +----------------------------------
 Cargo.toml                    |  2 +-
 simple-auth-server/Cargo.toml |  2 +-
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8050c10d..25f7f0ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,37 +33,4 @@ before_script:
   - export PATH=$PATH:~/.cargo/bin
 
 script:
-  - |
-      cd async_db && cargo check && cd ..
-      cd async_ex1 && cargo check && cd ..
-      cd actix_redis && cargo check && cd ..
-      cd actix_todo && cargo check && cd ..
-      cd basics && cargo check && cd ..
-      cd cookie-auth && cargo check && cd ..
-      cd cookie-session && cargo check && cd ..
-      cd diesel && cargo check && cd ..
-      cd error_handling && cargo check && cd ..
-      cd form && cargo check && cd ..
-      cd hello-world && cargo check && cd ..
-      cd http-proxy && cargo check && cd ..
-      cd http-full-proxy && cargo check && cd ..
-      cd json && cargo check && cd ..
-      cd juniper && cargo check && cd ..
-      cd middleware && cargo check && cd ..
-      cd multipart && cargo check && cd ..
-      cd protobuf && cargo check && cd ..
-      cd r2d2 && cargo check && cd ..
-      cd redis-session && cargo check && cd ..
-      cd state && cargo check && cd ..
-      cd static_index && cargo check && cd ..
-      cd template_askama && cargo check && cd ..
-      cd template_tera && cargo check && cd ..
-      cd template_yarte && cargo check && cd ..
-      cd tls && cargo check && cd ..
-      cd rustls && cargo check && cd ..
-      cd unix-socket && cargo check && cd ..
-      cd web-cors/backend && cargo check && cd ../..
-      cd websocket && cargo check && cd ..
-      cd websocket-chat && cargo check && cd ..
-      cd websocket-chat-broker && cargo check && cd ..
-      cd websocket-tcp-chat && cargo check && cd ..
+  - cargo check --all
diff --git a/Cargo.toml b/Cargo.toml
index 2e79a031..9ff86387 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ members = [
   "r2d2",
   "redis-session",
   "rustls",
-  #"simple-auth-server",
+  "simple-auth-server",
   "state",
   "static_index",
   "template_askama",
diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml
index 176cdad6..07a3c8d7 100644
--- a/simple-auth-server/Cargo.toml
+++ b/simple-auth-server/Cargo.toml
@@ -17,7 +17,7 @@ diesel = { version = "1.3.3", features = ["postgres", "uuid", "r2d2", "chrono"]
 dotenv = "0.13.0"
 derive_more = "0.14"
 env_logger = "0.6.0"
-jsonwebtoken = "5.0"
+jsonwebtoken = { git = "https://github.com/Keats/jsonwebtoken.git", branch = "next" }
 futures = "0.1.25"
 r2d2 = "0.8.3"
 serde_derive="1.0.80"