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

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

@@ -215,7 +215,7 @@ mod tests {
     use serde_json::json;
 
     #[test]
-    fn available_login_methods_keep_phone_then_wechat_order() {
+    fn available_login_methods_keep_phone_password_wechat_order() {
         let methods = build_available_login_methods(true, true, true);
 
         assert_eq!(
@@ -228,6 +228,13 @@ mod tests {
         );
     }
 
+    #[test]
+    fn available_login_methods_keep_password_as_default_entry() {
+        let methods = build_available_login_methods(false, true, false);
+
+        assert_eq!(methods, vec![AUTH_LOGIN_METHOD_PASSWORD.to_string()]);
+    }
+
     #[test]
     fn password_entry_request_uses_camel_case_fields() {
         let payload = serde_json::to_value(PasswordEntryRequest {

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

@@ -26,13 +26,6 @@ pub struct ExecuteBigFishActionRequest {
     pub motion_key: Option<String>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct SubmitBigFishInputRequest {
-    pub x: f32,
-    pub y: f32,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct BigFishAnchorItemResponse {
@@ -169,47 +162,6 @@ pub struct BigFishActionResponse {
     pub session: BigFishSessionSnapshotResponse,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct BigFishVector2Response {
-    pub x: f32,
-    pub y: f32,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct BigFishRuntimeEntityResponse {
-    pub entity_id: String,
-    pub level: u32,
-    pub position: BigFishVector2Response,
-    pub radius: f32,
-    pub offscreen_seconds: f32,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct BigFishRuntimeSnapshotResponse {
-    pub run_id: String,
-    pub session_id: String,
-    pub status: String,
-    pub tick: u64,
-    pub player_level: u32,
-    pub win_level: u32,
-    pub leader_entity_id: Option<String>,
-    pub owned_entities: Vec<BigFishRuntimeEntityResponse>,
-    pub wild_entities: Vec<BigFishRuntimeEntityResponse>,
-    pub camera_center: BigFishVector2Response,
-    pub last_input: BigFishVector2Response,
-    pub event_log: Vec<String>,
-    pub updated_at: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct BigFishRunResponse {
-    pub run: BigFishRuntimeSnapshotResponse,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;