feat: add profile recovery screen (#581)

* add named args to login use case * add more tests to api config repository * minor refactor to active account monitor test * update l10n * add recover screen to my account * update DI
LiveFastEatTrashRaccoon · Nov 26, 2024 · 50960b8 · 50960b8
1 parent 26cbf77
commit 50960b8
Show file tree

Hide file tree

Showing 17 changed files with 275 additions and 58 deletions.
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/DeStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/DeStrings.kt
@@ -492,4 +492,13 @@ internal val DeStrings =
         override val formatStrikethrough = "Durchgestrichen"
         override val formatUnderlined = "Unterstrichen"
         override val formatMonospace = "Einfarbig"
+        override val actionRemoveFromFavorites = "Aus den Favoriten entfernen"
+        override val actionRemoveFromBookmarks = "Aus den Lesezeichen entfernen"
+        override val messageAuthIssue =
+            "Es ist ein Fehler aufgetreten, vielleicht ist Ihr Token abgelaufen."
+        override val messageAuthIssueHintsTitle =
+            "Sie können eine der folgenden Aktionen versuchen:"
+        override val messageAuthIssueHint1 = "Aktualisieren erzwingen"
+        override val messageAuthIssueHint2 = "erneut anmelden"
+        override val messageAuthIssueHint3 = "Löschen Sie die Anwendungsdaten"
     }
diff --git a/...ain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/DefaultStrings.kt b/...ain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/DefaultStrings.kt
@@ -491,4 +491,9 @@ internal open class DefaultStrings : Strings {
     override val formatMonospace = "Monospace"
     override val actionRemoveFromFavorites = "Remove from favorites"
     override val actionRemoveFromBookmarks = "Remove from bookmarks"
+    override val messageAuthIssue = "An error occurred, maybe your token has expired."
+    override val messageAuthIssueHintsTitle = "You can try one of the following actions:"
+    override val messageAuthIssueHint1 = "force refresh"
+    override val messageAuthIssueHint2 = "log in again"
+    override val messageAuthIssueHint3 = "clear the application data"
 }
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/EsStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/EsStrings.kt
@@ -492,4 +492,11 @@ internal val EsStrings =
         override val formatStrikethrough = "Tachado"
         override val formatUnderlined = "Subrayado"
         override val formatMonospace = "Monospace"
+        override val actionRemoveFromFavorites = "Eliminar de favoritos"
+        override val actionRemoveFromBookmarks = "Eliminar de favoritos"
+        override val messageAuthIssue = "Se ha producido un error, puede que tu token haya caducado."
+        override val messageAuthIssueHintsTitle = "Puedes intentar una de las siguientes acciones:"
+        override val messageAuthIssueHint1 = "forzar actualización"
+        override val messageAuthIssueHint2 = "iniciar sesión de nuevo"
+        override val messageAuthIssueHint3 = "borrar los datos de la aplicación"
     }
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/FiStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/FiStrings.kt
@@ -479,4 +479,11 @@ internal val FiStrings =
         override val formatStrikethrough = "Yliviivattu"
         override val formatUnderlined = "Alleviivattu"
         override val formatMonospace = "Monospace"
+        override val actionRemoveFromFavorites = "Poista suosikeista"
+        override val actionRemoveFromBookmarks = "Poista kirjanmerkeistä"
+        override val messageAuthIssue = "Tapahtui virhe, ehkä tunnuksesi on vanhentunut."
+        override val messageAuthIssueHintsTitle = "Voit kokeilla jotakin seuraavista toimista:"
+        override val messageAuthIssueHint1 = "pakota päivitys"
+        override val messageAuthIssueHint2 = "kirjaudu uudelleen sisään"
+        override val messageAuthIssueHint3 = "tyhjennä sovelluksen tiedot"
     }
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/FrStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/FrStrings.kt
@@ -497,4 +497,12 @@ internal val FrStrings =
         override val formatStrikethrough = "Barré"
         override val formatUnderlined = "Souligné"
         override val formatMonospace = "Monospace"
+        override val actionRemoveFromFavorites = "Supprimer des favoris"
+        override val actionRemoveFromBookmarks = "Supprimer des signets"
+        override val messageAuthIssue = "Une erreur s'est produite, votre jeton a peut-être expiré."
+        override val messageAuthIssueHintsTitle =
+            "Vous pouvez essayer l'une des actions suivantes :"
+        override val messageAuthIssueHint1 = "forcer l'actualisation"
+        override val messageAuthIssueHint2 = "se reconnecter"
+        override val messageAuthIssueHint3 = "effacer les données de l'application"
     }
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/ItStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/ItStrings.kt
@@ -492,4 +492,11 @@ internal val ItStrings =
         override val formatStrikethrough = "Barrato"
         override val formatUnderlined = "Sottolineato"
         override val formatMonospace = "Larghezza fissa"
+        override val actionRemoveFromFavorites = "Rimuovi dai preferiti"
+        override val actionRemoveFromBookmarks = "Rimuovi dai segnalibri"
+        override val messageAuthIssue = "Si è verificato un errore, forse il token attuale è scaduto."
+        override val messageAuthIssueHintsTitle = "Si consiglia di intraprendere una delle seguenti azioni:"
+        override val messageAuthIssueHint1 = "forzare l'aggiornamento"
+        override val messageAuthIssueHint2 = "effettuare nuovamente l'accesso"
+        override val messageAuthIssueHint3 = "cancellare i dati dell'applicazione"
     }
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/PlStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/PlStrings.kt
@@ -490,4 +490,11 @@ internal val PlStrings =
         override val formatStrikethrough = "Przekreślenie"
         override val formatUnderlined = "Podkreślony"
         override val formatMonospace = "Monospace"
+        override val actionRemoveFromFavorites = "Usuń z ulubionych"
+        override val actionRemoveFromBookmarks = "Usuń z zakładek"
+        override val messageAuthIssue = "Wystąpił błąd, być może Twój token wygasł."
+        override val messageAuthIssueHintsTitle = "Możesz wypróbować jedno z następujących działań:"
+        override val messageAuthIssueHint1 = "wymuś odświeżenie"
+        override val messageAuthIssueHint2 = "zaloguj się ponownie"
+        override val messageAuthIssueHint3 = "wyczyść dane aplikacji"
     }
diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/PtStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/PtStrings.kt
@@ -496,4 +496,11 @@ internal val PtStrings =
         override val formatStrikethrough = "Riscado"
         override val formatUnderlined = "Sublinhado"
         override val formatMonospace = "Monoespaço"
+        override val actionRemoveFromFavorites = "Remover dos favoritos"
+        override val actionRemoveFromBookmarks = "Remover dos favoritos"
+        override val messageAuthIssue = "Ocorreu um erro, talvez o seu token tenha expirado."
+        override val messageAuthIssueHintsTitle = "Pode tentar uma das seguintes acções:"
+        override val messageAuthIssueHint1 = "forçar a atualização"
+        override val messageAuthIssueHint2 = "iniciar sessão novamente"
+        override val messageAuthIssueHint3 = "limpar os dados da aplicação"
     }
diff --git a/...commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/Strings.kt b/...commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/Strings.kt
@@ -443,6 +443,11 @@ interface Strings {
     val formatMonospace: String
     val actionRemoveFromFavorites: String
     val actionRemoveFromBookmarks: String
+    val messageAuthIssue: String
+    val messageAuthIssueHintsTitle: String
+    val messageAuthIssueHint1: String
+    val messageAuthIssueHint2: String
+    val messageAuthIssueHint3: String
 }
 
 object Locales {

diff --git a/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/UaStrings.kt b/...mmonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/messages/UaStrings.kt
@@ -499,4 +499,13 @@ internal val UaStrings =
         override val formatStrikethrough = "Закреслений"
         override val formatUnderlined = "Підкреслений"
         override val formatMonospace = "Монопростір"
+        override val actionRemoveFromFavorites = "Видалити з обраного"
+        override val actionRemoveFromBookmarks = "Видалити з закладок"
+        override val messageAuthIssue =
+            "Виникла помилка, можливо, термін дії вашого токена закінчився."
+        override val messageAuthIssueHintsTitle =
+            "Ви можете спробувати виконати одну з наступних дій:"
+        override val messageAuthIssueHint1 = "примусове оновлення"
+        override val messageAuthIssueHint2 = "увійти ще раз"
+        override val messageAuthIssueHint3 = "очистити дані додатку"
     }
diff --git a/...h/raccoonforfriendica/domain/identity/repository/DefaultApiConfigurationRepositoryTest.kt b/...h/raccoonforfriendica/domain/identity/repository/DefaultApiConfigurationRepositoryTest.kt
@@ -3,17 +3,20 @@ package com.livefast.eattrash.raccoonforfriendica.domain.identity.repository
 import com.livefast.eattrash.raccoonforfriendica.core.api.provider.ServiceProvider
 import com.livefast.eattrash.raccoonforfriendica.core.preferences.TemporaryKeyStore
 import dev.mokkery.MockMode
+import dev.mokkery.answering.calls
 import dev.mokkery.answering.returns
 import dev.mokkery.every
 import dev.mokkery.everySuspend
 import dev.mokkery.matcher.any
 import dev.mokkery.mock
 import dev.mokkery.verify
 import dev.mokkery.verifySuspend
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
 class DefaultApiConfigurationRepositoryTest {
     private val keyStore =
@@ -29,7 +32,7 @@ class DefaultApiConfigurationRepositoryTest {
     private val credentialsRepository =
         mock<CredentialsRepository> {
             everySuspend {
-                validateApplicationCredentials(any(), any())
+                validateApplicationCredentials(node = any(), credentials = any())
             } returns true
         }
 
@@ -99,7 +102,10 @@ class DefaultApiConfigurationRepositoryTest {
     fun `given invalid OAuth credentials stored when hasCachedAuthCredentials then result is as expected`() =
         runTest {
             everySuspend {
-                credentialsRepository.validateApplicationCredentials(any(), any())
+                credentialsRepository.validateApplicationCredentials(
+                    node = any(),
+                    credentials = any(),
+                )
             } returns false
 
             val res = sut.hasCachedAuthCredentials()
@@ -120,7 +126,10 @@ class DefaultApiConfigurationRepositoryTest {
             every { keyStore["lastCred1", any<String>()] } returns "fake1"
             every { keyStore["lastCred2", any<String>()] } returns "fake2"
             everySuspend {
-                credentialsRepository.validateApplicationCredentials(any(), any())
+                credentialsRepository.validateApplicationCredentials(
+                    node = any(),
+                    credentials = any(),
+                )
             } returns false
 
             val res = sut.hasCachedAuthCredentials()
@@ -133,4 +142,42 @@ class DefaultApiConfigurationRepositoryTest {
                 )
             }
         }
+
+    @Test
+    fun `given timeout when hasCachedAuthCredentials then result is as expected`() =
+        runTest {
+            everySuspend {
+                credentialsRepository.validateApplicationCredentials(
+                    node = any(),
+                    credentials = any(),
+                )
+            } calls {
+                delay(10.seconds)
+                true
+            }
+
+            val res = sut.hasCachedAuthCredentials()
+
+            assertFalse(res)
+            verifySuspend {
+                credentialsRepository.validateApplicationCredentials(
+                    "default-instance",
+                    ApiCredentials.OAuth2(accessToken = "fake-access-token", refreshToken = ""),
+                )
+            }
+        }
+
+    @Test
+    fun `given valid credentials when hasCachedAuthCredentials then result is as expected`() =
+        runTest {
+            val res = sut.hasCachedAuthCredentials()
+
+            assertTrue(res)
+            verifySuspend {
+                credentialsRepository.validateApplicationCredentials(
+                    "default-instance",
+                    ApiCredentials.OAuth2(accessToken = "fake-access-token", refreshToken = ""),
+                )
+            }
+        }
 }
diff --git a/.../com/livefast/eattrash/raccoonforfriendica/domain/identity/usecase/DefaultLoginUseCase.kt b/.../com/livefast/eattrash/raccoonforfriendica/domain/identity/usecase/DefaultLoginUseCase.kt
@@ -25,7 +25,7 @@ internal class DefaultLoginUseCase(
     ) {
         apiConfigurationRepository.changeNode(node)
         apiConfigurationRepository.setAuth(credentials)
-        val user = credentialsRepository.validate(node, credentials)
+        val user = credentialsRepository.validate(node = node, credentials = credentials)
         checkNotNull(user) { "Invalid credentials" }
 
         val handle =
@@ -47,7 +47,7 @@ internal class DefaultLoginUseCase(
         }
 
         accountRepository.getBy(handle)?.also { account ->
-            accountCredentialsCache.save(account.id, credentials)
+            accountCredentialsCache.save(accountId = account.id, credentials = credentials)
 
             val anonymousAccountId = accountRepository.getBy(handle = "")?.id ?: 0
             val oldSettings = settingsRepository.get(account.id)

diff --git a/...t/eattrash/raccoonforfriendica/domain/identity/usecase/DefaultActiveAccountMonitorTest.kt b/...t/eattrash/raccoonforfriendica/domain/identity/usecase/DefaultActiveAccountMonitorTest.kt
@@ -19,7 +19,6 @@ import dev.mokkery.every
 import dev.mokkery.everySuspend
 import dev.mokkery.matcher.any
 import dev.mokkery.mock
-import dev.mokkery.verify
 import dev.mokkery.verifySuspend
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
@@ -81,10 +80,8 @@ class DefaultActiveAccountMonitorTest {
             sut.start()
             accountChannel.send(account)
 
-            verify {
-                apiConfigurationRepository.setAuth(null)
-            }
             verifySuspend {
+                apiConfigurationRepository.setAuth(null)
                 supportedFeatureRepository.refresh()
                 identityRepository.refreshCurrentUser(null)
                 supportedFeatureRepository.refresh()
@@ -98,7 +95,7 @@ class DefaultActiveAccountMonitorTest {
         }
 
     @Test
-    fun `given active account when started then interactions are as expected`() =
+    fun `given active account and valid credentials when started then interactions are as expected`() =
         runTest {
             val accountId = 1L
             val userId = "fake-user-id"
@@ -107,7 +104,6 @@ class DefaultActiveAccountMonitorTest {
             val accountChannel = Channel<AccountModel?>()
             every { accountRepository.getActiveAsFlow() } returns accountChannel.receiveAsFlow()
             everySuspend { accountRepository.getActive() } returns account
-            every { apiConfigurationRepository.node } returns MutableStateFlow("test-instance")
             val credentials = ApiCredentials.OAuth2("fake-access-token", "")
             every { accountCredentialsCache.get(any()) } returns credentials
             val settings = SettingsModel()
@@ -116,10 +112,8 @@ class DefaultActiveAccountMonitorTest {
             sut.start()
             accountChannel.send(account)
 
-            verify {
-                apiConfigurationRepository.setAuth(credentials)
-            }
             verifySuspend {
+                apiConfigurationRepository.setAuth(credentials)
                 supportedFeatureRepository.refresh()
                 identityRepository.refreshCurrentUser(userId)
                 contentPreloadManager.preload(userId)

diff --git a/...Main/kotlin/com/livefast/eattrash/raccoonforfriendica/feature/profile/di/ProfileModule.kt b/...Main/kotlin/com/livefast/eattrash/raccoonforfriendica/feature/profile/di/ProfileModule.kt
@@ -31,6 +31,8 @@ val featureProfileModule =
                 paginationManager = get(),
                 timelineEntryRepository = get(),
                 settingsRepository = get(),
+                apiConfigurationRepository = get(),
+                logout = get(),
                 hapticFeedback = get(),
                 notificationCenter = get(),
                 imagePreloadManager = get(),

diff --git a/.../com/livefast/eattrash/raccoonforfriendica/feature/profile/myaccount/MyAccountMviModel.kt b/.../com/livefast/eattrash/raccoonforfriendica/feature/profile/myaccount/MyAccountMviModel.kt
@@ -43,6 +43,8 @@ interface MyAccountMviModel :
         data class CopyToClipboard(
             val entry: TimelineEntryModel,
         ) : Intent
+
+        data object Logout : Intent
     }
 
     data class State(