From dd929ad1ca2cb2718a633cc5bdc58770996c8425 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Wed, 24 Aug 2022 22:48:43 +0200
Subject: [PATCH] reverted poem-openapi upgrade

---
 Cargo.lock                        | 36 ++++++++++---------------------
 warpgate-admin/Cargo.toml         |  2 +-
 warpgate-common/Cargo.toml        |  2 +-
 warpgate-db-entities/Cargo.toml   |  2 +-
 warpgate-protocol-http/Cargo.toml |  2 +-
 5 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4a44b59..67da65f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,6 +7,10 @@ name = "Inflector"
 version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
 
 [[package]]
 name = "addr2line"
@@ -2770,9 +2774,9 @@ dependencies = [
 
 [[package]]
 name = "poem-openapi"
-version = "2.0.10"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4d9252b377035ab2ef8d88020d0484f80892ec6325028af9e4c5839a0656b7"
+checksum = "6410fb35798b39e6f4d31dbe208b32238f35a3e322b44a1b58770d4c4b974f3a"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.2.1",
@@ -2787,7 +2791,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "serde_yaml 0.9.10",
+ "serde_yaml",
  "thiserror",
  "tokio",
  "uuid",
@@ -2795,10 +2799,11 @@ dependencies = [
 
 [[package]]
 name = "poem-openapi-derive"
-version = "2.0.10"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5a965be0296fa454602ca8f7a5422e91f5b24d42bfadc1117b17e132892cd7f"
+checksum = "585839bf881890f4051727168dfec9286e900679957de36aff9cb32ea55f9d12"
 dependencies = [
+ "Inflector",
  "darling",
  "http",
  "indexmap",
@@ -3689,19 +3694,6 @@ dependencies = [
  "yaml-rust",
 ]
 
-[[package]]
-name = "serde_yaml"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.10.0"
@@ -4507,12 +4499,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0"
-
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -4630,7 +4616,7 @@ dependencies = [
  "qrcode",
  "rcgen",
  "sd-notify",
- "serde_yaml 0.8.25",
+ "serde_yaml",
  "time 0.3.11",
  "tokio",
  "tracing",
diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml
index d32383e..09be2cb 100644
--- a/warpgate-admin/Cargo.toml
+++ b/warpgate-admin/Cargo.toml
@@ -18,7 +18,7 @@ poem = { version = "^1.3.40", features = [
     "anyhow",
     "websocket",
 ] }
-poem-openapi = { version = "^2.0.10", features = [
+poem-openapi = { version = "^2.0.4", features = [
     "swagger-ui",
     "chrono",
     "uuid",
diff --git a/warpgate-common/Cargo.toml b/warpgate-common/Cargo.toml
index d59301f..6f2f427 100644
--- a/warpgate-common/Cargo.toml
+++ b/warpgate-common/Cargo.toml
@@ -18,7 +18,7 @@ once_cell = "1.13"
 packet = "0.1"
 password-hash = "0.4"
 poem = { version = "^1.3.40", features = ["rustls"] }
-poem-openapi = { version = "^2.0.10", features = [
+poem-openapi = { version = "^2.0.6", features = [
     "swagger-ui",
     "chrono",
     "uuid",
diff --git a/warpgate-db-entities/Cargo.toml b/warpgate-db-entities/Cargo.toml
index bace7ab..053926e 100644
--- a/warpgate-db-entities/Cargo.toml
+++ b/warpgate-db-entities/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.5.0"
 
 [dependencies]
 chrono = {version = "0.4", features = ["serde"]}
-poem-openapi = {version = "^2.0.10", features = ["chrono", "uuid"]}
+poem-openapi = {version = "^2.0.6", features = ["chrono", "uuid"]}
 sea-orm = {version = "^0.9", features = ["macros", "with-chrono", "with-uuid", "with-json"], default-features = false}
 serde = "1.0"
 serde_json = "1.0"
diff --git a/warpgate-protocol-http/Cargo.toml b/warpgate-protocol-http/Cargo.toml
index 9f97326..b33029c 100644
--- a/warpgate-protocol-http/Cargo.toml
+++ b/warpgate-protocol-http/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3"
 http = "0.2"
 lazy_static = "1.4"
 poem = {version = "^1.3.40", features = ["cookie", "session", "anyhow", "rustls", "websocket", "sse", "embed"]}
-poem-openapi = {version = "^2.0.10", features = ["swagger-ui"]}
+poem-openapi = {version = "^2.0.6", features = ["swagger-ui"]}
 reqwest = {version = "0.11", features = ["rustls-tls-native-roots", "stream"]}
 serde = "1.0"
 serde_json = "1.0"