Fix an issue where plugin update checks may fail (#533)

Author: jkmassel

wp_api/src/wordpress_org/plugin_directory.rs

@@ -107,9 +107,9 @@ pub struct Screenshot {
 
 #[derive(Deserialize, Debug, Eq, PartialEq, Default, uniffi::Record)]
 pub struct Banners {
-    #[serde(deserialize_with = "deserialize_default_values")]
+    #[serde(deserialize_with = "deserialize_default_values", alias = "1x")]
     pub low: String,
-    #[serde(deserialize_with = "deserialize_default_values")]
+    #[serde(deserialize_with = "deserialize_default_values", alias = "2x")]
     pub high: String,
 }
 
@@ -324,4 +324,12 @@ mod tests {
         let parsed = serde_json::from_str::<QueryPluginResponse>(json_string);
         assert!(parsed.is_ok(), "Failed to parse JSON: {:?}", parsed.err());
     }
+
+    #[test]
+    fn plugin_directory_single_plugin_case_1() {
+        let json_string =
+            include_str!("../../tests/plugin-directory/plugin_directory_single_plugin_case_1.json");
+        let parsed = serde_json::from_str::<PluginInformation>(json_string);
+        assert!(parsed.is_ok(), "Failed to parse JSON: {:?}", parsed.err());
+    }
 }

wp_api/src/wordpress_org/update_check.rs

@@ -304,4 +304,12 @@ mod tests {
 
         assert_eq!(body_map.get("all").unwrap(), "true");
     }
+
+    #[test]
+    fn plugin_directory_single_plugin_case_1() {
+        let json_string =
+            include_str!("../../tests/plugin-directory/plugin_update_check_case_1.json");
+        let parsed = serde_json::from_str::<UpdateCheckResponse>(json_string);
+        assert!(parsed.is_ok(), "Failed to parse JSON: {:?}", parsed.err());
+    }
 }

wp_api/tests/plugin-directory/plugin_directory_single_plugin_case_1.json

@@ -0,0 +1,83 @@
+{
+  "plugins": {
+    "akismet\/akismet.php": {
+      "id": "w.org\/plugins\/akismet",
+      "slug": "akismet",
+      "plugin": "akismet\/akismet.php",
+      "new_version": "5.3.6",
+      "url": "https:\/\/wordpress.org\/plugins\/akismet\/",
+      "package": "https:\/\/downloads.wordpress.org\/plugin\/akismet.5.3.6.zip",
+      "icons": {
+        "2x": "https:\/\/ps.w.org\/akismet\/assets\/icon-256x256.png?rev=2818463",
+        "1x": "https:\/\/ps.w.org\/akismet\/assets\/icon-128x128.png?rev=2818463"
+      },
+      "banners": {
+        "2x": "https:\/\/ps.w.org\/akismet\/assets\/banner-1544x500.png?rev=2900731",
+        "1x": "https:\/\/ps.w.org\/akismet\/assets\/banner-772x250.png?rev=2900731"
+      },
+      "banners_rtl": [],
+      "requires": "5.8",
+      "tested": "6.7.1",
+      "requires_php": "5.6.20",
+      "requires_plugins": [],
+      "compatibility": []
+    }
+  },
+  "translations": [],
+  "no_update": {
+    "classic-editor\/classic-editor.php": {
+      "id": "w.org\/plugins\/classic-editor",
+      "slug": "classic-editor",
+      "plugin": "classic-editor\/classic-editor.php",
+      "new_version": "1.6.7",
+      "url": "https:\/\/wordpress.org\/plugins\/classic-editor\/",
+      "package": "https:\/\/downloads.wordpress.org\/plugin\/classic-editor.1.6.7.zip",
+      "icons": {
+        "2x": "https:\/\/ps.w.org\/classic-editor\/assets\/icon-256x256.png?rev=1998671",
+        "1x": "https:\/\/ps.w.org\/classic-editor\/assets\/icon-128x128.png?rev=1998671"
+      },
+      "banners": {
+        "2x": "https:\/\/ps.w.org\/classic-editor\/assets\/banner-1544x500.png?rev=1998671",
+        "1x": "https:\/\/ps.w.org\/classic-editor\/assets\/banner-772x250.png?rev=1998676"
+      },
+      "banners_rtl": [],
+      "requires": "4.9"
+    },
+    "hello.php": {
+      "id": "w.org\/plugins\/hello-dolly",
+      "slug": "hello-dolly",
+      "plugin": "hello.php",
+      "new_version": "1.7.2",
+      "url": "https:\/\/wordpress.org\/plugins\/hello-dolly\/",
+      "package": "https:\/\/downloads.wordpress.org\/plugin\/hello-dolly.1.7.3.zip",
+      "icons": {
+        "2x": "https:\/\/ps.w.org\/hello-dolly\/assets\/icon-256x256.jpg?rev=2052855",
+        "1x": "https:\/\/ps.w.org\/hello-dolly\/assets\/icon-128x128.jpg?rev=2052855"
+      },
+      "banners": {
+        "2x": "https:\/\/ps.w.org\/hello-dolly\/assets\/banner-1544x500.jpg?rev=2645582",
+        "1x": "https:\/\/ps.w.org\/hello-dolly\/assets\/banner-772x250.jpg?rev=2052855"
+      },
+      "banners_rtl": [],
+      "requires": "4.6"
+    },
+    "hello-dolly\/hello.php": {
+      "id": "w.org\/plugins\/hello-dolly",
+      "slug": "hello-dolly",
+      "plugin": "hello-dolly\/hello.php",
+      "new_version": "1.7.2",
+      "url": "https:\/\/wordpress.org\/plugins\/hello-dolly\/",
+      "package": "https:\/\/downloads.wordpress.org\/plugin\/hello-dolly.1.7.3.zip",
+      "icons": {
+        "2x": "https:\/\/ps.w.org\/hello-dolly\/assets\/icon-256x256.jpg?rev=2052855",
+        "1x": "https:\/\/ps.w.org\/hello-dolly\/assets\/icon-128x128.jpg?rev=2052855"
+      },
+      "banners": {
+        "2x": "https:\/\/ps.w.org\/hello-dolly\/assets\/banner-1544x500.jpg?rev=2645582",
+        "1x": "https:\/\/ps.w.org\/hello-dolly\/assets\/banner-772x250.jpg?rev=2052855"
+      },
+      "banners_rtl": [],
+      "requires": "4.6"
+    }
+  }
+}

wp_api/tests/plugin-directory/plugin_update_check_case_1.json

@@ -6,6 +6,7 @@ use wp_api::wordpress_org::{
     },
     plugin_directory::PluginInformation,
 };
+
 use wp_api_integration_tests::AsyncWpNetworking;
 
 const FETCH_PLUGIN_INFORMATION_RETRY_COUNT: usize = 5;