Merge pull request #54 from oguzsout/feature/ChangeEmailScreen

Feature/change email screen
oguzsout · Mar 5, 2024 · d70df16 · d70df16
2 parents 9184d48 + 583004a
commit d70df16
Show file tree

Hide file tree

Showing 10 changed files with 471 additions and 9 deletions.
diff --git a/...ain/java/com/oguzdogdu/walliescompose/data/repository/UserAuthenticationRepositoryImpl.kt b/...ain/java/com/oguzdogdu/walliescompose/data/repository/UserAuthenticationRepositoryImpl.kt
@@ -1,8 +1,11 @@
 package com.oguzdogdu.walliescompose.data.repository
 
 import com.google.android.gms.tasks.Task
+import com.google.firebase.auth.AuthCredential
 import com.google.firebase.auth.AuthResult
+import com.google.firebase.auth.EmailAuthProvider
 import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException
 import com.google.firebase.auth.GoogleAuthProvider
 import com.google.firebase.firestore.FirebaseFirestore
 import com.oguzdogdu.walliescompose.data.common.Constants.COLLECTION_PATH
@@ -95,6 +98,21 @@ class UserAuthenticationRepositoryImpl @Inject constructor(
         }
     }.toResource()
 
+    override suspend fun changeEmail(email: String?, password: String?) : Flow<Resource<Task<Void>?>> = flow {
+        val credential =
+            auth.currentUser?.email?.let { password?.let { password ->
+                EmailAuthProvider.getCredential(it,
+                    password
+                )
+            } }
+        credential?.let {
+            auth.currentUser?.reauthenticate(it)?.await()
+            emit(auth.currentUser?.updateEmail(email.orEmpty()))
+            firebaseFirestore.collection(COLLECTION_PATH).document(auth.currentUser!!.uid)
+                .update(EMAIL, email)
+        }
+    }.toResource()
+
     override suspend fun signOut() = auth.signOut()
 
     override suspend fun changeProfilePhoto(photo: String?) {

diff --git a/.../main/java/com/oguzdogdu/walliescompose/domain/repository/UserAuthenticationRepository.kt b/.../main/java/com/oguzdogdu/walliescompose/domain/repository/UserAuthenticationRepository.kt
@@ -1,6 +1,7 @@
 package com.oguzdogdu.walliescompose.domain.repository
 
 import com.google.android.gms.tasks.Task
+import com.google.firebase.auth.AuthCredential
 import com.google.firebase.auth.AuthResult
 import com.oguzdogdu.walliescompose.domain.model.auth.User
 import com.oguzdogdu.walliescompose.domain.wrapper.Resource
@@ -16,4 +17,5 @@ interface UserAuthenticationRepository {
     suspend fun signOut()
     suspend fun changeProfilePhoto(photo: String?)
     suspend fun updatePassword(password: String?): Flow<Resource<Task<Void>?>>
+    suspend fun changeEmail(email:String?,password: String?): Flow<Resource<Task<Void>?>>
 }
diff --git a/.../oguzdogdu/walliescompose/features/authenticateduser/AuthenticatedUserScreenNavigation.kt b/.../oguzdogdu/walliescompose/features/authenticateduser/AuthenticatedUserScreenNavigation.kt
@@ -16,8 +16,10 @@ fun NavController.navigateToAuthenticatedUserScreen(
 fun NavGraphBuilder.authenticatedUserScreen(
     navigateBack: () -> Unit,
     navigateToLogin: () -> Unit,
-    navigateToChangePassword: () -> Unit
-) {
+    navigateToChangePassword: () -> Unit,
+    navigateToChangeEmail: () -> Unit,
+
+    ) {
     composable(
         AuthenticatedUserScreenNavigationRoute
     ) {
@@ -30,6 +32,8 @@ fun NavGraphBuilder.authenticatedUserScreen(
             },
             navigateToChangePassword = {
                 navigateToChangePassword.invoke()
+            }, navigateToChangeEmail = {
+                navigateToChangeEmail.invoke()
             }
         )
     }

diff --git a/...a/com/oguzdogdu/walliescompose/features/authenticateduser/AuthenticatedUserScreenRoute.kt b/...a/com/oguzdogdu/walliescompose/features/authenticateduser/AuthenticatedUserScreenRoute.kt
@@ -80,8 +80,9 @@ fun AuthenticatedUserScreenRoute(
     viewModel: AuthenticatedUserViewModel = hiltViewModel(),
     navigateBack:() -> Unit,
     navigateToLogin: () -> Unit,
-    navigateToChangePassword: () -> Unit
-) {
+    navigateToChangePassword: () -> Unit,
+    navigateToChangeEmail: () -> Unit,
+    ) {
 
     val userState by viewModel.userState.collectAsStateWithLifecycle()
     val dialogState by viewModel.changeProfilePhotoBottomSheetOpenStat.collectAsStateWithLifecycle()
@@ -167,6 +168,8 @@ fun AuthenticatedUserScreenRoute(
                                    viewModel.handleUiEvents(AuthenticatedUserEvent.OpenChangeProfileBottomSheet(dialog))
                 }, onChangePasswordClick = {
                     navigateToChangePassword.invoke()
+                }, onChangeEmailClick = {
+                    navigateToChangeEmail.invoke()
                 },showDialog = dialogState)
         }
     }
@@ -183,6 +186,7 @@ fun AuthenticatedUserScreenContent(
     onChangeProfilePhotoButtonClick: () -> Unit,
     dismissDialog: (Boolean) -> Unit,
     onChangePasswordClick: () -> Unit,
+    onChangeEmailClick: () -> Unit,
     showDialog: Boolean
 ) {
     var isGoogleSign by remember {
@@ -220,9 +224,15 @@ fun AuthenticatedUserScreenContent(
                                     onChangeProfilePhotoClick.invoke(it)
                                 }
                             )
-                            EditProfileInformationContent(modifier = modifier, onChangePasswordClick = {
-                                onChangePasswordClick.invoke()
-                            })
+                            EditProfileInformationContent(
+                                modifier = modifier,
+                                onChangePasswordClick = {
+                                    onChangePasswordClick.invoke()
+                                },
+                                onChangeEmailClick = {
+                                    onChangeEmailClick.invoke()
+                                }
+                            )
                         }
                         ChangeProfilePhotoDialog(userInfos = userScreenState, modifier = modifier, profilePhotoUri = profilePhotoUri ,isOpen = showDialog, onDismiss = {
                            dismissDialog.invoke(false)
@@ -399,7 +409,11 @@ fun AuthenticatedUserWelcomeCard(
 }
 
 @Composable
-fun EditProfileInformationContent(modifier: Modifier,onChangePasswordClick: () -> Unit) {
+fun EditProfileInformationContent(
+    modifier: Modifier,
+    onChangePasswordClick: () -> Unit,
+    onChangeEmailClick: () -> Unit
+) {
     val scope = rememberCoroutineScope()
     val profileOptionsList = immutableListOf(
         MenuRow(
@@ -438,7 +452,7 @@ fun EditProfileInformationContent(modifier: Modifier,onChangePasswordClick: () -
 
                         },
                         openEditEmail = {
-
+                            onChangeEmailClick.invoke()
                         }, openChangePassword = {
                             onChangePasswordClick.invoke()
                         }

diff --git a/...ogdu/walliescompose/features/authenticateduser/changeemail/ChangeEmailScreenNavigation.kt b/...ogdu/walliescompose/features/authenticateduser/changeemail/ChangeEmailScreenNavigation.kt
@@ -0,0 +1,26 @@
+package com.oguzdogdu.walliescompose.features.authenticateduser.changeemail
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import androidx.navigation.compose.composable
+
+const val ChangeEmailScreenNavigationRoute = "change_email_screen_route"
+
+fun NavController.navigateToChangeEmailScreen(
+    navOptions: NavOptions? = null,
+) {
+    this.navigate(ChangeEmailScreenNavigationRoute, navOptions)
+}
+
+fun NavGraphBuilder.changeEmailScreen(
+    navigateBack: () -> Unit,
+) {
+    composable(
+        ChangeEmailScreenNavigationRoute
+    ) {
+        ChangeEmailScreenRoute(navigateBack = {
+            navigateBack.invoke()
+        })
+    }
+}