Proposal for new auto discovery results

wp_api/src/login.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use wp_serde_helper::deserialize_i64_or_string;
 
 pub use login_client::WpLoginClient;
-pub use url_discovery::{UrlDiscoveryState, UrlDiscoverySuccess};
+pub use url_discovery::{UrlDiscoveryError, UrlDiscoveryState, UrlDiscoverySuccess};
 
 use crate::ParsedUrl;
 use crate::WpUuid;

wp_api/src/login/url_discovery.rs

@@ -9,6 +9,35 @@ use super::WpApiDetails;
 
 const API_ROOT_LINK_HEADER: &str = "https://api.w.org/";
 
+#[uniffi::export]
+fn new_api_discovery(site_url: String) -> NewUrlDiscoveryResult {
+    todo!()
+}
+
+#[derive(Debug, uniffi::Record)]
+pub struct NewUrlDiscoveryResult {
+    pub user_input_attempt: NewUrlDiscoveryAttemptResult,
+    pub other_successful_attempts: Vec<NewUrlDiscoveryAttemptResult>,
+    pub other_failed_attempts: Vec<NewUrlDiscoveryAttemptResult>,
+}
+
+#[derive(Debug, uniffi::Record)]
+pub struct NewUrlDiscoveryAttemptResult {
+    pub is_network_error: bool,
+    pub is_successful: bool,
+    pub is_the_site_url_same_as_the_user_input: bool,
+    pub is_failed_to_parse_site_url: bool,
+    pub is_failed_to_parsed_api_root: bool,
+    pub is_failed_to_parsed_api_details: bool,
+    pub has_found_api_root_url: bool,
+    pub input_url: String,
+    pub parsed_site_url: Option<Arc<ParsedUrl>>,
+    pub api_root_url: Option<Arc<ParsedUrl>>,
+    pub api_details: Option<Arc<WpApiDetails>>,
+    // TODO: Not sure about the type for this
+    pub errors: u32,
+}
+
 pub fn construct_attempts(input_site_url: String) -> Vec<String> {
     let mut attempts = vec![input_site_url.clone()];
     if !input_site_url.starts_with("http") {

wp_api_integration_tests/Cargo.toml

@@ -13,7 +13,7 @@ async-trait = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 futures = { workspace = true }
 http = { workspace = true }
-reqwest = { workspace = true, features = [ "multipart", "json", "stream" ] }
+reqwest = { workspace = true, features = [ "multipart", "json", "stream", "gzip", "brotli", "zstd", "deflate" ] }
 serde = { workspace = true, features = [ "derive" ] }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = [ "full" ] }

wp_api_integration_tests/tests/test_login_err.rs

@@ -0,0 +1,18 @@
+use rstest::rstest;
+use serial_test::parallel;
+use std::sync::Arc;
+use wp_api::login::{UrlDiscoveryError, WpLoginClient};
+use wp_api_integration_tests::AsyncWpNetworking;
+
+#[rstest]
+#[case("http://optional-https.wpmt.co")] // Fails because it's `http`
+#[tokio::test]
+#[parallel]
+async fn test_login_flow_err_url_discovery_failed(#[case] site_url: &str) {
+    let client = WpLoginClient::new(Arc::new(AsyncWpNetworking::default()));
+    let err = client
+        .api_discovery(site_url.to_string())
+        .await
+        .unwrap_err();
+    assert!(matches!(err, UrlDiscoveryError::UrlDiscoveryFailed { .. }));
+}

wp_api_integration_tests/tests/test_login_immut.rs

@@ -7,6 +7,7 @@ use wp_api_integration_tests::{AssertResponse, AsyncWpNetworking};
 const LOCALHOST_AUTH_URL: &str = "http://localhost/wp-admin/authorize-application.php";
 const AUTOMATTIC_WIDGETS_AUTH_URL: &str =
     "https://automatticwidgets.wpcomstaging.com/wp-admin/authorize-application.php";
+const VANILLA_WP_SITE_URL: &str = "https://vanilla.wpmt.co/wp-admin/authorize-application.php";
 
 #[rstest]
 #[case("http://localhost", LOCALHOST_AUTH_URL)]
@@ -35,6 +36,20 @@ const AUTOMATTIC_WIDGETS_AUTH_URL: &str =
     AUTOMATTIC_WIDGETS_AUTH_URL
 )]
 #[case("automatticwidgets.wpcomstaging.com/ ", AUTOMATTIC_WIDGETS_AUTH_URL)]
+#[case("vanilla.wpmt.co", VANILLA_WP_SITE_URL)]
+#[case("http://vanilla.wpmt.co", VANILLA_WP_SITE_URL)]
+#[case(
+    "https://optional-https.wpmt.co",
+    "https://optional-https.wpmt.co/wp-admin/authorize-application.php"
+)]
+#[case(
+    "https://わぷー.wpmt.co",
+    "https://xn--39j4bws.wpmt.co/wp-admin/authorize-application.php"
+)]
+#[case(
+    "https://jetpack.wpmt.co",
+    "https://jetpack.wpmt.co/wp-admin/authorize-application.php"
+)]
 #[tokio::test]
 #[parallel]
 async fn test_login_flow(#[case] site_url: &str, #[case] expected_auth_url: &str) {