fix: reset paykit state on signout

Author: ben-kaufman

app/src/main/java/to/bitkit/repositories/PubkyRepo.kt

@@ -26,6 +26,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import to.bitkit.data.PubkyStore
+import to.bitkit.data.SettingsStore
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.IoDispatcher
 import to.bitkit.env.Env
@@ -52,14 +53,15 @@ sealed class PubkyContactError(message: String) : AppError(message) {
     data object InvalidFormat : PubkyContactError("Invalid pubky key format")
 }
 
-@Suppress("TooManyFunctions", "LargeClass")
+@Suppress("TooManyFunctions", "LargeClass", "LongParameterList")
 @Singleton
 class PubkyRepo @Inject constructor(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     private val pubkyService: PubkyService,
     private val keychain: Keychain,
     private val imageLoader: ImageLoader,
     private val pubkyStore: PubkyStore,
+    private val settingsStore: SettingsStore,
     private val httpClient: HttpClient,
 ) {
     companion object {
@@ -961,10 +963,24 @@ class PubkyRepo @Inject constructor(
     private suspend fun clearLocalState() = withContext(ioDispatcher) {
         runCatching { keychain.delete(Keychain.Key.PAYKIT_SESSION.name) }
         runCatching { keychain.delete(Keychain.Key.PUBKY_SECRET_KEY.name) }
+        runCatching { clearPublicPaykitSharingState() }
+            .onFailure { Logger.warn("Failed to clear public Paykit sharing state", it, context = TAG) }
         notifyBackupStateChanged()
         clearAuthenticatedState()
     }
 
+    private suspend fun clearPublicPaykitSharingState() {
+        settingsStore.update {
+            it.copy(
+                hasConfirmedPublicPaykitEndpoints = false,
+                sharesPublicPaykitEndpoints = false,
+                publicPaykitBolt11 = "",
+                publicPaykitBolt11PaymentHash = "",
+                publicPaykitBolt11ExpiresAtMillis = 0,
+            )
+        }
+    }
+
     private fun requireAddableContactPublicKey(publicKey: String, allowExisting: Boolean = false): String {
         val prefixedKey = PubkyPublicKeyFormat.normalized(publicKey)
         contactValidationError(prefixedKey, allowExisting)?.let { throw it }

app/src/test/java/to/bitkit/repositories/PubkyRepoTest.kt

@@ -5,6 +5,7 @@ import coil3.ImageLoader
 import coil3.disk.DiskCache
 import coil3.memory.MemoryCache
 import com.synonym.paykit.FfiPaymentEntry
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
@@ -20,6 +21,8 @@ import org.mockito.kotlin.verifyBlocking
 import org.mockito.kotlin.whenever
 import to.bitkit.data.PubkyStore
 import to.bitkit.data.PubkyStoreData
+import to.bitkit.data.SettingsData
+import to.bitkit.data.SettingsStore
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.env.Env
 import to.bitkit.models.PubkyProfile
@@ -51,10 +54,19 @@ class PubkyRepoTest : BaseUnitTest() {
     private val keychain = mock<Keychain>()
     private val imageLoader = mock<ImageLoader>()
     private val pubkyStore = mock<PubkyStore>()
+    private val settingsStore = mock<SettingsStore>()
+    private val settingsFlow = MutableStateFlow(SettingsData())
 
     @Before
     fun setUp() = runBlocking {
+        settingsFlow.value = SettingsData()
         whenever(pubkyStore.data).thenReturn(flowOf(PubkyStoreData()))
+        whenever(settingsStore.data).thenReturn(settingsFlow)
+        whenever { settingsStore.update(any()) }.thenAnswer {
+            val transform = it.getArgument<(SettingsData) -> SettingsData>(0)
+            settingsFlow.value = transform(settingsFlow.value)
+            Unit
+        }
         sut = createSut()
     }
 
@@ -64,6 +76,7 @@ class PubkyRepoTest : BaseUnitTest() {
         keychain = keychain,
         imageLoader = imageLoader,
         pubkyStore = pubkyStore,
+        settingsStore = settingsStore,
         httpClient = mock(),
     )
 
@@ -247,6 +260,27 @@ class PubkyRepoTest : BaseUnitTest() {
         verifyBlocking(pubkyStore) { reset() }
     }
 
+    @Test
+    fun `signOut should clear public Paykit sharing settings`() = test {
+        authenticateForTesting()
+        settingsFlow.value = SettingsData(
+            hasConfirmedPublicPaykitEndpoints = true,
+            sharesPublicPaykitEndpoints = true,
+            publicPaykitBolt11 = "lnbc1old",
+            publicPaykitBolt11PaymentHash = "010203",
+            publicPaykitBolt11ExpiresAtMillis = 123L,
+        )
+
+        val result = sut.signOut()
+
+        assertTrue(result.isSuccess)
+        assertFalse(settingsFlow.value.hasConfirmedPublicPaykitEndpoints)
+        assertFalse(settingsFlow.value.sharesPublicPaykitEndpoints)
+        assertEquals("", settingsFlow.value.publicPaykitBolt11)
+        assertEquals("", settingsFlow.value.publicPaykitBolt11PaymentHash)
+        assertEquals(0, settingsFlow.value.publicPaykitBolt11ExpiresAtMillis)
+    }
+
     @Test
     fun `removeBitkitPaymentEndpoints removes only bitkit managed endpoints`() = test {
         authenticateForTesting(publicKey = VALID_SELF_KEY)