refactor: collapse auth

9 files changed, 46 insertions, 91 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 468bd41..165861d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -297,7 +297,7 @@ version = "3.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89ec27229c38ed0eb3c0feee3d2c1d6a4379ae44f418a29a658890e062d8f365"
 dependencies = [
- "darling 0.23.0",
+ "darling",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -509,18 +509,8 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core 0.20.11",
- "darling_macro 0.20.11",
-]
-
-[[package]]
-name = "darling"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
-dependencies = [
- "darling_core 0.23.0",
- "darling_macro 0.23.0",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -538,36 +528,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "darling_core"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
-dependencies = [
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.114",
-]
-
-[[package]]
 name = "darling_macro"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core 0.20.11",
- "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
-dependencies = [
- "darling_core 0.23.0",
+ "darling_core",
  "quote",
  "syn 2.0.114",
 ]
@@ -609,7 +575,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "darling 0.20.11",
+ "darling",
  "proc-macro2",
  "quote",
  "syn 2.0.114",
@@ -2052,11 +2018,11 @@ dependencies = [
  "anyhow",
  "async-trait",
  "axum",
+ "bon",
  "clap",
  "oauth2",
  "rand 0.9.2",
  "secrecy",
- "sellershut-auth",
  "serde",
  "sqlx",
  "tokio",
@@ -2076,17 +2042,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "sellershut-auth"
-version = "0.1.0"
-dependencies = [
- "bon",
- "oauth2",
- "secrecy",
- "thiserror 2.0.18",
- "url",
-]
-
-[[package]]
 name = "serde"
 version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index f9cca9b..31d5fbb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = [ ".", "lib/*" ]
+members = [ "." ]
 
 [workspace.package]
 description = "A federated marketplace platform"
@@ -35,10 +35,10 @@ activitypub_federation = { version = "0.7.0-beta.8", default-features = false, f
 anyhow.workspace = true
 async-trait.workspace = true
 axum = { version = "0.8.8", features = ["macros"] }
+bon.workspace = true
 clap = { version = "4.5.56", features = ["derive", "env"] }
 oauth2.workspace = true
 secrecy = { workspace = true, features = ["serde"] }
-sellershut-auth = { path = "lib/auth" }
 serde = { workspace = true, features = ["derive"] }
 tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros", "signal"] }
 toml = "0.9.11"
diff --git a/lib/auth/Cargo.toml b/lib/auth/Cargo.toml
deleted file mode 100644
index 0852935..0000000
--- a/lib/auth/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "sellershut-auth"
-version = "0.1.0"
-edition = "2024"
-license.workspace = true
-documentation.workspace = true
-
-[dependencies]
-bon.workspace = true
-oauth2.workspace = true
-secrecy.workspace = true
-thiserror.workspace = true
-url.workspace = true
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 01af6d8..aa6f770 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -52,6 +52,7 @@ pub struct Api {
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[cfg(feature = "oauth")]
 pub struct OAuth {
     #[cfg(feature = "oauth-discord")]
     pub discord: DiscordOauth,
@@ -71,21 +72,26 @@ pub struct DiscordOauth {
     pub auth_url: Url,
 }
 
+#[cfg(feature = "oauth-discord")]
 fn discord_token_url() -> Url {
     Url::parse("https://discord.com/api/oauth2/authorize?response_type=code").expect("valid url")
 }
 
+#[cfg(feature = "oauth-discord")]
 fn discord_auth_url() -> Url {
     Url::parse("https://discord.com/api/oauth2/authorize?response_type=code").expect("valid url")
 }
 
+#[cfg(feature = "oauth")]
 fn redirect_url() -> Url {
     Url::parse("http://127.0.0.1:2210/auth/authorised").expect("valid url")
 }
 
+#[cfg(feature = "oauth")]
 impl Default for OAuth {
     fn default() -> Self {
         Self {
+            #[cfg(feature = "oauth-discord")]
             discord: DiscordOauth {
                 client_id: String::default(),
                 client_secret: SecretString::default(),
diff --git a/lib/auth/src/lib.rs b/src/server/driver/auth.rs
index 2a1390e..9215372 100644
--- a/lib/auth/src/lib.rs
+++ b/src/server/driver/auth.rs
@@ -1,7 +1,6 @@
 use bon::Builder;
 use oauth2::{AuthUrl, ClientId, ClientSecret, EndpointNotSet, EndpointSet, RedirectUrl, TokenUrl};
 use secrecy::{ExposeSecret, SecretString};
-use thiserror::Error;
 
 #[derive(Builder)]
 pub struct ClientOptions {
@@ -12,12 +11,6 @@ pub struct ClientOptions {
     redirect_url: String,
 }
 
-#[derive(Error, Debug)]
-pub enum OauthError {
-    #[error("invalid url")]
-    InvalidUrl(#[from] url::ParseError),
-}
-
 pub type OauthClient = oauth2::basic::BasicClient<
     EndpointSet,
     EndpointNotSet,
@@ -26,7 +19,7 @@ pub type OauthClient = oauth2::basic::BasicClient<
     EndpointSet,
 >;
 
-pub fn oauth_client(opts: &ClientOptions) -> Result<OauthClient, OauthError> {
+pub fn oauth_client(opts: &ClientOptions) -> anyhow::Result<OauthClient> {
     let redirect_url = RedirectUrl::new(opts.redirect_url.to_owned())?;
     let client_id = ClientId::new(opts.client_id.to_owned());
     let auth_url = AuthUrl::new(opts.auth_url.to_owned())?;
diff --git a/src/server/driver/mod.rs b/src/server/driver/mod.rs
index 4c540cb..c006cb0 100644
--- a/src/server/driver/mod.rs
+++ b/src/server/driver/mod.rs
@@ -1,3 +1,6 @@
+#[cfg(feature = "oauth")]
+pub mod auth;
+
 use async_trait::async_trait;
 use sqlx::PgPool;
 
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 3301035..2050758 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -26,7 +26,6 @@ use crate::{
     config::Config,
     server::{
         middleware::request_id::{REQUEST_ID_HEADER, add_request_id},
-        routes::auth::OAuthDoc,
         state::{AppState, federation},
     },
 };
@@ -43,12 +42,16 @@ pub async fn router(config: &Config, state: AppState) -> anyhow::Result<Router<(
     let state = federation::add_federation(state, config).await?;
 
     let mut doc = ApiDoc::openapi();
-    doc.merge(OAuthDoc::openapi());
 
-    let (router, _api) = OpenApiRouter::with_openapi(doc)
-        .routes(utoipa_axum::routes!(routes::health_check))
-        .routes(utoipa_axum::routes!(routes::auth::auth))
-        .split_for_parts();
+    #[cfg(feature = "oauth")]
+    doc.merge(routes::auth::OAuthDoc::openapi());
+
+    let stubs = OpenApiRouter::with_openapi(doc).routes(utoipa_axum::routes!(routes::health_check));
+
+    #[cfg(feature = "oauth")]
+    let stubs = stubs.routes(utoipa_axum::routes!(routes::auth::auth));
+
+    let (router, _api) = stubs.split_for_parts();
 
     #[cfg(feature = "swagger")]
     let router = router.merge(
diff --git a/src/server/routes/auth/discord.rs b/src/server/routes/auth/discord.rs
index 036a35a..b141ce7 100644
--- a/src/server/routes/auth/discord.rs
+++ b/src/server/routes/auth/discord.rs
@@ -1,11 +1,17 @@
-use std::sync::Arc;
+use activitypub_federation::config::Data;
+use axum::response::IntoResponse;
+use oauth2::{CsrfToken, Scope};
 
-use axum::{extract::State, response::IntoResponse};
+use crate::server::{error::AppError, state::AppState};
 
-use crate::server::{driver::SellershutDriver, error::AppError};
+pub(super) async fn discord_auth(data: Data<AppState>) -> Result<impl IntoResponse, AppError> {
+    let data = data.app_data();
 
-async fn auth(
-    State(client): State<Arc<dyn SellershutDriver>>,
-) -> Result<impl IntoResponse, AppError> {
-    Ok(())
+    let (auth_url, csrf_token) = data
+        .oauth_discord
+        .authorize_url(CsrfToken::new_random)
+        .add_scope(Scope::new("identify".to_string()))
+        .url();
+
+    Ok(String::default())
 }
diff --git a/src/server/state/mod.rs b/src/server/state/mod.rs
index f5f731e..03e8c70 100644
--- a/src/server/state/mod.rs
+++ b/src/server/state/mod.rs
@@ -3,25 +3,25 @@ pub mod federation;
 
 use std::sync::Arc;
 
-use sellershut_auth::{ClientOptions, OauthClient};
 #[cfg(feature = "oauth-discord")]
 use url::Url;
 
 #[cfg(feature = "oauth-discord")]
-use crate::config::DiscordOauth;
+use crate::{config::DiscordOauth, server::driver::auth::OauthClient};
 use crate::{config::Config, server::driver::SellershutDriver};
 
 #[derive(Clone)]
 pub struct AppState {
     driver: Arc<dyn SellershutDriver>,
     #[cfg(feature = "oauth-discord")]
-    oauth_discord: OauthClient,
+    pub oauth_discord: OauthClient,
 }
 
 impl AppState {
     pub async fn new(config: &Config, driver: impl SellershutDriver) -> anyhow::Result<Self> {
         Ok(Self {
             driver: Arc::new(driver),
+            #[cfg(feature = "oauth-discord")]
             oauth_discord: discord_client(&config.oauth.discord, &config.oauth.oauth_redirect_url)?,
         })
     }
@@ -29,6 +29,8 @@ impl AppState {
 
 #[cfg(feature = "oauth-discord")]
 fn discord_client(disc: &DiscordOauth, redirect: &Url) -> anyhow::Result<OauthClient> {
+    use crate::server::driver::{self, auth::ClientOptions};
+
     let discord_opts = ClientOptions::builder()
         .client_id(disc.client_id.to_owned())
         .redirect_url(redirect.to_string())
@@ -37,5 +39,5 @@ fn discord_client(disc: &DiscordOauth, redirect: &Url) -> anyhow::Result<OauthCl
         .token_url(disc.token_url.to_string())
         .build();
 
-    Ok(sellershut_auth::oauth_client(&discord_opts)?)
+    Ok(driver::auth::oauth_client(&discord_opts)?)
 }