From 955598dce9aeb5626654c72b0ef94850123fa8ac Mon Sep 17 00:00:00 2001 From: Tolmachev Igor Date: Sun, 14 Sep 2025 23:27:25 +0300 Subject: Add openapi specs and docs --- src/extract/auth.rs | 10 +++++----- src/extract/json.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/extract') diff --git a/src/extract/auth.rs b/src/extract/auth.rs index 1feb985..c603ee7 100644 --- a/src/extract/auth.rs +++ b/src/extract/auth.rs @@ -4,12 +4,12 @@ use entity::users; use headers::authorization::{Authorization, Bearer}; use sea_orm::EntityTrait; -use crate::{ApiError, AppState, validate_jwt}; +use crate::{AppState, ClientError, ErrorResponse, validate_jwt}; pub struct Auth(pub users::Model); impl FromRequestParts for Auth { - type Rejection = ApiError; + type Rejection = ErrorResponse; async fn from_request_parts( parts: &mut Parts, @@ -19,15 +19,15 @@ impl FromRequestParts for Auth { TypedHeader::>::from_request_parts(parts, state).await?; let jwt_claims = validate_jwt(token_header.token(), &state.secret) - .map_err(|_| ApiError::NotAuthorized)?; + .map_err(|_| ClientError::NotAuthorized)?; let user = users::Entity::find_by_id(jwt_claims.sub) .one(&state.db) .await? - .ok_or(ApiError::NotAuthorized)?; + .ok_or(ClientError::NotAuthorized)?; if jwt_claims.iat < user.password_issue_date.and_utc().timestamp() { - return Err(ApiError::NotAuthorized); + return Err(ClientError::NotAuthorized.into()); } Ok(Auth(user)) diff --git a/src/extract/json.rs b/src/extract/json.rs index 751df71..aaf8623 100644 --- a/src/extract/json.rs +++ b/src/extract/json.rs @@ -1,6 +1,6 @@ use axum::extract::{FromRequest, Request, rejection::JsonRejection}; -use crate::error::ApiError; +use crate::ErrorResponse; pub struct ApiJson(pub T); @@ -9,7 +9,7 @@ where axum::Json: FromRequest, S: Send + Sync, { - type Rejection = ApiError; + type Rejection = ErrorResponse; #[inline] async fn from_request(req: Request, state: &S) -> Result { -- cgit v1.2.3