From c5e292d39fa57bde82405b0247bb822a2858c2a2 Mon Sep 17 00:00:00 2001 From: silverpill Date: Fri, 3 Dec 2021 18:15:53 +0000 Subject: [PATCH] Rename SessionError to AuthError --- src/errors.rs | 4 ++-- src/mastodon_api/oauth/auth.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/errors.rs b/src/errors.rs index 402e803..89d56fd 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -47,7 +47,7 @@ pub enum HttpError { ValidationErrorAuto(#[from] ValidationError), #[error("{0}")] - SessionError(&'static str), + AuthError(&'static str), #[error("permission error")] PermissionError, @@ -93,7 +93,7 @@ impl ResponseError for HttpError { HttpError::ActixError(err) => err.as_response_error().status_code(), HttpError::ValidationError(_) => StatusCode::BAD_REQUEST, HttpError::ValidationErrorAuto(_) => StatusCode::BAD_REQUEST, - HttpError::SessionError(_) => StatusCode::UNAUTHORIZED, + HttpError::AuthError(_) => StatusCode::UNAUTHORIZED, HttpError::PermissionError => StatusCode::FORBIDDEN, HttpError::NotFoundError(_) => StatusCode::NOT_FOUND, HttpError::NotSupported => StatusCode::IM_A_TEAPOT, diff --git a/src/mastodon_api/oauth/auth.rs b/src/mastodon_api/oauth/auth.rs index a5221b7..6da5851 100644 --- a/src/mastodon_api/oauth/auth.rs +++ b/src/mastodon_api/oauth/auth.rs @@ -18,7 +18,7 @@ pub async fn get_current_user( let user = get_user_by_oauth_token(db_client, token).await.map_err(|err| { match err { DatabaseError::NotFound(_) => { - HttpError::SessionError("access token is invalid") + HttpError::AuthError("access token is invalid") }, _ => HttpError::InternalError, }