Using proper errors when discovering Applicatin Password URL (#21876)

* Updating version and using proper errors

* Minor cleaning

* Adding tests

* detekt

Author: adalpari

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt

@@ -59,6 +59,7 @@ import javax.inject.Named
 import androidx.core.content.edit
 import kotlinx.coroutines.withContext
 import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import rs.wordpress.api.kotlin.ApiDiscoveryResult
 
 @Suppress("LargeClass", "LongMethod", "LongParameterList")
 class MySiteViewModel @Inject constructor(
@@ -248,17 +249,37 @@ class MySiteViewModel @Inject constructor(
     @Suppress("TooGenericExceptionCaught")
     private suspend fun getAuthorizationUrlComplete(siteUrl: String): String = withContext(bgDispatcher) {
         try {
-            val urlDiscovery = wpLoginClient.apiDiscovery(siteUrl)
-            val authorizationUrl = urlDiscovery.apiDetails.findApplicationPasswordsAuthenticationUrl()
-            val authorizationUrlComplete =
-                applicationPasswordLoginHelper.appendParamsToRestAuthorizationUrl(authorizationUrl)
-            Log.d("WP_RS", "Found authorization for ${siteUrl} URL: $authorizationUrlComplete")
-            AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_SUCCESSFUL)
-            authorizationUrlComplete
+            getAuthorizationUrlCompleteInternal(siteUrl)
         } catch (throwable: Throwable) {
-            Log.e("WP_RS", "VM: Error during API discovery for ${siteUrl}", throwable)
-            AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_FAILED)
-            ""
+            handleAuthenticationDiscoveryError(siteUrl, throwable)
+        }
+    }
+
+    private fun handleAuthenticationDiscoveryError(siteUrl: String, throwable: Throwable): String {
+        Log.e("WP_RS", "VM: Error during API discovery for $siteUrl", throwable)
+        AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_FAILED)
+        return ""
+    }
+
+    private suspend fun getAuthorizationUrlCompleteInternal(siteUrl: String): String = withContext(bgDispatcher) {
+            when (val urlDiscoveryResult = wpLoginClient.apiDiscovery(siteUrl)) {
+                is ApiDiscoveryResult.Success -> {
+                    val authorizationUrl = urlDiscoveryResult.success.applicationPasswordsAuthenticationUrl.url()
+                    val authorizationUrlComplete =
+                        applicationPasswordLoginHelper.appendParamsToRestAuthorizationUrl(authorizationUrl)
+                    Log.d("WP_RS", "Found authorization for $siteUrl URL: $authorizationUrlComplete")
+                    AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_SUCCESSFUL)
+                    authorizationUrlComplete
+                }
+
+                is ApiDiscoveryResult.FailureFetchAndParseApiRoot ->
+                    handleAuthenticationDiscoveryError(siteUrl, Exception("FailureFetchAndParseApiRoot"))
+
+                is ApiDiscoveryResult.FailureFindApiRoot ->
+                    handleAuthenticationDiscoveryError(siteUrl, Exception("FailureFindApiRoot"))
+
+                is ApiDiscoveryResult.FailureParseSiteUrl ->
+                    handleAuthenticationDiscoveryError(siteUrl, urlDiscoveryResult.error)
         }
     }
 

WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt

@@ -64,8 +64,10 @@ import org.wordpress.android.util.QuickStartUtilsWrapper
 import org.wordpress.android.util.SnackbarSequencer
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.config.LandOnTheEditorFeatureConfig
+import rs.wordpress.api.kotlin.ApiDiscoveryResult
 import rs.wordpress.api.kotlin.WpLoginClient
 import uniffi.wp_api.AutoDiscoveryAttemptSuccess
+import uniffi.wp_api.ParseUrlException
 import uniffi.wp_api.ParsedUrl
 import uniffi.wp_api.WpApiDetails
 import java.util.Date
@@ -163,6 +165,9 @@ class MySiteViewModelTest : BaseUnitTest() {
     @Mock
     lateinit var wpApiDetails: WpApiDetails
 
+    @Mock
+    lateinit var authParsedUrl: ParsedUrl
+
     @Mock
     lateinit var sharedPreferences: SharedPreferences
 
@@ -730,13 +735,16 @@ class MySiteViewModelTest : BaseUnitTest() {
         ).thenReturn(false)
         whenever(wpLoginClient.apiDiscovery(eq(TEST_URL)))
             .thenReturn(
-                AutoDiscoveryAttemptSuccess(
-                    ParsedUrl(Pointer.createConstant(1)),
-                    ParsedUrl(Pointer.createConstant(1)),
-                    wpApiDetails
+                ApiDiscoveryResult.Success(
+                    AutoDiscoveryAttemptSuccess(
+                        ParsedUrl(Pointer.createConstant(1)),
+                        ParsedUrl(Pointer.createConstant(1)),
+                        wpApiDetails,
+                        authParsedUrl
+                    )
                 )
             )
-        whenever(wpApiDetails.findApplicationPasswordsAuthenticationUrl()).thenReturn(TEST_URL_AUTH)
+        whenever(authParsedUrl.url()).thenReturn(TEST_URL_AUTH)
         whenever(applicationPasswordLoginHelper.appendParamsToRestAuthorizationUrl(any()))
             .thenReturn("$TEST_URL_AUTH$TEST_URL_AUTH_SUFFIX")
 
@@ -746,6 +754,30 @@ class MySiteViewModelTest : BaseUnitTest() {
         verify(wpLoginClient).apiDiscovery(eq(TEST_URL))
     }
 
+    @Test
+    fun `given login scenario, when api discovery is failed, then show nothing`() = runTest {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteTest)
+        whenever(sharedPreferences.getBoolean(
+            eq(FIRST_TIME_SITE_OPENED_SP_TAG),
+            eq(false))
+        ).thenReturn(true)
+        whenever(sharedPreferences.getBoolean(
+            eq(SKIPPED_SITE_SP_TAG),
+            eq(false))
+        ).thenReturn(false)
+        whenever(wpLoginClient.apiDiscovery(eq(TEST_URL)))
+            .thenReturn(
+                ApiDiscoveryResult.FailureParseSiteUrl(
+                    ParseUrlException.Generic("")
+                )
+            )
+
+        viewModel.runApplicationPasswordDiscovery()
+
+        assertThat(showApplicationPasswordLoginDialog).isEmpty()
+        verify(wpLoginClient).apiDiscovery(eq(TEST_URL))
+    }
+
     @Test
     fun `given login scenario, when api discovery is fails, then return empty authentication url`() = runTest {
         whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteTest)

gradle/libs.versions.toml

@@ -78,7 +78,7 @@ indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
 jackson-databind = '2.12.7.1'
 java = '11'
 jetty-webapp = '9.4.51.v20230217'
-jna = '5.15.0@aar'
+jna = '5.17.0@aar'
 json-path = '2.9.0'
 jsoup = '1.20.1'
 junit = '4.13.2'
@@ -103,7 +103,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-lint = '2.1.0'
 wordpress-persistent-edittext = '1.0.2'
-wordpress-rs = 'alpha-20250411'
+wordpress-rs = 'trunk-db86370a4ce7ae45e210e57a0403cc70ce70f167'
 wordpress-utils = '3.14.0'
 automattic-ucrop = '2.2.11'
 zendesk = '5.4.0'