refactor(auth): refresh oauth callback handler
zhenyi committed
Modified lib/auth/handler/oauth/callback.rs lib/auth/handler/oauth/callback.rs +4 −4 View lib/auth/handler/oauth/callback.rs
@@ -1,4 +1,3 @@
1use axum::Json;
21use axum::extract::{Query, State};
32use axum_extra::extract::cookie::CookieJar;
43use serde::Deserialize;
@@ -7,6 +6,7 @@
76use crate::features::AuthService;
87use crate::features::oauth::types::OAuthProvider;
98use crate::features::oauth::types::{CallbackCmd, OAuthLoginResp};
9use export::data::AppResponseData;
1010
1111use super::super::cookies;
1212
@@ -26,7 +26,7 @@
2626 tag = "auth",
2727 params(CallbackQuery),
2828 responses(
29 (status = 200, description = "OAuth login completed. Returns token pair and the resolved user_id.", body = OAuthLoginResp),
29 (status = 200, description = "OAuth login completed. Returns token pair and the resolved user_id.", body = AppResponseData<OAuthLoginResp>),
3030 (status = 400, description = "Missing state cookie or invalid state.", body = super::super::openapi::ErrorBody),
3131 (status = 401, description = "OAuth flow rejected.", body = super::super::openapi::ErrorBody),
3232 ),
@@ -35,7 +35,7 @@
3535 State(svc): State<AuthService>,
3636 jar: CookieJar,
3737 Query(q): Query<CallbackQuery>,
38) -> Result<(CookieJar, Json<OAuthLoginResp>), AuthError> {
38) -> Result<(CookieJar, AppResponseData<OAuthLoginResp>), AuthError> {
3939 let cookie_name =
4040 crate::features::oauth::usecase::cookie_name(&svc.config.cookie_name_prefix, q.provider);
4141
@@ -53,5 +53,5 @@
5353
5454 let resp = svc.oauth_callback(cmd).await?;
5555 let jar = cookies::remove_cookie(jar, &cookie_name);
56 Ok((jar, Json(resp)))
56 Ok((jar, AppResponseData::ok(resp)))
5757}