Remove the useless mut requirement in userstore

Author: dzervas

src/auth_url/handle_status.rs

@@ -30,6 +30,7 @@ use crate::service::StatusAuth;
 ///
 /// In order to use the one-time-code functionality, some setup is required,
 /// documented in [the example](https://magicentry.rs/#/installation?id=example-valuesyaml)
+// TODO: Cache the response for about a second or so
 #[axum::debug_handler]
 pub async fn handle_status(
 	config: LiveConfig,
@@ -45,10 +46,7 @@ pub async fn handle_status(
 		.unwrap_or(false);
 
 	if log_authurl_lines {
-		let cookies: Vec<&str> = jar
-			.iter()
-			.map(|cookie| cookie.name())
-			.collect();
+		let cookies: Vec<&str> = jar.iter().map(|cookie| cookie.name()).collect();
 		let headers: Vec<&str> = request_headers
 			.iter()
 			.map(|(name, _value)| name.as_str())

src/config.rs

@@ -21,8 +21,7 @@ use crate::CONFIG;
 use crate::database::{ConfigKVRow, Database};
 use crate::service::Services;
 use crate::user::User;
-use crate::user_store::{FileUserStore, SQLUserStore, StaticUserStore, UserStoreKind};
-// use crate::user_store::{SQLUserStore, StaticUserStore, UserStoreKind};
+use crate::user_store::{FileUserStore, SQLUserStore, StaticUserStore, UserStore};
 
 /// The actual, deserialized config data
 ///
@@ -253,15 +252,14 @@ impl Config {
 			.replace("\n", ""))
 	}
 
-	pub fn get_user_store(&self) -> anyhow::Result<UserStoreKind> {
+	pub fn get_user_store(&self) -> anyhow::Result<Arc<dyn UserStore>> {
 		if self.users.len() > 0 {
-			return Ok(UserStoreKind::Static(StaticUserStore::new(
-				self.users.clone(),
-			)));
+			// TODO: This does not hot-reload
+			return Ok(Arc::new(StaticUserStore::new(self.users.clone())));
 		}
 
 		if let Some(users_file) = self.users_file.clone() {
-			return Ok(UserStoreKind::File(FileUserStore::new(users_file)));
+			return Ok(Arc::new(FileUserStore::new(users_file)));
 		}
 
 		if let Some(url) = self.users_sql_url.clone() {
@@ -276,15 +274,12 @@ impl Config {
 				));
 			};
 
-			return Ok(UserStoreKind::SQL(SQLUserStore::new(
-				&url,
-				query_all,
-				query_email,
-			)?));
+			return Ok(Arc::new(SQLUserStore::new(&url, query_all, query_email)?));
 		}
 
 		error!("No users configured, using an empty user store");
-		Ok(UserStoreKind::Static(StaticUserStore::new(vec![])))
+		// TODO: This does not hot-reload
+		Ok(Arc::new(StaticUserStore::new(vec![])))
 	}
 }
 

src/handle_admin.rs

@@ -11,7 +11,6 @@ use crate::error::{AppError, AuthError};
 use crate::secret::LoginLinkSecret;
 use crate::secret::admin_token::{AdminApiTokenMetadata, AdminApiTokenSecret};
 use crate::secret::login_link::LoginLinkRedirect;
-use crate::user_store::UserStore;
 use crate::{AppState, secret::BrowserSessionSecret};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
@@ -35,7 +34,7 @@ pub struct GenerateMagicLinkResponse {
 #[axum::debug_handler]
 pub async fn handle_admin_generate_magic_link(
 	_: AdminApiTokenSecret,
-	State(mut state): State<AppState>,
+	State(state): State<AppState>,
 	config: LiveConfig,
 	Json(generate_magic_link_request): Json<GenerateMagicLinkRequest>,
 ) -> Response {

src/handle_login_post.rs

@@ -19,8 +19,6 @@ use crate::pages::{LoginActionPage, Page};
 use crate::secret::LoginLinkSecret;
 use crate::secret::login_link::LoginLinkRedirect;
 
-use crate::user_store::UserStore as _;
-
 /// Used to get the login form data for from the login page
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct LoginInfo {
@@ -30,7 +28,7 @@ pub struct LoginInfo {
 #[axum::debug_handler]
 pub async fn handle_login_post(
 	config: LiveConfig,
-	State(mut state): State<AppState>,
+	State(state): State<AppState>,
 	Query(login_redirect): Query<LoginLinkRedirect>,
 	Form(form): Form<LoginInfo>,
 ) -> Result<Response, AppError> {

src/lib.rs

@@ -58,7 +58,7 @@ use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::{EnvFilter, fmt};
 
 use crate::error::AppError;
-use crate::user_store::UserStoreKind;
+use crate::user_store::UserStore;
 use crate::{config::Config, user::User};
 
 pub mod app_build;
@@ -143,7 +143,7 @@ pub struct InFlightConfig(Arc<Config>);
 pub struct AppState {
 	pub db: crate::Database,
 	config: Arc<ArcSwap<Config>>,
-	pub user_store: UserStoreKind,
+	pub user_store: Arc<dyn UserStore>,
 	pub link_senders: Vec<Arc<dyn LinkSender>>,
 
 	pub key: jsonwebtoken::EncodingKey,

src/user_store.rs

@@ -6,25 +6,7 @@ use crate::user::User;
 
 #[async_trait::async_trait]
 pub trait UserStore: Send + Sync {
-	async fn from_email(&mut self, email: &str) -> Option<User>;
-}
-
-#[derive(Debug, Clone)]
-pub enum UserStoreKind {
-	Static(StaticUserStore),
-	File(FileUserStore),
-	SQL(SQLUserStore),
-}
-
-#[async_trait::async_trait]
-impl UserStore for UserStoreKind {
-	async fn from_email(&mut self, email: &str) -> Option<User> {
-		match self {
-			UserStoreKind::Static(store) => store.from_email(email).await,
-			UserStoreKind::File(store) => store.from_email(email).await,
-			UserStoreKind::SQL(store) => store.from_email(email).await,
-		}
-	}
+	async fn from_email(&self, email: &str) -> Option<User>;
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -38,7 +20,7 @@ impl StaticUserStore {
 
 #[async_trait::async_trait]
 impl UserStore for StaticUserStore {
-	async fn from_email(&mut self, email: &str) -> Option<User> {
+	async fn from_email(&self, email: &str) -> Option<User> {
 		self.0.iter().find(|user| user.email == email).cloned()
 	}
 }
@@ -54,7 +36,7 @@ impl FileUserStore {
 
 #[async_trait::async_trait]
 impl UserStore for FileUserStore {
-	async fn from_email(&mut self, email: &str) -> Option<User> {
+	async fn from_email(&self, email: &str) -> Option<User> {
 		let users_contents = match std::fs::read_to_string(self.0.clone()) {
 			Ok(contents) => contents,
 			Err(e) => {
@@ -95,7 +77,7 @@ impl SQLUserStore {
 
 #[async_trait::async_trait]
 impl UserStore for SQLUserStore {
-	async fn from_email(&mut self, email: &str) -> Option<User> {
+	async fn from_email(&self, email: &str) -> Option<User> {
 		// let Ok(conn) = self.conn.acquire().await else {
 		// 	error!("Failed to acquire connection from the SQL user pool");
 		// 	return None;

src/utils.rs

@@ -18,7 +18,6 @@ pub mod tests {
 	use crate::config::Config;
 	use crate::database::init_database;
 	use crate::user::User;
-	use crate::user_store::UserStore;
 	use crate::{CONFIG_FILE, Database};
 
 	use super::*;

src/webauthn/handle_auth_start.rs

@@ -11,12 +11,10 @@ use crate::error::{AppError, WebAuthnError};
 use crate::handle_login_post::LoginInfo;
 use crate::secret::WebAuthnAuthSecret;
 
-use crate::user_store::UserStore as _;
-
 #[axum::debug_handler]
 pub async fn handle_auth_start(
 	config: LiveConfig,
-	State(mut state): State<AppState>,
+	State(state): State<AppState>,
 	jar: CookieJar,
 	form: Json<LoginInfo>,
 ) -> Result<(CookieJar, impl IntoResponse), AppError> {