Rework auto discovery experience (#514)

* Rework auto discovery Rust types (#513)

* Adds auto discovery attempt type

* Remove state machine from login auto discovery

* Rework auto discovery results

* Implement helpers for AutoDiscoveryAttemptResult & AutoDiscoveryAttemptFailure

* Rename AutoDiscoveryAttemptType::Original as UserInput

* Add attempt specific fields to AutoDiscoveryUniffiResult

* Request execution failure reason and redirects (#516)

* Introduces RequestExecutionErrorReason

* Optionally track redirects in RequestExecutionError

* Refactor auto discovery attempt to have a separate `find_api_root_url` helper (#518)

* Refactor auto discovery attempt to have a separate `find_api_root_url` helper

* Remove an incorrect use statement from login_client

* Add Invalid SSL support and redirect tracking in Swift (#517)

* Introduce request ID

This is probably not the right way to do it, but it works for now

* Add HTTPs error data and redirect tracking

* Delete unneeded code

* Add `WpRedirect`

* Adopt intermediate API

* Move x509 parsing into Rust

* Better Rust error handling

* Remove unused tests

* Fix Linux and iOS support

* Fix Linux Tests

* Update wp_api/src/request.rs

Co-authored-by: Oguz Kocer <[email protected]>

* Refactor ssl module (#521)

Co-authored-by: Oguz Kocer <[email protected]>

* Clean up todo

* fix linter issues

---------

Co-authored-by: Oguz Kocer <[email protected]>
Co-authored-by: Oguz Kocer <[email protected]>

* Address Kotlin breaking changes in api discovery and RequestExecutionError (#522)

* Change `SSLCertificateInfo` to be a `uniffi::object` (#524)

* Change `SSLCertificateInfo` to be `uniffi::Object`

* Fix cargo fmt warning in wordpress_org/client.rs

* Fix Swift issues

* Fix tvOS target

* Fix watchOS tests

* Fix watchOS errors

---------

Co-authored-by: Jeremy Massel <[email protected]>

Author: oguzkocer

Cargo.lock

@@ -47,3 +47,4 @@ trybuild = "1.0"
 uniffi = "0.28"
 url = "2.5"
 uuid = "1.12"
+x509-cert = "0.3.0-pre.0"

Cargo.toml

@@ -1,5 +1,5 @@
 {
-  "originHash" : "4c30bcea863fdb29514c7daf20b8911f79465cc6626c1c7fdc311c43d9a8367a",
+  "originHash" : "f97c4d6141e489daa1b3e5f1731aa4f6ea41d76057f9b254fb8e555c3e14de7b",
   "pins" : [
     {
       "identity" : "collectionconcurrencykit",

Package.resolved

@@ -17,9 +17,9 @@ let libwordpressFFI: Target = libwordpressFFIVersion.target
 var package = Package(
     name: "WordPressAPI",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v15),
         .macOS(.v11),
-        .tvOS(.v13),
+        .tvOS(.v15),
         .watchOS(.v8)
     ],
     products: [

Package.swift

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

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

@@ -40,6 +40,7 @@ constructor(
                 )
                 is WpApiException.RequestExecutionFailed -> WpRequestResult.RequestExecutionFailed(
                     statusCode = exception.statusCode,
+                    redirects = exception.redirects,
                     reason = exception.reason
                 )
                 is WpApiException.MediaFileNotFound -> WpRequestResult.MediaFileNotFound(

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

@@ -3,10 +3,9 @@ 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.RequestExecutor
 import uniffi.wp_api.UniffiWpLoginClient
-import uniffi.wp_api.UrlDiscoveryException
-import uniffi.wp_api.UrlDiscoverySuccess
 
 class WpLoginClient(
     private val requestExecutor: RequestExecutor = WpRequestExecutor(),
@@ -16,11 +15,7 @@ class WpLoginClient(
         UniffiWpLoginClient(requestExecutor)
     }
 
-    suspend fun apiDiscovery(siteUrl: String): Result<UrlDiscoverySuccess> = withContext(dispatcher) {
-        try {
-            Result.success(internalClient.apiDiscovery(siteUrl))
-        } catch (e: UrlDiscoveryException) {
-            Result.failure(e)
-        }
+    suspend fun apiDiscovery(siteUrl: String): AutoDiscoveryUniffiResult = withContext(dispatcher) {
+        internalClient.apiDiscovery(siteUrl)
     }
 }

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

@@ -1,6 +1,8 @@
 package rs.wordpress.api.kotlin
 
+import uniffi.wp_api.RequestExecutionErrorReason
 import uniffi.wp_api.WpErrorCode
+import uniffi.wp_api.WpRedirect
 
 sealed class WpRequestResult<T> {
     data class WpRequestSuccess<T>(val data: T) : WpRequestResult<T>()
@@ -17,7 +19,8 @@ sealed class WpRequestResult<T> {
 
     data class RequestExecutionFailed<T>(
         val statusCode: UShort?,
-        val reason: String,
+        val redirects: List<WpRedirect>?,
+        val reason: RequestExecutionErrorReason,
     ) : WpRequestResult<T>()
 
     data class MediaFileNotFound<T>(

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

@@ -18,9 +18,7 @@ public typealias WpNetworkHeaderMap = WordPressAPIInternal.WpNetworkHeaderMap
 
 public typealias WpApiApplicationPasswordDetails = WordPressAPIInternal.WpApiApplicationPasswordDetails
 public typealias WpAuthentication = WordPressAPIInternal.WpAuthentication
-public typealias UrlDiscoveryError = WordPressAPIInternal.UrlDiscoveryError
-public typealias UrlDiscoverySuccess = WordPressAPIInternal.UrlDiscoverySuccess
-public typealias UrlDiscoveryAttemptError = WordPressAPIInternal.UrlDiscoveryAttemptError
+public typealias SSLCertificateInfo = WordPressAPIInternal.SslCertificateInfo
 
 // MARK: - Users