Merge pull request #192 from fmasa/password-reset

Add password reset dialog to desktop version

Author: fmasa

app/src/main/kotlin/cz/muni/fi/rpg/ui/WfrpMasterApp.kt

@@ -19,6 +19,7 @@ import cz.frantisekmasa.wfrp_master.common.invitation.InvitationLinkScreen
 import cz.frantisekmasa.wfrp_master.common.partyList.PartyListScreen
 import cz.frantisekmasa.wfrp_master.common.shell.DrawerShell
 import cz.frantisekmasa.wfrp_master.common.shell.NetworkStatusBanner
+import cz.frantisekmasa.wfrp_master.common.shell.SnackbarScaffold
 import cz.muni.fi.rpg.ui.shell.ProvideDIContainer
 import cz.muni.fi.rpg.ui.shell.Startup
 import kotlinx.coroutines.launch
@@ -47,10 +48,12 @@ fun WfrpMasterApp() {
                                 true
                             }
                         ) { navigator ->
-                            DrawerShell(drawerState) {
-                                SlideTransition(navigator) {
-                                    ProvideNavigationTransaction(it) {
-                                        it.Content()
+                            SnackbarScaffold {
+                                DrawerShell(drawerState) {
+                                    SlideTransition(navigator) {
+                                        ProvideNavigationTransaction(it) {
+                                            it.Content()
+                                        }
                                     }
                                 }
                             }

common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/SettingsStorage.kt

@@ -15,8 +15,16 @@ private val Context.settingsDataStore by preferencesDataStore("settings")
 actual class SettingsStorage(context: Context,) {
     private val storage = context.settingsDataStore
 
-    actual suspend fun <T> edit(key: SettingsKey<T>, update: (T?) -> T) {
-        storage.edit { it[key] = update(it[key]) }
+    actual suspend fun <T> edit(key: SettingsKey<T>, update: (T?) -> T?) {
+        storage.edit {
+            val newValue = update(it[key])
+
+            if (newValue == null) {
+                it.remove(key)
+            } else {
+                it[key] = newValue
+            }
+        }
     }
 
     actual fun <T> watch(key: SettingsKey<T>): Flow<T?> {

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/SettingsStorage.kt

@@ -6,12 +6,12 @@ import kotlinx.coroutines.flow.Flow
 import kotlin.jvm.JvmName
 
 expect class SettingsStorage {
-    suspend fun <T> edit(key: SettingsKey<T>, update: (T?) -> T)
+    suspend fun <T> edit(key: SettingsKey<T>, update: (T?) -> T?)
 
     fun <T> watch(key: SettingsKey<T>): Flow<T?>
 }
 
-suspend fun <T> SettingsStorage.edit(key: SettingsKey<T>, value: T) {
+suspend fun <T> SettingsStorage.edit(key: SettingsKey<T>, value: T?) {
     edit(key) { value }
 }
 

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/shell/DrawerShell.kt

@@ -1,13 +1,9 @@
 package cz.frantisekmasa.wfrp_master.common.shell
 
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material.DrawerState
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalDrawer
-import androidx.compose.material.Scaffold
-import androidx.compose.material.SnackbarHostState
-import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
@@ -18,8 +14,6 @@ import cz.frantisekmasa.wfrp_master.common.core.shared.SettingsStorage
 import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.LocalHamburgerButtonHandler
 import cz.frantisekmasa.wfrp_master.common.core.ui.flow.collectWithLifecycle
 import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.FullScreenProgress
-import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.LocalPersistentSnackbarHolder
-import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.PersistentSnackbarHolder
 import cz.frantisekmasa.wfrp_master.common.settings.AppSettings
 import cz.frantisekmasa.wfrp_master.common.settings.Language
 import dev.icerock.moko.resources.desc.StringDesc
@@ -30,7 +24,7 @@ import org.kodein.di.instance
 
 @Composable
 @ExperimentalMaterialApi
-fun DrawerShell(drawerState: DrawerState, bodyContent: @Composable (PaddingValues) -> Unit) {
+fun DrawerShell(drawerState: DrawerState, bodyContent: @Composable () -> Unit) {
     val settings: SettingsStorage by localDI().instance()
     val language = remember {
         settings.watch(AppSettings.LANGUAGE)
@@ -56,21 +50,10 @@ fun DrawerShell(drawerState: DrawerState, bodyContent: @Composable (PaddingValue
             },
             content = {
                 val coroutineScope = rememberCoroutineScope()
-                val snackbarHostState = remember { SnackbarHostState() }
-                val persistentSnackbarHolder =
-                    remember(coroutineScope, snackbarHostState) {
-                        PersistentSnackbarHolder(coroutineScope, snackbarHostState)
-                    }
 
                 CompositionLocalProvider(
                     LocalHamburgerButtonHandler provides { coroutineScope.launch { drawerState.open() } },
-                    LocalPersistentSnackbarHolder provides persistentSnackbarHolder,
-                    content = {
-                        Scaffold(
-                            scaffoldState = rememberScaffoldState(snackbarHostState = snackbarHostState),
-                            content = bodyContent,
-                        )
-                    },
+                    content = bodyContent,
                 )
             },
         )

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/shell/SnackbarScaffold.kt

@@ -0,0 +1,31 @@
+package cz.frantisekmasa.wfrp_master.common.shell
+
+import androidx.compose.material.Scaffold
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.material.rememberScaffoldState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.LocalPersistentSnackbarHolder
+import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.PersistentSnackbarHolder
+
+@Composable
+fun SnackbarScaffold(content: @Composable () -> Unit) {
+    val coroutineScope = rememberCoroutineScope()
+    val snackbarHostState = remember { SnackbarHostState() }
+    val persistentSnackbarHolder =
+        remember(coroutineScope, snackbarHostState) {
+            PersistentSnackbarHolder(coroutineScope, snackbarHostState)
+        }
+
+    Scaffold(
+        scaffoldState = rememberScaffoldState(snackbarHostState = snackbarHostState),
+        content = {
+            CompositionLocalProvider(
+                LocalPersistentSnackbarHolder provides persistentSnackbarHolder,
+                content = content,
+            )
+        },
+    )
+}

common/src/commonMain/resources/MR/base/strings.xml

@@ -29,6 +29,9 @@
     <string name="armour_types_plate">Plate</string>
     <string name="armour_types_soft_leather">Soft Leather</string>
     <string name="authentication_button_sign_in">Sign in</string>
+    <string name="authentication_button_log_out">Log out</string>
+    <string name="authentication_button_reset_password">Reset password</string>
+    <string name="authentication_button_send">Send</string>
     <string name="authentication_label_email">Email</string>
     <string name="authentication_label_password">Password</string>
     <string name="authentication_messages_duplicate_account">Existing account found</string>
@@ -38,6 +41,7 @@
     <string name="authentication_messages_invalid_password">Invalid password</string>
     <string name="authentication_messages_lose_access_to_parties">You will lose access to these parties:</string>
     <string name="authentication_messages_not_signed_in_description">You are not signed-in.\nSigning-in lets you keep access to parties between devices.</string>
+    <string name="authentication_messages_reset_password_email_sent">Email with instructions for password reset was sent</string>
     <string name="authentication_messages_signed_in_as">You are signed-in as</string>
     <string name="authentication_messages_unknown_error">Unknown error occurred</string>
     <string name="authentication_startup_google_sign_in_failed">We could not sign you in via Google.\nYour data will be tied to this device, but you can always sign in later in Settings.</string>

common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/FirebaseTokenHolder.kt

@@ -3,7 +3,7 @@ package cz.frantisekmasa.wfrp_master.common
 class FirebaseTokenHolder {
     private var token: String? = null
 
-    fun setToken(token: String) {
+    fun setToken(token: String?) {
         this.token = token
     }
 

common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/auth/AuthenticationManager.kt

@@ -127,6 +127,12 @@ class AuthenticationManager(
         return body
     }
 
+    suspend fun logout() {
+        tokenHolder.setToken(null)
+        settings.edit(REFRESH_TOKEN, null)
+        statusFlow.emit(AuthenticationStatus.NotAuthenticated)
+    }
+
     @Serializable
     sealed class SignInResponse {
         @Serializable
@@ -155,6 +161,50 @@ class AuthenticationManager(
         val returnSecureToken: Boolean = true,
     )
 
+    @Serializable
+    data class Failure(val error: Error)
+
+    /**
+     * https://firebase.google.com/docs/reference/rest/auth#section-send-password-reset-email
+     */
+    suspend fun resetPassword(email: String): PasswordResetResult {
+        val response = http.post(
+            "https://identitytoolkit.googleapis.com/v1/accounts:sendOobCode?key=$API_KEY"
+        ) {
+            contentType(ContentType.Application.Json)
+            setBody(
+                PasswordResetRequest(
+                    requestType = "PASSWORD_RESET",
+                    email = email,
+                )
+            )
+        }
+
+        if (response.status != HttpStatusCode.OK) {
+            val body = response.body<Failure>()
+
+            if (body.error.message == "EMAIL_NOT_FOUND") {
+                return PasswordResetResult.EmailNotFound
+            }
+
+            return PasswordResetResult.UnknownError
+        }
+
+        return PasswordResetResult.Success
+    }
+
+    @Serializable
+    private data class PasswordResetRequest(
+        val requestType: String,
+        val email: String,
+    )
+
+    sealed interface PasswordResetResult {
+        object Success : PasswordResetResult
+        object EmailNotFound : PasswordResetResult
+        object UnknownError : PasswordResetResult
+    }
+
     companion object {
         private val REFRESH_TOKEN = stringKey("firebase_refresh_token")
         private const val API_KEY = "AIzaSyDO4Y4wWcY4HdYcsp8zcLMpMjwUJ_9q3Fw"

common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/SettingsStorage.kt

@@ -24,8 +24,15 @@ actual class SettingsStorage() {
         awaitClose { preferences.removePreferenceChangeListener(listener) }
     }
 
-    actual suspend fun <T> edit(key: SettingsKey<T>, update: (T?) -> T) {
-        key.set(preferences, update(key.get(preferences)))
+    actual suspend fun <T> edit(key: SettingsKey<T>, update: (T?) -> T?) {
+        val newValue = update(key.get(preferences))
+
+        if (newValue == null) {
+            preferences.remove(key.name)
+        } else {
+            key.set(preferences, newValue)
+        }
+
         preferences.sync()
     }
 
@@ -41,16 +48,19 @@ actual class SettingsStorage() {
 }
 
 actual class SettingsKey<T>(
+    val name: String,
     val set: (Preferences, T) -> Unit,
     val get: (Preferences) -> T?
 )
 
 actual fun booleanSettingsKey(name: String): SettingsKey<Boolean> = SettingsKey(
+    name = name,
     get = { if (name in it.keys()) it.getBoolean(name, false) else null },
     set = { preferences, value -> preferences.putBoolean(name, value) },
 )
 
 actual fun stringSetKey(name: String): SettingsKey<Set<String>> = SettingsKey(
+    name = name,
     get = { preferences ->
         if (name in preferences.keys())
             preferences.get(name, "")
@@ -68,6 +78,7 @@ actual fun stringSetKey(name: String): SettingsKey<Set<String>> = SettingsKey(
 )
 
 actual fun stringKey(name: String): SettingsKey<String> = SettingsKey(
+    name = name,
     get = { if (name in it.keys()) it.get(name, "") else null },
     set = { preferences, value -> preferences.put(name, value) },
 )

common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/settings/SignInCard.kt

@@ -1,8 +1,58 @@
 package cz.frantisekmasa.wfrp_master.common.settings
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import cz.frantisekmasa.wfrp_master.common.Str
+import cz.frantisekmasa.wfrp_master.common.auth.AuthenticationManager
+import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser
+import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CardButton
+import cz.frantisekmasa.wfrp_master.common.core.ui.cards.CardContainer
+import cz.frantisekmasa.wfrp_master.common.core.ui.cards.CardTitle
+import cz.frantisekmasa.wfrp_master.common.core.ui.text.SingleLineTextValue
+import cz.frantisekmasa.wfrp_master.common.core.utils.launchLogged
+import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.Dispatchers
+import org.kodein.di.compose.localDI
+import org.kodein.di.instance
 
 @Composable
 actual fun SignInCard(settingsScreenModel: SettingsScreenModel) {
-    // Add support for Google auth
+    CardContainer(
+        Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 8.dp)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            CardTitle(stringResource(Str.settings_title_account))
+
+            val email = LocalUser.current.email
+
+            if (email != null) {
+                SingleLineTextValue(stringResource(Str.authentication_label_email), email)
+            }
+
+            val auth: AuthenticationManager by localDI().instance()
+            val coroutineScope = rememberCoroutineScope()
+
+            CardButton(
+                text = stringResource(Str.authentication_button_log_out),
+                onClick = {
+                    coroutineScope.launchLogged(Dispatchers.IO) {
+                        auth.logout()
+                    }
+                }
+            )
+        }
+    }
 }