Simplify uniffi api discovery result

native/kotlin/api/kotlin/src/integrationTest/kotlin/ApiUrlDiscoveryTest.kt

@@ -11,15 +11,13 @@ class ApiUrlDiscoveryTest {
     fun testFindsCorrectApiUrls() = runTest {
         val apiDiscoveryResult =
             loginClient.apiDiscovery("https://automatticwidgets.wpcomstaging.com/")
-        assert(apiDiscoveryResult.isSuccessful)
         assertEquals(
             "https://automatticwidgets.wpcomstaging.com/wp-json/",
-            apiDiscoveryResult.successfulAttempt?.apiRootUrl()?.url()
+            apiDiscoveryResult.apiRootUrl.url()
         )
         assertEquals(
             "https://automatticwidgets.wpcomstaging.com/wp-admin/authorize-application.php",
-            apiDiscoveryResult.successfulAttempt?.apiDetails()
-                ?.findApplicationPasswordsAuthenticationUrl()
+            apiDiscoveryResult.apiDetails.findApplicationPasswordsAuthenticationUrl()
         )
     }
 }

native/kotlin/api/kotlin/src/main/kotlin/rs/wordpress/api/kotlin/WpLoginClient.kt

@@ -3,7 +3,7 @@ package rs.wordpress.api.kotlin
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import uniffi.wp_api.AutoDiscoveryUniffiResult
+import uniffi.wp_api.AutoDiscoveryAttemptSuccess
 import uniffi.wp_api.RequestExecutor
 import uniffi.wp_api.UniffiWpLoginClient
 import uniffi.wp_api.WpApiMiddlewarePipeline
@@ -16,7 +16,7 @@ class WpLoginClient(
     private val internalClient: UniffiWpLoginClient =
         UniffiWpLoginClient(requestExecutor, middlewarePipeline)
 
-    suspend fun apiDiscovery(siteUrl: String): AutoDiscoveryUniffiResult = withContext(dispatcher) {
+    suspend fun apiDiscovery(siteUrl: String): AutoDiscoveryAttemptSuccess = withContext(dispatcher) {
         internalClient.apiDiscovery(siteUrl)
     }
 }

wp_api/Cargo.toml

@@ -18,6 +18,7 @@ chrono = { workspace = true, features = [ "serde" ] }
 futures = { workspace = true }
 http = { workspace = true }
 indoc = { workspace = true }
+itertools = { workspace = true }
 url = { workspace = true }
 parse_link_header = { workspace = true }
 paste = { workspace = true }

wp_api/src/api_error.rs

@@ -483,7 +483,7 @@ pub enum RequestExecutionErrorReason {
     MisconfiguredHttpAuthenticationError {
         issue: HttpAuthMethodParsingError,
     },
-    MisconfiguredRateLimitError {},
+    MisconfiguredRateLimitError,
     DeviceIsOfflineError {
         error_message: String,
     },

wp_api/src/login/login_client.rs

@@ -3,8 +3,8 @@ use super::{
     url_discovery::{
         self, API_ROOT_LINK_HEADER, ApiRootUrl, ApplicationPasswordsNotSupportedReason,
         AutoDiscoveryAttempt, AutoDiscoveryAttemptFailure, AutoDiscoveryAttemptResult,
-        AutoDiscoveryAttemptSuccess, AutoDiscoveryResult, AutoDiscoveryUniffiResult,
-        FetchAndParseApiRootFailure, FindApiRootFailure, ParseHomepageResult,
+        AutoDiscoveryAttemptSuccess, AutoDiscoveryResult, FetchAndParseApiRootFailure,
+        FindApiRootFailure, ParseHomepageResult,
     },
 };
 use crate::{
@@ -36,8 +36,16 @@ impl UniffiWpLoginClient {
         }
     }
 
-    async fn api_discovery(&self, site_url: String) -> AutoDiscoveryUniffiResult {
-        self.inner.api_discovery(site_url).await.into()
+    async fn api_discovery(
+        &self,
+        site_url: String,
+    ) -> Result<AutoDiscoveryAttemptSuccess, AutoDiscoveryAttemptFailure> {
+        self.inner
+            .api_discovery(site_url)
+            .await
+            .combined_result()
+            .cloned()
+            .map_err(|e| e.clone())
     }
 }
 
@@ -215,7 +223,7 @@ impl WpLoginClient {
             Ok(AutoDiscoveryAttemptSuccess {
                 parsed_site_url,
                 api_root_url: Arc::clone(&api_root_url.0),
-                api_details,
+                api_details: Arc::new(api_details),
             })
         }
     }