Logs: adding extra logs for application password card build (#22362)

adalpari · web-flow · commit 79c4a3c854d7 · 2025-11-21T09:09:07.000+01:00
* Adding logs

* Adding more logs

* Fixing test
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelper.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelper.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.accounts.login
 
-import android.util.Log
 import androidx.core.net.toUri
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -56,8 +55,10 @@ class ApplicationPasswordLoginHelper @Inject constructor(
                 }
                 val authorizationUrlComplete =
                     uriLoginWrapper.appendParamsToRestAuthorizationUrl(authorizationUrl)
-                Log.d("WP_RS", "Found authorization for $siteUrl URL: $authorizationUrlComplete" +
-                        " API_ROOT_URL $apiRootUrl")
+                appLogWrapper.d(
+                    AppLog.T.API,
+                    "AP: Found authorization for $siteUrl URL: $authorizationUrlComplete " +
+                            "API_ROOT_URL $apiRootUrl")
                 AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_SUCCESSFUL)
                 authorizationUrlComplete
             }
@@ -74,7 +75,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
     }
 
     private fun handleAuthenticationDiscoveryError(siteUrl: String, throwable: Throwable): String {
-        appLogWrapper.e(AppLog.T.API, "WP_RS: Error during API discovery for $siteUrl - ${throwable.message}")
+        appLogWrapper.e(AppLog.T.API, "AP: Error during API discovery for $siteUrl - ${throwable.message}")
         AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_FAILED)
         return ""
     }
@@ -87,6 +88,10 @@ class ApplicationPasswordLoginHelper @Inject constructor(
             urlLogin.siteUrl == null ||
             urlLogin.siteUrl == processedAppPasswordData
             ) {
+            appLogWrapper.e(
+                AppLog.T.DB,
+                "AP: Cannot save application password credentials for: ${urlLogin.siteUrl} - bad data"
+            )
             return false
         }
 
@@ -110,7 +115,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
             } else {
                 appLogWrapper.e(
                     AppLog.T.DB,
-                    "WP_RS: Cannot save application password credentials for: ${urlLogin.siteUrl}"
+                    "AP: Cannot save application password credentials for: ${urlLogin.siteUrl} - null site"
                 )
                 false
             }
@@ -129,7 +134,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
             },
             properties
         )
-        appLogWrapper.d(AppLog.T.DB, "WP_RS: Saved application password credentials for: $siteUrl")
+        appLogWrapper.d(AppLog.T.DB, "AP: Saved application password credentials for: $siteUrl")
     }
 
     fun getSiteUrlLoginFromRawData(url: String): UriLogin {
@@ -155,6 +160,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
                 }
                 dispatcherWrapper.removeApplicationPassword(site)
             }
+            appLogWrapper.d(AppLog.T.DB, "AP: Removed application password credentials for: $affectedSites sites")
             affectedSites
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/applicationpassword/ApplicationPasswordViewModelSlice.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/applicationpassword/ApplicationPasswordViewModelSlice.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.ui.accounts.login.ApplicationPasswordLoginHelper
 import org.wordpress.android.ui.mysite.MySiteCardAndItem
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.QuickLinksItem.QuickLinkItem
@@ -16,13 +17,15 @@ import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
 import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.AppLog
 import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 
 class ApplicationPasswordViewModelSlice @Inject constructor(
     private val applicationPasswordLoginHelper: ApplicationPasswordLoginHelper,
     private val siteStore: SiteStore,
     private val experimentalFeatures: ExperimentalFeatures,
+    private val appLogWrapper: AppLogWrapper,
 ) {
     lateinit var scope: CoroutineScope
 
@@ -57,12 +60,14 @@ class ApplicationPasswordViewModelSlice @Inject constructor(
             val storedSite = siteStore.sites.firstOrNull { it.id == site.id }
             if (storedSite != null && !applicationPasswordLoginHelper.siteHasBadCredentials(site)) {
                 uiModelMutable.postValue(null)
+                appLogWrapper.d(AppLog.T.MAIN, "AP: Hiding card for ${site.url} - authenticated")
                 return@launch
             }
 
             val authorizationUrlComplete = applicationPasswordLoginHelper.getAuthorizationUrlComplete(site.url)
             if (authorizationUrlComplete.isEmpty()) {
                 uiModelMutable.postValue(null)
+                appLogWrapper.d(AppLog.T.MAIN, "AP: Hiding card for ${site.url} - bad discovery")
             } else {
                 showApplicationPasswordCreateCard(site)
             }
@@ -81,6 +86,7 @@ class ApplicationPasswordViewModelSlice @Inject constructor(
                 )
             )
         )
+        appLogWrapper.d(AppLog.T.MAIN, "AP: Showing card for ${site.url}")
     }
 
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/applicationpassword/ApplicationPasswordViewModelSliceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/applicationpassword/ApplicationPasswordViewModelSliceTest.kt
@@ -17,6 +17,7 @@ import org.mockito.kotlin.whenever
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.ui.accounts.login.ApplicationPasswordLoginHelper
 import org.wordpress.android.ui.mysite.MySiteCardAndItem
 import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
@@ -41,6 +42,9 @@ class ApplicationPasswordViewModelSliceTest : BaseUnitTest() {
     @Mock
     lateinit var experimentalFeatures: ExperimentalFeatures
 
+    @Mock
+    lateinit var appLogWrapper: AppLogWrapper
+
     private lateinit var siteTest: SiteModel
 
     private var applicationPasswordCard: MySiteCardAndItem.Card? = null
@@ -55,6 +59,7 @@ class ApplicationPasswordViewModelSliceTest : BaseUnitTest() {
             applicationPasswordLoginHelper,
             siteStore,
             experimentalFeatures,
+            appLogWrapper
         ).apply {
             initialize(testScope())
             whenever(experimentalFeatures.isEnabled(any())).thenReturn(true)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package org.wordpress.android.ui.accounts.login`
`2`	`2`
`3`		`-import android.util.Log`
`4`	`3`	`import androidx.core.net.toUri`
`5`	`4`	`import kotlinx.coroutines.CoroutineDispatcher`
`6`	`5`	`import kotlinx.coroutines.withContext`
`@@ -56,8 +55,10 @@ class ApplicationPasswordLoginHelper @Inject constructor(`
`56`	`55`	`}`
`57`	`56`	`val authorizationUrlComplete =`
`58`	`57`	`uriLoginWrapper.appendParamsToRestAuthorizationUrl(authorizationUrl)`
`59`		`- Log.d("WP_RS", "Found authorization for $siteUrl URL: $authorizationUrlComplete" +`
`60`		`- " API_ROOT_URL $apiRootUrl")`
	`58`	`+ appLogWrapper.d(`
	`59`	`+ AppLog.T.API,`
	`60`	`+ "AP: Found authorization for $siteUrl URL: $authorizationUrlComplete " +`
	`61`	`+ "API_ROOT_URL $apiRootUrl")`
`61`	`62`	`AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_SUCCESSFUL)`
`62`	`63`	`authorizationUrlComplete`
`63`	`64`	`}`
`@@ -74,7 +75,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`private fun handleAuthenticationDiscoveryError(siteUrl: String, throwable: Throwable): String {`
`77`		`- appLogWrapper.e(AppLog.T.API, "WP_RS: Error during API discovery for $siteUrl - ${throwable.message}")`
	`78`	`+ appLogWrapper.e(AppLog.T.API, "AP: Error during API discovery for $siteUrl - ${throwable.message}")`
`78`	`79`	`AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_FAILED)`
`79`	`80`	`return ""`
`80`	`81`	`}`
`@@ -87,6 +88,10 @@ class ApplicationPasswordLoginHelper @Inject constructor(`
`87`	`88`	`urlLogin.siteUrl == null \|\|`
`88`	`89`	`urlLogin.siteUrl == processedAppPasswordData`
`89`	`90`	`) {`
	`91`	`+ appLogWrapper.e(`
	`92`	`+ AppLog.T.DB,`
	`93`	`+ "AP: Cannot save application password credentials for: ${urlLogin.siteUrl} - bad data"`
	`94`	`+ )`
`90`	`95`	`return false`
`91`	`96`	`}`
`92`	`97`
`@@ -110,7 +115,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(`
`110`	`115`	`} else {`
`111`	`116`	`appLogWrapper.e(`
`112`	`117`	`AppLog.T.DB,`
`113`		`- "WP_RS: Cannot save application password credentials for: ${urlLogin.siteUrl}"`
	`118`	`+ "AP: Cannot save application password credentials for: ${urlLogin.siteUrl} - null site"`
`114`	`119`	`)`
`115`	`120`	`false`
`116`	`121`	`}`
`@@ -129,7 +134,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(`
`129`	`134`	`},`
`130`	`135`	`properties`
`131`	`136`	`)`
`132`		`- appLogWrapper.d(AppLog.T.DB, "WP_RS: Saved application password credentials for: $siteUrl")`
	`137`	`+ appLogWrapper.d(AppLog.T.DB, "AP: Saved application password credentials for: $siteUrl")`
`133`	`138`	`}`
`134`	`139`
`135`	`140`	`fun getSiteUrlLoginFromRawData(url: String): UriLogin {`
`@@ -155,6 +160,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(`
`155`	`160`	`}`
`156`	`161`	`dispatcherWrapper.removeApplicationPassword(site)`
`157`	`162`	`}`
	`163`	`+ appLogWrapper.d(AppLog.T.DB, "AP: Removed application password credentials for: $affectedSites sites")`
`158`	`164`	`affectedSites`
`159`	`165`	`}`
`160`	`166`	`}`