fetch auth session data from token
This commit is contained in:
@@ -35,6 +35,10 @@ impl AuthSession {
|
||||
pub fn user_id(&self) -> &Uuid {
|
||||
&self.user_id
|
||||
}
|
||||
|
||||
pub fn expires_at(&self) -> &NaiveDateTime {
|
||||
&self.expires_at
|
||||
}
|
||||
}
|
||||
|
||||
/// A valid auth session id
|
||||
|
||||
@@ -2,6 +2,8 @@ use thiserror::Error;
|
||||
|
||||
use crate::domain::warren::models::user::User;
|
||||
|
||||
use super::{AuthSession, AuthSessionId};
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
||||
pub struct CreateAuthSessionRequest {
|
||||
user: User,
|
||||
@@ -43,3 +45,48 @@ impl SessionExpirationTime {
|
||||
self.0
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
||||
pub struct FetchAuthSessionRequest {
|
||||
session_id: AuthSessionId,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
||||
pub struct FetchAuthSessionResponse {
|
||||
session: AuthSession,
|
||||
user: User,
|
||||
}
|
||||
|
||||
impl FetchAuthSessionResponse {
|
||||
pub fn new(session: AuthSession, user: User) -> Self {
|
||||
Self { session, user }
|
||||
}
|
||||
|
||||
pub fn session(&self) -> &AuthSession {
|
||||
&self.session
|
||||
}
|
||||
|
||||
pub fn user(&self) -> &User {
|
||||
&self.user
|
||||
}
|
||||
}
|
||||
|
||||
impl FetchAuthSessionRequest {
|
||||
pub fn new(session_id: AuthSessionId) -> Self {
|
||||
Self { session_id }
|
||||
}
|
||||
|
||||
pub fn session_id(&self) -> &AuthSessionId {
|
||||
&self.session_id
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum FetchAuthSessionError {
|
||||
#[error("There is no auth session with this id")]
|
||||
NotFound,
|
||||
#[error("The auth session has expired")]
|
||||
Expired,
|
||||
#[error(transparent)]
|
||||
Unknown(#[from] anyhow::Error),
|
||||
}
|
||||
|
||||
@@ -58,4 +58,7 @@ pub trait AuthMetrics: Clone + Send + Sync + 'static {
|
||||
|
||||
fn record_auth_session_creation_success(&self) -> impl Future<Output = ()> + Send;
|
||||
fn record_auth_session_creation_failure(&self) -> impl Future<Output = ()> + Send;
|
||||
|
||||
fn record_auth_session_fetch_success(&self) -> impl Future<Output = ()> + Send;
|
||||
fn record_auth_session_fetch_failure(&self) -> impl Future<Output = ()> + Send;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,10 @@ pub use repository::*;
|
||||
use super::models::{
|
||||
auth_session::{
|
||||
AuthSession,
|
||||
requests::{CreateAuthSessionError, CreateAuthSessionRequest},
|
||||
requests::{
|
||||
CreateAuthSessionError, CreateAuthSessionRequest, FetchAuthSessionError,
|
||||
FetchAuthSessionRequest, FetchAuthSessionResponse,
|
||||
},
|
||||
},
|
||||
file::{
|
||||
CreateDirectoryError, CreateDirectoryRequest, CreateFileError, CreateFileRequest,
|
||||
@@ -110,4 +113,8 @@ pub trait AuthService: Clone + Send + Sync + 'static {
|
||||
&self,
|
||||
request: CreateAuthSessionRequest,
|
||||
) -> impl Future<Output = Result<AuthSession, CreateAuthSessionError>> + Send;
|
||||
fn fetch_auth_session(
|
||||
&self,
|
||||
request: FetchAuthSessionRequest,
|
||||
) -> impl Future<Output = Result<FetchAuthSessionResponse, FetchAuthSessionError>> + Send;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::domain::warren::models::{
|
||||
auth_session::requests::FetchAuthSessionResponse,
|
||||
file::{AbsoluteFilePath, File, FilePath},
|
||||
user::User,
|
||||
warren::Warren,
|
||||
@@ -76,4 +77,8 @@ pub trait AuthNotifier: Clone + Send + Sync + 'static {
|
||||
fn user_registered(&self, user: &User) -> impl Future<Output = ()> + Send;
|
||||
fn user_logged_in(&self, user: &User) -> impl Future<Output = ()> + Send;
|
||||
fn auth_session_created(&self, user_id: &Uuid) -> impl Future<Output = ()> + Send;
|
||||
fn auth_session_fetched(
|
||||
&self,
|
||||
response: &FetchAuthSessionResponse,
|
||||
) -> impl Future<Output = ()> + Send;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
use crate::domain::warren::models::{
|
||||
auth_session::{
|
||||
AuthSession,
|
||||
requests::{CreateAuthSessionError, CreateAuthSessionRequest},
|
||||
requests::{
|
||||
CreateAuthSessionError, CreateAuthSessionRequest, FetchAuthSessionError,
|
||||
FetchAuthSessionRequest, FetchAuthSessionResponse,
|
||||
},
|
||||
},
|
||||
file::{
|
||||
CreateDirectoryError, CreateDirectoryRequest, CreateFileError, CreateFileRequest,
|
||||
@@ -70,4 +73,8 @@ pub trait AuthRepository: Clone + Send + Sync + 'static {
|
||||
&self,
|
||||
request: CreateAuthSessionRequest,
|
||||
) -> impl Future<Output = Result<AuthSession, CreateAuthSessionError>> + Send;
|
||||
fn fetch_auth_session(
|
||||
&self,
|
||||
request: FetchAuthSessionRequest,
|
||||
) -> impl Future<Output = Result<FetchAuthSessionResponse, FetchAuthSessionError>> + Send;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@ use crate::{
|
||||
auth_session::{
|
||||
AuthSession,
|
||||
requests::{
|
||||
CreateAuthSessionError, CreateAuthSessionRequest, SessionExpirationTime,
|
||||
CreateAuthSessionError, CreateAuthSessionRequest, FetchAuthSessionError,
|
||||
FetchAuthSessionRequest, FetchAuthSessionResponse, SessionExpirationTime,
|
||||
},
|
||||
},
|
||||
user::{
|
||||
@@ -131,4 +132,20 @@ where
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
async fn fetch_auth_session(
|
||||
&self,
|
||||
request: FetchAuthSessionRequest,
|
||||
) -> Result<FetchAuthSessionResponse, FetchAuthSessionError> {
|
||||
let result = self.repository.fetch_auth_session(request).await;
|
||||
|
||||
if let Ok(response) = result.as_ref() {
|
||||
self.metrics.record_auth_session_fetch_success().await;
|
||||
self.notifier.auth_session_fetched(response).await;
|
||||
} else {
|
||||
self.metrics.record_auth_session_fetch_failure().await;
|
||||
}
|
||||
|
||||
result
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use crate::{
|
||||
domain::warren::models::{
|
||||
auth_session::requests::FetchAuthSessionError,
|
||||
file::{CreateDirectoryError, DeleteDirectoryError, DeleteFileError, ListFilesError},
|
||||
user::{LoginUserError, RegisterUserError, VerifyUserPasswordError},
|
||||
warren::{
|
||||
@@ -152,3 +153,17 @@ impl From<LoginUserError> for ApiError {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<FetchAuthSessionError> for ApiError {
|
||||
fn from(value: FetchAuthSessionError) -> Self {
|
||||
match value {
|
||||
FetchAuthSessionError::NotFound => {
|
||||
Self::BadRequest("This session does not exist".to_string())
|
||||
}
|
||||
FetchAuthSessionError::Expired => {
|
||||
Self::BadRequest("This session has expired".to_string())
|
||||
}
|
||||
FetchAuthSessionError::Unknown(e) => Self::InternalServerError(e.to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
82
backend/src/lib/inbound/http/handlers/auth/fetch_session.rs
Normal file
82
backend/src/lib/inbound/http/handlers/auth/fetch_session.rs
Normal file
@@ -0,0 +1,82 @@
|
||||
use axum::{
|
||||
extract::State,
|
||||
http::{HeaderMap, StatusCode},
|
||||
};
|
||||
use serde::Serialize;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
domain::warren::{
|
||||
models::{
|
||||
auth_session::{
|
||||
AuthSessionId,
|
||||
requests::{FetchAuthSessionRequest, FetchAuthSessionResponse},
|
||||
},
|
||||
user::User,
|
||||
},
|
||||
ports::{AuthService, WarrenService},
|
||||
},
|
||||
inbound::http::{
|
||||
AppState,
|
||||
responses::{ApiError, ApiSuccess},
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct SessionUser {
|
||||
id: Uuid,
|
||||
name: String,
|
||||
email: String,
|
||||
admin: bool,
|
||||
}
|
||||
|
||||
impl From<User> for SessionUser {
|
||||
fn from(value: User) -> Self {
|
||||
Self {
|
||||
id: *value.id(),
|
||||
name: value.name().to_string(),
|
||||
email: value.email().to_string(),
|
||||
admin: value.admin(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct FetchSessionResponseBody {
|
||||
user: SessionUser,
|
||||
expires_at: i64,
|
||||
}
|
||||
|
||||
impl From<FetchAuthSessionResponse> for FetchSessionResponseBody {
|
||||
fn from(value: FetchAuthSessionResponse) -> Self {
|
||||
Self {
|
||||
user: value.user().clone().into(),
|
||||
expires_at: value.session().expires_at().and_utc().timestamp_millis(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn fetch_session<WS: WarrenService, AS: AuthService>(
|
||||
State(state): State<AppState<WS, AS>>,
|
||||
headers: HeaderMap,
|
||||
) -> Result<ApiSuccess<FetchSessionResponseBody>, ApiError> {
|
||||
let Some(Ok(Ok(session_id))) = headers.get("authorization").map(|h| {
|
||||
h.to_str()
|
||||
.map(|h| AuthSessionId::new(&h["WarrenAuth ".len()..]))
|
||||
}) else {
|
||||
return Err(ApiError::BadRequest(
|
||||
"No authorization header set".to_string(),
|
||||
));
|
||||
};
|
||||
|
||||
let domain_request = FetchAuthSessionRequest::new(session_id);
|
||||
|
||||
state
|
||||
.auth_service
|
||||
.fetch_auth_session(domain_request)
|
||||
.await
|
||||
.map(|response| ApiSuccess::new(StatusCode::OK, response.into()))
|
||||
.map_err(ApiError::from)
|
||||
}
|
||||
@@ -66,6 +66,7 @@ impl LoginUserHttpRequestBody {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Include `user` and `expires_at` fields
|
||||
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||
pub struct LoginResponseBody {
|
||||
token: String,
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
mod fetch_session;
|
||||
mod login;
|
||||
mod register;
|
||||
use fetch_session::fetch_session;
|
||||
use login::login;
|
||||
use register::register;
|
||||
|
||||
use axum::{Router, routing::post};
|
||||
use axum::{
|
||||
Router,
|
||||
routing::{get, post},
|
||||
};
|
||||
|
||||
use crate::{
|
||||
domain::warren::ports::{AuthService, WarrenService},
|
||||
@@ -14,4 +19,5 @@ pub fn routes<WS: WarrenService, AS: AuthService>() -> Router<AppState<WS, AS>>
|
||||
Router::new()
|
||||
.route("/register", post(register))
|
||||
.route("/login", post(login))
|
||||
.route("/session", get(fetch_session))
|
||||
}
|
||||
|
||||
@@ -144,4 +144,11 @@ impl AuthMetrics for MetricsDebugLogger {
|
||||
async fn record_auth_session_creation_failure(&self) {
|
||||
tracing::debug!("[Metrics] Auth session creation failed");
|
||||
}
|
||||
|
||||
async fn record_auth_session_fetch_success(&self) {
|
||||
tracing::debug!("[Metrics] Auth session fetch succeeded");
|
||||
}
|
||||
async fn record_auth_session_fetch_failure(&self) {
|
||||
tracing::debug!("[Metrics] Auth session fetch failed");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ use uuid::Uuid;
|
||||
|
||||
use crate::domain::warren::{
|
||||
models::{
|
||||
auth_session::requests::FetchAuthSessionResponse,
|
||||
file::{File, FilePath},
|
||||
user::User,
|
||||
warren::Warren,
|
||||
@@ -128,4 +129,11 @@ impl AuthNotifier for NotifierDebugLogger {
|
||||
async fn auth_session_created(&self, user_id: &Uuid) {
|
||||
tracing::debug!("[Notifier] Created auth session for user {}", user_id);
|
||||
}
|
||||
|
||||
async fn auth_session_fetched(&self, response: &FetchAuthSessionResponse) {
|
||||
tracing::debug!(
|
||||
"[Notifier] Fetched auth session for user {}",
|
||||
response.user().id()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,11 @@ use uuid::Uuid;
|
||||
use crate::domain::warren::{
|
||||
models::{
|
||||
auth_session::{
|
||||
AuthSession,
|
||||
requests::{CreateAuthSessionError, CreateAuthSessionRequest, SessionExpirationTime},
|
||||
AuthSession, AuthSessionId,
|
||||
requests::{
|
||||
CreateAuthSessionError, CreateAuthSessionRequest, FetchAuthSessionError,
|
||||
FetchAuthSessionRequest, FetchAuthSessionResponse, SessionExpirationTime,
|
||||
},
|
||||
},
|
||||
user::{
|
||||
RegisterUserError, RegisterUserRequest, User, UserEmail, UserName, UserPassword,
|
||||
@@ -163,6 +166,28 @@ impl Postgres {
|
||||
Ok(user)
|
||||
}
|
||||
|
||||
async fn get_user_from_id(
|
||||
&self,
|
||||
connection: &mut PgConnection,
|
||||
id: &Uuid,
|
||||
) -> Result<User, sqlx::Error> {
|
||||
let user: User = sqlx::query_as(
|
||||
"
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
users
|
||||
WHERE
|
||||
id = $1
|
||||
",
|
||||
)
|
||||
.bind(id)
|
||||
.fetch_one(connection)
|
||||
.await?;
|
||||
|
||||
Ok(user)
|
||||
}
|
||||
|
||||
async fn get_user_from_email(
|
||||
&self,
|
||||
connection: &mut PgConnection,
|
||||
@@ -245,6 +270,28 @@ impl Postgres {
|
||||
|
||||
Ok(session)
|
||||
}
|
||||
|
||||
async fn get_auth_session(
|
||||
&self,
|
||||
connection: &mut PgConnection,
|
||||
session_id: &AuthSessionId,
|
||||
) -> anyhow::Result<AuthSession> {
|
||||
let session: AuthSession = sqlx::query_as(
|
||||
"
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
auth_sessions
|
||||
WHERE
|
||||
session_id = $1
|
||||
",
|
||||
)
|
||||
.bind(session_id)
|
||||
.fetch_one(connection)
|
||||
.await?;
|
||||
|
||||
Ok(session)
|
||||
}
|
||||
}
|
||||
|
||||
impl WarrenRepository for Postgres {
|
||||
@@ -355,6 +402,28 @@ impl AuthRepository for Postgres {
|
||||
|
||||
Ok(session)
|
||||
}
|
||||
|
||||
async fn fetch_auth_session(
|
||||
&self,
|
||||
request: FetchAuthSessionRequest,
|
||||
) -> Result<FetchAuthSessionResponse, FetchAuthSessionError> {
|
||||
let mut connection = self
|
||||
.pool
|
||||
.acquire()
|
||||
.await
|
||||
.context("Failed to get a PostgreSQL connection")?;
|
||||
|
||||
let session = self
|
||||
.get_auth_session(&mut connection, request.session_id())
|
||||
.await
|
||||
.context("Failed to get auth session")?;
|
||||
let user = self
|
||||
.get_user_from_id(&mut connection, session.user_id())
|
||||
.await
|
||||
.context("Failed to get user")?;
|
||||
|
||||
Ok(FetchAuthSessionResponse::new(session, user))
|
||||
}
|
||||
}
|
||||
|
||||
fn is_not_found_error(err: &sqlx::Error) -> bool {
|
||||
|
||||
Reference in New Issue
Block a user