Trying to fix not returning errors

GPeaky · Dec 11, 2023 · 1a47728 · 1a47728
1 parent 5f4f93b
commit 1a47728
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/middlewares/admin.rs b/src/middlewares/admin.rs
@@ -34,11 +34,11 @@ where
         ctx: ServiceCtx<'a, Self>,
     ) -> Self::Future<'_> {
         let Some(user) = req.extensions().get::<UserExtension>().cloned() else {
-            return Box::pin(async { Err(UserError::Unauthorized)? });
+            return Box::pin(async { Err(web::Error::from(UserError::Unauthorized))? });
         };
 
         if user.role != Role::Admin {
-            return Box::pin(async { Err(UserError::Unauthorized)? });
+            return Box::pin(async { Err(web::Error::from(UserError::Unauthorized))? });
         }
 
         Box::pin(ctx.call(&self.service, req))

diff --git a/src/middlewares/authenticated.rs b/src/middlewares/authenticated.rs
@@ -47,13 +47,15 @@ where
         let header = req.headers().get("Authorization").cloned();
 
         let fut = async move {
-            let state = state.ok_or(CommonError::InternalServerError)?;
+            let state = state.ok_or(web::Error::from(CommonError::InternalServerError))?;
             let header = {
-                let header = header.ok_or(TokenError::MissingToken)?;
-                let header_str = header.to_str().map_err(|_| TokenError::InvalidToken)?;
+                let header = header.ok_or(web::Error::from(TokenError::MissingToken))?;
+                let header_str = header
+                    .to_str()
+                    .map_err(|_| web::Error::from(TokenError::InvalidToken))?;
 
                 if !header_str.starts_with(BEARER_PREFIX) {
-                    return Err(TokenError::InvalidToken.into());
+                    return Err(web::Error::from(TokenError::InvalidToken));
                 }
 
                 header_str[BEARER_PREFIX.len()..].to_string()
@@ -64,7 +66,7 @@ where
                 .user_repository
                 .find(&id)
                 .await?
-                .ok_or(UserError::NotFound)?;
+                .ok_or(web::Error::from(UserError::NotFound))?;
 
             if !user.active {
                 return Err(web::Error::from(UserError::NotVerified));