From 0ea3cb1d4743b922fbc6e07037096e75caffba8f Mon Sep 17 00:00:00 2001 From: rtkay123 Date: Mon, 2 Feb 2026 22:29:43 +0200 Subject: feat: authorised path --- src/server/driver/auth.rs | 29 ++++++++++++++++++++++++++--- src/server/entity/auth/mod.rs | 8 ++++++++ src/server/entity/mod.rs | 1 + src/server/mod.rs | 5 ++++- src/server/routes/auth/mod.rs | 26 +++++++++++++++++++++++++- 5 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 src/server/entity/auth/mod.rs create mode 100644 src/server/entity/mod.rs (limited to 'src/server') diff --git a/src/server/driver/auth.rs b/src/server/driver/auth.rs index 28e9285..958698b 100644 --- a/src/server/driver/auth.rs +++ b/src/server/driver/auth.rs @@ -4,9 +4,10 @@ use async_trait::async_trait; use bon::Builder; use oauth2::{AuthUrl, ClientId, ClientSecret, EndpointNotSet, EndpointSet, RedirectUrl, TokenUrl}; use secrecy::{ExposeSecret, SecretString}; +use time::OffsetDateTime; use tracing::{instrument, trace}; -use crate::server::driver::Services; +use crate::server::{driver::Services, entity}; pub(super) static COOKIE_NAME: &str = "SESSION"; pub(super) static CSRF_TOKEN: &str = "csrf_token"; @@ -48,9 +49,31 @@ impl SessionStore for Services { #[instrument(skip(self))] async fn load_session(&self, cookie_value: String) -> Result> { let id = Session::id_from_cookie_value(&cookie_value)?; - let mut connection = self.database.acquire().await?; - todo!() + let result = sqlx::query_as!( + entity::auth::Session, + "select + * + from + session + where + id = $1 + and + ( + expires + is null + or + expires > $2 + ) + ", + id, + OffsetDateTime::now_utc() + ) + .fetch_optional(&self.database) + .await? + .map(|value| serde_json::from_str(&value.session)); + + Ok(result.transpose()?) } #[instrument(skip(self, session), fields(id = session.id()))] diff --git a/src/server/entity/auth/mod.rs b/src/server/entity/auth/mod.rs new file mode 100644 index 0000000..8791048 --- /dev/null +++ b/src/server/entity/auth/mod.rs @@ -0,0 +1,8 @@ +use time::OffsetDateTime; + +pub struct Session { + pub id: String, + pub expires: Option, + pub ap_id: String, + pub session: String, +} diff --git a/src/server/entity/mod.rs b/src/server/entity/mod.rs new file mode 100644 index 0000000..0e4a05d --- /dev/null +++ b/src/server/entity/mod.rs @@ -0,0 +1 @@ +pub mod auth; diff --git a/src/server/mod.rs b/src/server/mod.rs index 7357957..b4a591c 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -1,4 +1,5 @@ pub mod driver; +pub mod entity; pub mod error; mod middleware; pub mod routes; @@ -49,7 +50,9 @@ pub async fn router(config: &Config, state: AppState) -> anyhow::Result, data: Data, ) -> Result { + match params.provider { + #[cfg(feature = "oauth-discord")] + OauthProvider::Discord => discord::discord_auth(data), + } + .await +} +#[utoipa::path( + method(get), + path = "/auth/authorised", + params( + Params + ), + tag = AUTH, + responses( + (status = OK, description = "Auth redirect url", body = str, content_type = "text/plain") + ) +)] +#[axum::debug_handler] +#[cfg(feature = "oauth")] +pub async fn authorised( + Query(params): Query, + data: Data, +) -> Result { match params.provider { #[cfg(feature = "oauth-discord")] OauthProvider::Discord => discord::discord_auth(data), - }.await + } + .await } -- cgit v1.2.3