From d3e88b1f7bd987ee016878ac71904bc9c82f403a Mon Sep 17 00:00:00 2001 From: Philippe Loctaux Date: Sun, 26 Mar 2023 23:35:44 +0200 Subject: [PATCH] ezidam: guards: jwt: when user token is invalid, dont outcome a failure, forward to next route --- crates/ezidam/src/guards/jwt.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/crates/ezidam/src/guards/jwt.rs b/crates/ezidam/src/guards/jwt.rs index 7781717..03d5cd9 100644 --- a/crates/ezidam/src/guards/jwt.rs +++ b/crates/ezidam/src/guards/jwt.rs @@ -27,9 +27,6 @@ pub enum Error { UserNotFound, GetUser(users::Error), RevokeRefreshTokens(refresh_tokens::Error), - UsedRefreshToken, - RevokedRefreshToken, - ExpiredRefreshToken, MarkRefreshTokenUsed(refresh_tokens::Error), GetSettings(settings::Error), ServerUrlNotSet, @@ -132,7 +129,7 @@ pub async fn validate_jwt( // Return jwt claims Ok(claims) } - Err(e) => Err(Outcome::Failure((Status::InternalServerError, e))), + Err(_e) => Err(Outcome::Forward(())), }, Err(e) => { // Failed to run blocking task @@ -223,15 +220,15 @@ pub async fn use_refresh_token( return Outcome::Failure((Status::InternalServerError, Error::CommitTransaction)); } - return Outcome::Failure((Status::InternalServerError, Error::UsedRefreshToken)); + return Outcome::Forward(()); } if refresh_token.is_revoked() { - return Outcome::Failure((Status::InternalServerError, Error::RevokedRefreshToken)); + return Outcome::Forward(()); } if refresh_token.has_expired() { - return Outcome::Failure((Status::InternalServerError, Error::ExpiredRefreshToken)); + return Outcome::Forward(()); } if let Err(e) = refresh_token.use_token(&mut transaction).await {