From bb1f1e4a3e911f65dc05c2f0f83ccb004a7505fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Wo=C5=BAniak?= <adrian.wozniak@ita-prog.pl>
Date: Fri, 11 Aug 2023 15:52:51 +0200
Subject: [PATCH] Using

---
 Cargo.lock                        | 2 ++
 crates/oswilno-server/Cargo.toml  | 1 +
 crates/oswilno-server/src/main.rs | 3 ++-
 crates/oswilno-session/Cargo.toml | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5cf7761..400f67c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2517,6 +2517,7 @@ name = "oswilno"
 version = "0.1.0"
 dependencies = [
  "actix",
+ "actix-jwt-session",
  "actix-rt",
  "actix-web",
  "actix-web-grants",
@@ -2605,6 +2606,7 @@ version = "0.1.0"
 dependencies = [
  "actix-http",
  "actix-jwt-authc",
+ "actix-jwt-session",
  "actix-web",
  "argon2",
  "askama",
diff --git a/crates/oswilno-server/Cargo.toml b/crates/oswilno-server/Cargo.toml
index 0072ee6..52a5fe6 100644
--- a/crates/oswilno-server/Cargo.toml
+++ b/crates/oswilno-server/Cargo.toml
@@ -15,6 +15,7 @@ oswilno-config = { path = "../oswilno-config" }
 oswilno-parking-space = { path = "../oswilno-parking-space" }
 oswilno-session = { path = "../oswilno-session" }
 oswilno-view = { path = "../oswilno-view" }
+actix-jwt-session = { path = "../actix-jwt-session", features = ["use-redis"] }
 redis = { version = "0.17" }
 redis-async-pool = "0.2.4"
 sea-orm = { version = "0.11", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres"] }
diff --git a/crates/oswilno-server/src/main.rs b/crates/oswilno-server/src/main.rs
index 2a6a394..a34f76d 100644
--- a/crates/oswilno-server/src/main.rs
+++ b/crates/oswilno-server/src/main.rs
@@ -50,7 +50,8 @@ async fn main() -> std::io::Result<()> {
         let session_config = session_config.clone();
         App::new()
             .wrap(middleware::Logger::default())
-            .wrap(session_config.factory())
+            .wrap(actix_jwt_session::RedisMiddleware::new())
+            // .wrap(session_config.factory())
             .app_data(Data::new(conn.clone()))
             .app_data(Data::new(redis.clone()))
             .app_data(Data::new(l10n.clone()))
diff --git a/crates/oswilno-session/Cargo.toml b/crates/oswilno-session/Cargo.toml
index d484f18..4a0010f 100644
--- a/crates/oswilno-session/Cargo.toml
+++ b/crates/oswilno-session/Cargo.toml
@@ -17,6 +17,7 @@ garde = { version = "0.14.0", features = ["derive"] }
 jsonwebtoken = "8.3.0"
 oswilno-contract = { path = "../oswilno-contract" }
 oswilno-view = { path = "../oswilno-view" }
+actix-jwt-session = { path = "../actix-jwt-session" }
 rand = "0.8.5"
 redis = { version = "0.17" }
 redis-async-pool = "0.2.4"