Convert donations apis to WebSocket.

2025-12-27 14:40:22 +00:00 · 2025-04-02 10:58:43 -04:00
parent 2f9692a1a0
commit ecb040ce98
27 changed files with 575 additions and 392 deletions
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutActivityTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutActivityTest.kt
@@ -21,8 +21,6 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isNull
 import io.mockk.coEvery
 import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.runBlocking
@@ -42,12 +40,10 @@ import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.testing.CoroutineDispatcherRule
 import org.thoughtcrime.securesms.testing.InAppPaymentsRule
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.RemoteConfig
-import org.whispersystems.signalservice.api.NetworkResult
 import java.math.BigDecimal
 import java.util.Currency

@@ -72,11 +68,6 @@ class MessageBackupsCheckoutActivityTest {
    coEvery { AppDependencies.billingApi.queryProduct() } returns BillingProduct(price = FiatMoney(BigDecimal.ONE, Currency.getInstance("USD")))
    coEvery { AppDependencies.billingApi.launchBillingFlow(any()) } returns Unit

-    mockkObject(SignalNetwork)
-    every { SignalNetwork.archive } returns mockk {
-      every { triggerBackupIdReservation(any(), any(), any()) } returns NetworkResult.Success(Unit)
-    }
-
    mockkStatic(RemoteConfig::class)
    every { RemoteConfig.messageBackups } returns true
  }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt
@@ -11,7 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import okhttp3.mockwebserver.MockResponse
+import io.mockk.every
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -20,15 +20,13 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.Delete
-import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.InAppPaymentsRule
 import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.actions.RecyclerViewScrollToBottomAction
-import org.thoughtcrime.securesms.testing.success
+import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.math.BigDecimal
@@ -118,32 +116,28 @@ class CheckoutFlowActivityTest__RecurringDonations {
    InAppPaymentsRepository.setSubscriber(subscriber)
    SignalStore.inAppPayments.setRecurringDonationCurrency(currency)

-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/subscription/${subscriber.subscriberId.serialize()}") {
-        MockResponse().success(
-          ActiveSubscription(
-            ActiveSubscription.Subscription(
-              200,
-              currency.currencyCode,
-              BigDecimal.ONE,
-              System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-              true,
-              System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-              false,
-              "active",
-              "STRIPE",
-              "CARD",
-              false
-            ),
-            null
-          )
+    AppDependencies.donationsApi.apply {
+      every { getSubscription(subscriber.subscriberId) } returns NetworkResult.Success(
+        ActiveSubscription(
+          ActiveSubscription.Subscription(
+            200,
+            currency.currencyCode,
+            BigDecimal.ONE,
+            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
+            true,
+            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
+            false,
+            "active",
+            "STRIPE",
+            "CARD",
+            false
+          ),
+          null
        )
-      },
-      Delete("/v1/subscription/${subscriber.subscriberId.serialize()}") {
-        Thread.sleep(10000)
-        MockResponse().success()
-      }
-    )
+      )
+
+      every { deleteSubscription(subscriber.subscriberId) } returns NetworkResult.Success(Unit)
+    }
  }

  private fun initialisePendingSubscription() {
@@ -160,27 +154,25 @@ class CheckoutFlowActivityTest__RecurringDonations {
    InAppPaymentsRepository.setSubscriber(subscriber)
    SignalStore.inAppPayments.setRecurringDonationCurrency(currency)

-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/subscription/${subscriber.subscriberId.serialize()}") {
-        MockResponse().success(
-          ActiveSubscription(
-            ActiveSubscription.Subscription(
-              200,
-              currency.currencyCode,
-              BigDecimal.ONE,
-              System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-              false,
-              System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-              false,
-              "incomplete",
-              "STRIPE",
-              "CARD",
-              false
-            ),
-            null
-          )
+    AppDependencies.donationsApi.apply {
+      every { getSubscription(subscriber.subscriberId) } returns NetworkResult.Success(
+        ActiveSubscription(
+          ActiveSubscription.Subscription(
+            200,
+            currency.currencyCode,
+            BigDecimal.ONE,
+            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
+            false,
+            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
+            false,
+            "incomplete",
+            "STRIPE",
+            "CARD",
+            false
+          ),
+          null
        )
-      }
-    )
+      )
+    }
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
@@ -26,10 +26,13 @@ import org.thoughtcrime.securesms.testing.runSync
 import org.thoughtcrime.securesms.testing.success
 import org.whispersystems.signalservice.api.SignalServiceDataStore
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
+import org.whispersystems.signalservice.api.archive.ArchiveApi
 import org.whispersystems.signalservice.api.attachment.AttachmentApi
+import org.whispersystems.signalservice.api.donations.DonationsApi
 import org.whispersystems.signalservice.api.keys.KeysApi
 import org.whispersystems.signalservice.api.message.MessageApi
 import org.whispersystems.signalservice.api.push.TrustStore
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
@@ -122,6 +125,14 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
    return recipientCache
  }

+  override fun provideArchiveApi(authWebSocket: SignalWebSocket.AuthenticatedWebSocket, unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket, pushServiceSocket: PushServiceSocket): ArchiveApi {
+    return mockk()
+  }
+
+  override fun provideDonationsApi(authWebSocket: SignalWebSocket.AuthenticatedWebSocket, unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket): DonationsApi {
+    return mockk()
+  }
+
  override fun provideSignalServiceMessageSender(
    protocolStore: SignalServiceDataStore,
    pushServiceSocket: PushServiceSocket,
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/InAppPaymentsRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/InAppPaymentsRule.kt
@@ -6,11 +6,13 @@
 package org.thoughtcrime.securesms.testing

 import androidx.test.platform.app.InstrumentationRegistry
-import okhttp3.mockwebserver.MockResponse
+import io.mockk.every
 import org.junit.rules.ExternalResource
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.JsonUtils
+import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
+import java.util.Locale

 /**
 * Sets up some common infrastructure for on-device InAppPayment testing
@@ -23,29 +25,25 @@ class InAppPaymentsRule : ExternalResource() {
  }

  private fun initialiseConfigurationResponse() {
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/subscription/configuration") {
-        val assets = InstrumentationRegistry.getInstrumentation().context.resources.assets
-        assets.open("inAppPaymentsTests/configuration.json").use { stream ->
-          MockResponse().success(JsonUtils.fromJson(stream, SubscriptionsConfiguration::class.java))
-        }
-      }
-    )
+    val assets = InstrumentationRegistry.getInstrumentation().context.resources.assets
+    val response = assets.open("inAppPaymentsTests/configuration.json").use { stream ->
+      NetworkResult.Success(JsonUtils.fromJson(stream, SubscriptionsConfiguration::class.java))
+    }
+
+    AppDependencies.donationsApi.apply {
+      every { getDonationsConfiguration(any()) } returns response
+    }
  }

  private fun initialisePutSubscription() {
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v1/subscription/") {
-        MockResponse().success()
-      }
-    )
+    AppDependencies.donationsApi.apply {
+      every { putSubscription(any()) } returns NetworkResult.Success(Unit)
+    }
  }

  private fun initialiseSetArchiveBackupId() {
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v1/archives/backupid") {
-        MockResponse().success()
-      }
-    )
+    AppDependencies.archiveApi.apply {
+      every { triggerBackupIdReservation(any(), any(), any()) } returns NetworkResult.Success(Unit)
+    }
  }
 }