Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

server-rs/crates/shared-contracts/src/auth.rs

@@ -211,8 +211,12 @@ pub struct WechatCallbackQuery {
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct WechatBindPhoneRequest {
-    pub phone: String,
-    pub code: String,
+    #[serde(default)]
+    pub phone: Option<String>,
+    #[serde(default)]
+    pub code: Option<String>,
+    #[serde(default)]
+    pub wechat_phone_code: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ -222,6 +226,20 @@ pub struct WechatBindPhoneResponse {
     pub user: AuthUserPayload,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct WechatMiniProgramLoginRequest {
+    pub code: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct WechatMiniProgramLoginResponse {
+    pub token: String,
+    pub binding_status: String,
+    pub user: AuthUserPayload,
+}
+
 pub fn build_available_login_methods(
     sms_auth_enabled: bool,
     password_auth_enabled: bool,
@@ -318,4 +336,23 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn wechat_bind_phone_request_accepts_mini_program_phone_code() {
+        let payload = serde_json::to_value(WechatBindPhoneRequest {
+            phone: None,
+            code: None,
+            wechat_phone_code: Some("wx-phone-code-001".to_string()),
+        })
+        .expect("payload should serialize");
+
+        assert_eq!(
+            payload,
+            json!({
+                "phone": null,
+                "code": null,
+                "wechatPhoneCode": "wx-phone-code-001"
+            })
+        );
+    }
 }