后端重写提交

server-rs/crates/api-server/src/wechat_auth.rs

@@ -8,7 +8,10 @@ use module_auth::{
     AuthLoginMethod, BindWechatPhoneInput, CreateWechatAuthStateInput, WechatAuthError,
     WechatAuthScene,
 };
-use serde::{Deserialize, Serialize};
+use shared_contracts::auth::{
+    AuthUserPayload, WechatBindPhoneRequest, WechatBindPhoneResponse, WechatCallbackQuery,
+    WechatStartQuery, WechatStartResponse,
+};
 use time::OffsetDateTime;
 use url::Url;
 
@@ -19,45 +22,11 @@ use crate::{
         attach_set_cookie_header, build_refresh_session_cookie_header, create_auth_session,
     },
     http_error::AppError,
-    password_entry::PasswordEntryUserPayload,
     request_context::RequestContext,
     session_client::resolve_session_client_context,
     state::AppState,
 };
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WechatStartQuery {
-    pub redirect_path: Option<String>,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WechatStartResponse {
-    pub authorization_url: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct WechatCallbackQuery {
-    pub state: Option<String>,
-    pub code: Option<String>,
-    pub mock_code: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WechatBindPhoneRequest {
-    pub phone: String,
-    pub code: String,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WechatBindPhoneResponse {
-    pub token: String,
-    pub user: PasswordEntryUserPayload,
-}
-
 pub async fn start_wechat_login(
     State(state): State<AppState>,
     Extension(request_context): Extension<RequestContext>,
@@ -230,13 +199,13 @@ pub async fn bind_wechat_phone(
             Some(&request_context),
             WechatBindPhoneResponse {
                 token: signed_session.access_token,
-                user: PasswordEntryUserPayload {
+                user: AuthUserPayload {
                     id: result.user.id,
                     username: result.user.username,
                     display_name: result.user.display_name,
                     phone_number_masked: result.user.phone_number_masked,
-                    login_method: result.user.login_method.as_str(),
-                    binding_status: result.user.binding_status.as_str(),
+                    login_method: result.user.login_method.as_str().to_string(),
+                    binding_status: result.user.binding_status.as_str().to_string(),
                     wechat_bound: result.user.wechat_bound,
                 },
             },