squid/blog
squid/blog
1
2
Fork 0
Code Issues 10 Pull Requests Actions Projects 1 Releases 7 Wiki Activity

BLOG-86 refactor: simplify auth middleware by removing unnecessary error handling and integrating user ID retrieval
All checks were successful
Frontend CI / build (push) Successful in 1m8s
Details
PR Title Check / pr-title-check (pull_request) Successful in 16s
Details

Browse Source
This commit is contained in:
SquidSpirit 2025-08-01 18:24:02 +08:00
parent eb7a3cf985
commit 04c9d4dcf0
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
backend/feature/auth/src/framework/web/auth_middleware.rs
View File

@ -1,37 +1,10 @@
use std::future::{self, Ready}; use std::future::{self, Ready};
use actix_session::SessionExt; use actix_session::SessionExt;
use actix_web::{ use actix_web::{Error, FromRequest, HttpRequest, dev::Payload, error::ErrorUnauthorized};
Error, FromRequest, HttpMessage, HttpRequest,
body::MessageBody,
dev::{Payload, ServiceRequest, ServiceResponse},
error::ErrorUnauthorized,
middleware::Next,
};
use crate::framework::web::constants::SESSION_KEY_USER_ID; use crate::framework::web::constants::SESSION_KEY_USER_ID;
pub async fn auth_middleware(
req: ServiceRequest,
next: Next<impl MessageBody>,
) -> Result<ServiceResponse<impl MessageBody>, Error> {
let session = req.get_session();
let user_id = session.get::<i32>(SESSION_KEY_USER_ID);
if user_id.is_err() {
return next.call(req).await;
}
let user_id = user_id.unwrap();
if user_id.is_none() {
return next.call(req).await;
}
let user_id = user_id.unwrap();
req.extensions_mut().insert(user_id);
next.call(req).await
}
pub struct UserId(i32); pub struct UserId(i32);
impl UserId { impl UserId {
@ -45,7 +18,12 @@ impl FromRequest for UserId {
type Future = Ready<Result<Self, Self::Error>>; type Future = Ready<Result<Self, Self::Error>>;
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
let user_id = req.extensions().get::<i32>().cloned(); let user_id_result = req.get_session().get::<i32>(SESSION_KEY_USER_ID);
let user_id = match user_id_result {
Ok(id) => id,
_ => return future::ready(Err(ErrorUnauthorized(""))),
};
match user_id { match user_id {
Some(id) => future::ready(Ok(UserId(id))), Some(id) => future::ready(Ok(UserId(id))),

6
backend/server/src/main.rs
View File

@ -5,12 +5,9 @@ use actix_web::{
App, Error, HttpServer, App, Error, HttpServer,
body::MessageBody, body::MessageBody,
dev::{ServiceFactory, ServiceRequest, ServiceResponse}, dev::{ServiceFactory, ServiceRequest, ServiceResponse},
middleware::from_fn,
web, web,
}; };
use auth::framework::web::{ use auth::framework::web::auth_web_routes::configure_auth_routes;
auth_middleware::auth_middleware, auth_web_routes::configure_auth_routes,
};
use image::framework::web::image_web_routes::configure_image_routes; use image::framework::web::image_web_routes::configure_image_routes;
use openidconnect::reqwest; use openidconnect::reqwest;
use post::framework::web::post_web_routes::configure_post_routes; use post::framework::web::post_web_routes::configure_post_routes;
@ -67,7 +64,6 @@ fn create_app(
App::new() App::new()
// The middlewares are executed in opposite order as registration. // The middlewares are executed in opposite order as registration.
.wrap(from_fn(auth_middleware))
.wrap(session_middleware_builder.build()) .wrap(session_middleware_builder.build())
.app_data(web::Data::from(container.auth_controller)) .app_data(web::Data::from(container.auth_controller))
.app_data(web::Data::from(container.image_controller)) .app_data(web::Data::from(container.image_controller))