From d942abec943464355d00d90eded5f0a914e8e758 Mon Sep 17 00:00:00 2001 From: Mudassir Date: Wed, 21 Aug 2024 23:20:11 +0800 Subject: [PATCH] fix: resolve token validator when user logout (#13) --- src/core/middlewares/auth.rs | 2 +- src/features/auth/data/repository/auth_repository_impl.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/middlewares/auth.rs b/src/core/middlewares/auth.rs index ef0ec7f..181fad9 100644 --- a/src/core/middlewares/auth.rs +++ b/src/core/middlewares/auth.rs @@ -68,7 +68,7 @@ impl FromRequest for AuthMiddleware { let user_id = di.auth_repository.verify_token(&token_data).map_err(|_| { APIError::UnauthorizedMessage { - message: "Token verification failed".to_string(), + message: "The provided token has been revoked.".to_string(), } })?; diff --git a/src/features/auth/data/repository/auth_repository_impl.rs b/src/features/auth/data/repository/auth_repository_impl.rs index 921742b..af449d6 100644 --- a/src/features/auth/data/repository/auth_repository_impl.rs +++ b/src/features/auth/data/repository/auth_repository_impl.rs @@ -121,11 +121,11 @@ impl AuthRepositoryImpl for AuthRepository { } fn is_valid_login_session(&self, user: Uuid, login_session: Uuid) -> bool { - login_history::table + !login_history::table .filter(login_history_user_id.eq(&user)) .filter(login_history_id.eq(&login_session)) - .execute(&mut self.source.get().unwrap()) - .is_ok() + .load::(&mut self.source.get().unwrap()) + .map_err(|_| APIError::InternalError).unwrap().is_empty() } fn update_password(&self, user: Uuid, params: UpdatePasswordParams) -> AppResult<()> {