Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative

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

@@ -114,6 +114,8 @@ pub struct AuthSessionsResponse {
 #[serde(rename_all = "camelCase")]
 pub struct AuthSessionSummaryPayload {
     pub session_id: String,
+    pub session_ids: Vec<String>,
+    pub session_count: u32,
     pub client_type: String,
     pub client_runtime: String,
     pub client_platform: String,
@@ -144,6 +146,11 @@ pub struct LogoutAllResponse {
     pub ok: bool,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub struct RevokeAuthSessionResponse {
+    pub ok: bool,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct PhoneSendCodeRequest {

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

@@ -222,12 +222,23 @@ pub struct ProfileRechargeOrderResponse {
     pub amount_cents: u64,
     pub status: String,
     pub payment_channel: String,
-    pub paid_at: String,
+    pub paid_at: Option<String>,
+    pub provider_transaction_id: Option<String>,
     pub created_at: String,
     pub points_delta: i64,
     pub membership_expires_at: Option<String>,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct WechatMiniProgramPayParamsResponse {
+    pub time_stamp: String,
+    pub nonce_str: String,
+    pub package: String,
+    pub sign_type: String,
+    pub pay_sign: String,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct ProfileRechargeCenterResponse {
@@ -253,6 +264,8 @@ pub struct CreateProfileRechargeOrderRequest {
 pub struct CreateProfileRechargeOrderResponse {
     pub order: ProfileRechargeOrderResponse,
     pub center: ProfileRechargeCenterResponse,
+    #[serde(default)]
+    pub wechat_mini_program_pay_params: Option<WechatMiniProgramPayParamsResponse>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]