后端重写提交

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

@@ -7,8 +7,11 @@ use axum::{
 use module_auth::{
     AuthLoginMethod, PhoneAuthError, PhoneAuthScene, PhoneLoginInput, SendPhoneCodeInput,
 };
-use serde::{Deserialize, Serialize};
 use serde_json::json;
+use shared_contracts::auth::{
+    AuthUserPayload, PhoneLoginRequest, PhoneLoginResponse, PhoneSendCodeRequest,
+    PhoneSendCodeResponse,
+};
 use time::OffsetDateTime;
 
 use crate::{
@@ -17,42 +20,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 PhoneSendCodeRequest {
-    pub phone: String,
-    pub scene: Option<String>,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PhoneSendCodeResponse {
-    pub ok: bool,
-    pub cooldown_seconds: u64,
-    pub expires_in_seconds: u64,
-    pub provider_request_id: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PhoneLoginRequest {
-    pub phone: String,
-    pub code: String,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PhoneLoginResponse {
-    pub token: String,
-    pub user: PasswordEntryUserPayload,
-}
-
 pub async fn send_phone_code(
     State(state): State<AppState>,
     Extension(request_context): Extension<RequestContext>,
@@ -130,13 +102,13 @@ pub async fn phone_login(
             Some(&request_context),
             PhoneLoginResponse {
                 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,
                 },
             },