From fac75e1f54605c42663b81d5391230efde5fb913 Mon Sep 17 00:00:00 2001
From: Ethan Girouard <ethan@girouard.com>
Date: Thu, 6 Feb 2025 11:09:36 -0500
Subject: [PATCH] Move auth_backend to util

---
 src/api/auth.rs                | 2 +-
 src/lib.rs                     | 1 -
 src/main.rs                    | 2 +-
 src/{ => util}/auth_backend.rs | 8 +-------
 src/util/mod.rs                | 1 +
 src/util/require_auth.rs       | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)
 rename src/{ => util}/auth_backend.rs (89%)

diff --git a/src/api/auth.rs b/src/api/auth.rs
index c9a31c3..b43250a 100644
--- a/src/api/auth.rs
+++ b/src/api/auth.rs
@@ -7,7 +7,7 @@ cfg_if! {
 		use leptos::server_fn::error::NoCustomError;
 		use leptos_axum::extract;
 		use axum_login::AuthSession;
-		use crate::auth_backend::AuthBackend;
+		use crate::util::auth_backend::AuthBackend;
 	}
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index 5060468..62b2775 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,6 @@ use cfg_if::cfg_if;
 
 cfg_if! {
   if #[cfg(feature = "ssr")] {
-    pub mod auth_backend;
     pub mod schema;
   }
 }
diff --git a/src/main.rs b/src/main.rs
index 7211d8d..b2e7305 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@ async fn main() {
     use axum_login::tower_sessions::SessionManagerLayer;
     use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
     use axum_login::AuthManagerLayerBuilder;
-    use libretunes::auth_backend::AuthBackend;
+    use libretunes::util::auth_backend::AuthBackend;
     use log::*;
 
     flexi_logger::Logger::try_with_env_or_str("debug").unwrap().format(flexi_logger::opt_format).start().unwrap();
diff --git a/src/auth_backend.rs b/src/util/auth_backend.rs
similarity index 89%
rename from src/auth_backend.rs
rename to src/util/auth_backend.rs
index 9ba98f0..e64f6e6 100644
--- a/src/auth_backend.rs
+++ b/src/util/auth_backend.rs
@@ -4,13 +4,8 @@ use leptos::server_fn::error::ServerFnErrorErr;
 
 use crate::models::backend::User;
 
-use cfg_if::cfg_if;
+use async_trait::async_trait;
 
-cfg_if! {
-	if #[cfg(feature = "ssr")] {
-		use async_trait::async_trait;
-	}
-}
 
 impl AuthUser for User {
 	type Id = i32;
@@ -29,7 +24,6 @@ impl AuthUser for User {
 #[derive(Clone)]
 pub struct AuthBackend;
 
-#[cfg(feature = "ssr")]
 #[async_trait]
 impl AuthnBackend for AuthBackend {
 	type User = User;
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 321385f..8bf32ab 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -6,6 +6,7 @@ cfg_if! {
 		pub mod require_auth;
 		pub mod fileserv;
 		pub mod database;
+		pub mod auth_backend;
 	}
 }
 
diff --git a/src/util/require_auth.rs b/src/util/require_auth.rs
index 966d5c3..74d98b6 100644
--- a/src/util/require_auth.rs
+++ b/src/util/require_auth.rs
@@ -5,7 +5,7 @@ use axum::middleware::Next;
 use axum_login::AuthSession;
 use http::StatusCode;
 
-use crate::auth_backend::AuthBackend;
+use crate::util::auth_backend::AuthBackend;
 
 use axum::extract::FromRequestParts;