refactor(core/result): add NotAuthenticated error which is distinct f…

…rom InvalidCredentials
revoltchat · Sep 29, 2024 · 4fd66b2 · 4fd66b2
1 parent 916f47e
commit 4fd66b2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/crates/core/database/src/models/channel_webhooks/model.rs b/crates/core/database/src/models/channel_webhooks/model.rs
@@ -70,7 +70,7 @@ impl Webhook {
         if self.token.as_deref() == Some(token) {
             Ok(())
         } else {
-            Err(create_error!(InvalidCredentials))
+            Err(create_error!(NotAuthenticated))
         }
     }
 

diff --git a/crates/core/database/src/models/users/axum.rs b/crates/core/database/src/models/users/axum.rs
@@ -18,7 +18,7 @@ impl FromRequestParts<Database> for User {
             let session = db.fetch_session_by_token(session_token).await?;
             db.fetch_user(&session.user_id).await
         } else {
-            Err(create_error!(InvalidCredentials))
+            Err(create_error!(NotAuthenticated))
         }
     }
 }
diff --git a/crates/core/result/src/axum.rs b/crates/core/result/src/axum.rs
@@ -67,6 +67,7 @@ impl IntoResponse for Error {
             ErrorType::InvalidCredentials => StatusCode::UNAUTHORIZED,
             ErrorType::InvalidProperty => StatusCode::BAD_REQUEST,
             ErrorType::InvalidSession => StatusCode::UNAUTHORIZED,
+            ErrorType::NotAuthenticated => StatusCode::UNAUTHORIZED,
             ErrorType::DuplicateNonce => StatusCode::CONFLICT,
             ErrorType::VosoUnavailable => StatusCode::BAD_REQUEST,
             ErrorType::NotFound => StatusCode::NOT_FOUND,

diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
@@ -147,6 +147,7 @@ pub enum ErrorType {
     InvalidCredentials,
     InvalidProperty,
     InvalidSession,
+    NotAuthenticated,
     DuplicateNonce,
     NotFound,
     NoEffect,

diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
@@ -73,6 +73,7 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::InvalidCredentials => Status::Unauthorized,
             ErrorType::InvalidProperty => Status::BadRequest,
             ErrorType::InvalidSession => Status::Unauthorized,
+            ErrorType::NotAuthenticated => Status::Unauthorized,
             ErrorType::DuplicateNonce => Status::Conflict,
             ErrorType::VosoUnavailable => Status::BadRequest,
             ErrorType::NotFound => Status::NotFound,