Merge pull request #3107 from wordpress-mobile/issue/12775-connect-in…

…fo-error-handling Allow identifying black-flagged websites when fetching WPCom site info
wordpress-mobile · Oct 16, 2024 · 5dfbbc9 · 5dfbbc9
2 parents 7475ad2 + f51c7f6
commit 5dfbbc9
Show file tree

Hide file tree

Showing 28 changed files with 164 additions and 73 deletions.
diff --git a/...java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt b/...java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt
@@ -591,7 +591,8 @@ class ActivityLogRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
         )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
@@ -612,7 +613,8 @@ class ActivityLogRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
         )).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
         return response
@@ -698,7 +700,8 @@ class ActivityLogRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
         )).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
         return response
@@ -717,7 +720,8 @@ class ActivityLogRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
         )
         ).thenReturn(response)
         return response

diff --git a/...rdpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClientTest.kt b/...rdpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClientTest.kt
@@ -212,7 +212,8 @@ class BloggingPromptsRestClientTest {
                 eq(BloggingPromptsListResponseTypeToken.type),
                 eq(false),
                 any(),
-                eq(false)
+                eq(false),
+                authenticatedRequest = any()
             )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt b/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt
@@ -572,7 +572,8 @@ class CommentsRestClientTest {
                         any(),
                         any(),
                         any(),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         return response

diff --git a/...test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt b/...test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt
@@ -400,7 +400,8 @@ class CardsRestClientTest {
                         eq(false),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...va/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt b/...va/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt
@@ -176,7 +176,8 @@ class ExperimentRestClientTest {
                         eq(false),
                         any(),
                         eq(true),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
     }

diff --git a/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt b/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt
@@ -212,7 +212,8 @@ class FeatureFlagsRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
             )
         ).thenReturn(response)
     }

diff --git a/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt b/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt
@@ -138,7 +138,8 @@ class RemoteConfigRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
             )
         ).thenReturn(response)
     }

diff --git a/...ava/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt b/...ava/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt
@@ -87,7 +87,8 @@ class PlanOffersRestClientTest {
                         eq(false),
                         any(),
                         eq(true),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
     }

diff --git a/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt b/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt
@@ -92,7 +92,8 @@ class ProductsRestClientTest {
                         eq(false),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
     }

diff --git a/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt b/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt
@@ -423,7 +423,8 @@ class ScanRestClientTest {
                         eq(false),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
@@ -508,7 +509,8 @@ class ScanRestClientTest {
                         eq(false),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         return response

diff --git a/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt b/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt
@@ -9,6 +9,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
+import org.mockito.Mockito.mockStatic
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
@@ -34,12 +35,15 @@ import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteWPComRestResponse
 import org.wordpress.android.fluxc.network.rest.wpcom.site.StatusType.ERROR
 import org.wordpress.android.fluxc.network.rest.wpcom.site.StatusType.SUCCESS
 import org.wordpress.android.fluxc.store.SiteStore.PostFormatsErrorType
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType
 import org.wordpress.android.fluxc.store.SiteStore.SiteFilter.WPCOM
 import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility
 import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.COMING_SOON
 import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.PUBLIC
 import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
 import org.wordpress.android.util.DateTimeUtils
+import org.wordpress.android.util.UrlUtils
 import kotlin.test.assertNotNull
 
 @RunWith(MockitoJUnitRunner::class)
@@ -63,13 +67,14 @@ class SiteRestClientTest {
         paramsCaptor = argumentCaptor()
         bodyCaptor = argumentCaptor()
         restClient = SiteRestClient(
-                null,
-                dispatcher,
-                requestQueue,
-                appSecrets,
-                wpComGsonRequestBuilder,
-                accessToken,
-                userAgent
+            appContext = null,
+            dispatcher = dispatcher,
+            requestQueue = requestQueue,
+            appSecrets = appSecrets,
+            wpComGsonRequestBuilder = wpComGsonRequestBuilder,
+            coroutineEngine = initCoroutineEngine(),
+            accessToken = accessToken,
+            userAgent = userAgent
         )
         whenever(site.siteId).thenReturn(siteId)
     }
@@ -610,6 +615,22 @@ class SiteRestClientTest {
         }
     }
 
+    @Test
+    fun `given a suspended WPCom website, when fetching site info, then return correct error`() = test {
+        val urlUtilsMock = mockStatic(UrlUtils::class.java)
+        whenever(UrlUtils.addUrlSchemeIfNeeded(any(), any())).thenAnswer { it.arguments[0] as String }
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.INVALID_RESPONSE, "")).apply {
+            apiError = "connection_disabled"
+        }
+        initGetResponse(ConnectSiteInfoResponse::class.java, null, error)
+
+        val result = restClient.fetchConnectSiteInfoSync("test.com")
+
+        assertThat(result.error).isNotNull
+        assertThat(result.error!!.type).isEqualTo(SiteErrorType.WPCOM_SITE_SUSPENDED)
+        urlUtilsMock.close()
+    }
+
     private suspend fun initSiteResponse(
         data: SiteWPComRestResponse? = null,
         error: WPComGsonNetworkError? = null
@@ -654,10 +675,13 @@ class SiteRestClientTest {
 
     private suspend fun <T> initGetResponse(
         clazz: Class<T>,
-        data: T,
+        data: T?,
         error: WPComGsonNetworkError? = null
     ): Response<T> {
-        val response = if (error != null) Response.Error(error) else Success(data)
+        if (error == null && data == null) {
+            error("Either data or error must be provided")
+        }
+        val response = if (error != null) Response.Error(error) else Success<T>(data!!)
         whenever(
                 wpComGsonRequestBuilder.syncGetRequest(
                         eq(restClient),
@@ -667,8 +691,8 @@ class SiteRestClientTest {
                         any(),
                         any(),
                         any(),
-                        customGsonBuilder = anyOrNull()
-
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         return response

diff --git a/.../test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt b/.../test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt
@@ -512,7 +512,8 @@ class InsightsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...rg/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt b/...rg/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt
@@ -103,7 +103,8 @@ class MostPopularRestClientTest {
                         eq(true),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...ordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt b/...ordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt
@@ -120,7 +120,8 @@ class PostingActivityRestClientTest {
                         eq(true),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...va/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt b/...va/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt
@@ -100,7 +100,8 @@ class SummaryRestClientTest {
                 eq(false),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
             )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt b/...wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt
@@ -146,7 +146,8 @@ class SubscribersRestClientTest {
                 eq(cachingEnabled),
                 any(),
                 eq(false),
-                customGsonBuilder = anyOrNull()
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
             )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...t/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt b/...t/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt
@@ -174,7 +174,8 @@ class AuthorsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt b/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt
@@ -220,7 +220,8 @@ class ClicksRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...a/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt b/...a/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt
@@ -170,7 +170,8 @@ class CountryViewsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/.../org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt b/.../org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt
@@ -174,7 +174,8 @@ class FileDownloadsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...g/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt b/...g/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt
@@ -170,7 +170,8 @@ class PostAndPageViewsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClientTest.kt b/...java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClientTest.kt
@@ -313,7 +313,8 @@ class ReferrersRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...va/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClientTest.kt b/...va/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClientTest.kt
@@ -170,7 +170,8 @@ class SearchTermsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...ava/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClientTest.kt b/...ava/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClientTest.kt
@@ -174,7 +174,8 @@ class VideoPlaysRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/.../org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClientTest.kt b/.../org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClientTest.kt
@@ -164,7 +164,8 @@ class VisitAndViewsRestClientTest {
                         eq(cachingEnabled),
                         any(),
                         eq(false),
-                        customGsonBuilder = anyOrNull()
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)