📝 除了 oauth 入口路由以外，其余的所有接口路由将强制验证身份。

Author: langyo

packages/router/src/middlewares/auth_extrator.rs

@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 
 use axum::{
     extract::FromRequestParts,
@@ -15,7 +15,7 @@ use _utils::{
     models::CommonResponse,
 };
 
-pub struct ExtractAuthInfo(pub Option<AuthInfo>);
+pub struct ExtractAuthInfo(pub AuthInfo);
 
 impl<S> FromRequestParts<S> for ExtractAuthInfo
 where
@@ -37,14 +37,22 @@ where
                     .into_response()
             })?;
 
-            return Ok(Self(Some(AuthInfo {
+            return Ok(Self(AuthInfo {
                 token,
                 user_id: claims.sub,
                 created_at: claims.iat,
                 expires_at: claims.exp,
-            })));
+            }));
         }
 
-        Ok(Self(None))
+        let ret = (
+            StatusCode::UNAUTHORIZED,
+            serde_json::to_string(
+                &CommonResponse::<()>::new(Err(anyhow!("No Authorization header found")))
+                    .with_status(StatusCode::UNAUTHORIZED.as_u16()),
+            )
+            .expect("Failed to serialize error response"),
+        );
+        Err(ret.into_response())
     }
 }

packages/router/src/routes/mod.rs

@@ -5,11 +5,12 @@ use anyhow::Result;
 
 use axum::{
     extract::DefaultBodyLimit, http::StatusCode, middleware::from_extractor,
-    response::IntoResponse, Router,
+    response::IntoResponse, routing::post, Router,
 };
 
 pub async fn router() -> Result<Router> {
     let ret = Router::new()
+        .route("/oauth/token", post(system::oauth::oauth))
         .merge(system::router().await?)
         .merge(api::router().await?)
         .fallback(|| async { (StatusCode::NOT_IMPLEMENTED, "Not Implemented").into_response() })

packages/router/src/routes/system/mod.rs

@@ -2,7 +2,7 @@ mod action_log;
 mod archive;
 mod device;
 mod invitation;
-mod oauth;
+pub mod oauth;
 mod role;
 mod user;
 
@@ -11,7 +11,7 @@ use anyhow::Result;
 use axum::{routing::post, Router};
 
 pub async fn router() -> Result<Router> {
-    let ret = Router::new().route("/oauth/token", post(oauth::oauth));
+    let ret = Router::new();
 
     Ok(ret)
 }

packages/utils/src/models/wrapper.rs

@@ -32,21 +32,24 @@ impl<T> CommonResponse<T> {
         }
     }
 
-    pub fn new_with_users(result: Result<T>, users: Vec<SysUserVO>) -> Self {
-        match result {
-            Ok(data) => Self {
-                error: false,
-                data: Some(data),
-                users,
-                ..Default::default()
-            },
-            Err(err) => Self {
-                error: true,
-                message: err.to_string(),
-                users,
-                ..Default::default()
-            },
-        }
+    pub fn with_users(mut self, users: Vec<SysUserVO>) -> Self {
+        self.users = users;
+        self
+    }
+
+    pub fn with_status(mut self, status: u16) -> Self {
+        self.error_status = status;
+        self
+    }
+
+    pub fn with_error_data(mut self, error_data: serde_json::Value) -> Self {
+        self.error_data = Some(error_data);
+        self
+    }
+
+    pub fn with_message(mut self, message: String) -> Self {
+        self.message = message;
+        self
     }
 }
 
@@ -66,7 +69,7 @@ impl<T> Default for CommonResponse<T> {
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Page {
+pub struct Pagination {
     pub current: u32,
     pub size: u32,
 }