feat(android_sidebar): adding the profil page and password edit

Theo-lbg · Theo-lbg · commit 9aff293ea36e · 2025-01-27T15:52:23.000+01:00
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/entity/user/UserEditPassword.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/entity/user/UserEditPassword.kt
@@ -1,7 +1,11 @@
 package com.xpeho.xpeapp.data.entity.user
 
+import com.google.gson.annotations.SerializedName
+
 data class UserEditPassword(
-    val initialPassword: String,
-    val password: String,
-    val passwordRepeat: String,
+    @SerializedName("initial_password") val initialPassword: String,
+    @SerializedName("password") val password: String,
+    @SerializedName("password_repeat") val passwordRepeat: String,
+
+
 )
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressRepository.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressRepository.kt
@@ -200,7 +200,7 @@ class WordpressRepository(
         )
     }
 
-    /*suspend fun updatePassword(
+    suspend fun updatePassword(
         editPassword: UserEditPassword
     ): Boolean {
         handleServiceExceptions(
@@ -212,7 +212,7 @@ class WordpressRepository(
                 return false
             }
         )
-    }*/
+    }
 
     // Exceptions handling
 
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressService.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressService.kt
@@ -67,11 +67,11 @@ interface WordpressService {
     @GET("xpeho/v1/user-infos")
     suspend fun fetchUserInfos(): UserInfos
 
-    /*// Update the user infos
+    // Update the user infos
     @Headers("Content-Type: application/json")
     @POST("xpeho/v1/update-password")
     suspend fun updatePassword(
         @Body editPassword: UserEditPassword,
-    ): Boolean*/
+    ): Boolean
 }
 
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfileEditPasswordView.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfileEditPasswordView.kt
@@ -13,7 +13,10 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.xpeho.xpeapp.R
 import com.xpeho.xpeapp.XpeApp
 import com.xpeho.xpeapp.data.entity.user.UserEditPassword
+import com.xpeho.xpeapp.ui.components.CustomDialog
 import com.xpeho.xpeapp.ui.components.layout.Title
+import com.xpeho.xpeapp.ui.uiState.PasswordUpdateUiState
+import com.xpeho.xpeapp.ui.uiState.UserInfosUiState
 import com.xpeho.xpeapp.ui.viewModel.user.UserInfosViewModel
 import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
 import com.xpeho.xpeho_ui_android.ClickyButton
@@ -37,6 +40,9 @@ fun ProfileEditPasswordView(
     var newPassword by remember { mutableStateOf("") }
     var confirmPassword by remember { mutableStateOf("") }
 
+    val passwordUpdateState = userInfosViewModel.passwordUpdateState
+
+
     Column(
         modifier = Modifier
             .fillMaxWidth()
@@ -97,15 +103,26 @@ fun ProfileEditPasswordView(
             ClickyButton(
                 label = stringResource(id = R.string.profil_page_modify_password_save),
                 onPress = {
-//                    if (newPassword == confirmPassword) {
-//                        userInfosViewModel.updatePassword(UserEditPassword(
-//                            initialPassword, newPassword, confirmPassword))
-//                        onChangePassword()
-//                    } else {
-//                        // Handle password mismatch error
-//                    }
+                    if (passwordUpdateState is PasswordUpdateUiState.SUCCESS) {
+                        userInfosViewModel.updatePassword(UserEditPassword(
+                            initialPassword, newPassword, confirmPassword))
+                        onChangePassword()
+                    } else {
+                        //userInfosViewModel.passwordUpdateState = PasswordUpdateUiState.ERROR("Les mots de passe ne correspondent pas.")
+                    }
                 }
             )
+
+            if (passwordUpdateState is PasswordUpdateUiState.ERROR) {
+                CustomDialog(
+                    title = stringResource(id = R.string.home_page_error),
+                    message = (userInfosViewModel.state as UserInfosUiState.ERROR).error,
+                    closeDialog = {
+                        userInfosViewModel.resetState()
+                    }
+                )
+            }
+
         }
     }
 }
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfilePage.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfilePage.kt
@@ -8,11 +8,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.unit.dp
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
-import com.xpeho.xpeapp.XpeApp
-import com.xpeho.xpeapp.ui.viewModel.user.UserInfosViewModel
-import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
 
 @Composable
 fun ProfilePage(
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/uiState/PasswordUpdateUiState.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/uiState/PasswordUpdateUiState.kt
@@ -1,4 +1,3 @@
-/*
 package com.xpeho.xpeapp.ui.uiState
 
 interface PasswordUpdateUiState {
@@ -7,4 +6,4 @@ interface PasswordUpdateUiState {
     data class SUCCESS(val isSuccessful: Boolean) : PasswordUpdateUiState
     data class ERROR(val errorMessage: String) : PasswordUpdateUiState
 }
-*/
+
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/viewModel/user/UserInfosViewModel.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/viewModel/user/UserInfosViewModel.kt
@@ -9,7 +9,7 @@ import com.xpeho.xpeapp.data.entity.user.UserEditPassword
 import com.xpeho.xpeapp.data.service.WordpressRepository
 import com.xpeho.xpeapp.domain.AuthState
 import com.xpeho.xpeapp.domain.AuthenticationManager
-// import com.xpeho.xpeapp.ui.uiState.PasswordUpdateUiState
+import com.xpeho.xpeapp.ui.uiState.PasswordUpdateUiState
 import com.xpeho.xpeapp.ui.uiState.UserInfosUiState
 import kotlinx.coroutines.launch
 
@@ -19,7 +19,7 @@ class UserInfosViewModel (
 ) : ViewModel() {
 
     var state: UserInfosUiState by mutableStateOf(UserInfosUiState.EMPTY)
-    // var passwordUpdateState: PasswordUpdateUiState by mutableStateOf(PasswordUpdateUiState.EMPTY)
+    var passwordUpdateState: PasswordUpdateUiState by mutableStateOf(PasswordUpdateUiState.EMPTY)
 
     init {
         fetchUserInfos()
@@ -43,26 +43,31 @@ class UserInfosViewModel (
         }
     }
 
-//    fun updatePassword(editPassword: UserEditPassword) {
-//        passwordUpdateState = PasswordUpdateUiState.LOADING
-//        viewModelScope.launch {
-//            try {
-//                val result = wordpressRepo.updatePassword(editPassword)
-//                passwordUpdateState = if (result) {
-//                    PasswordUpdateUiState.SUCCESS(true)
-//                } else {
-//                    PasswordUpdateUiState.ERROR("La mise à jour du mot de passe a échoué.")
-//                }
-//            } catch (e: Exception) {
-//                passwordUpdateState = PasswordUpdateUiState.ERROR("Erreur : ${e.message}")
-//            }
-//        }
-//    }
+    fun updatePassword(editPassword: UserEditPassword) {
+        passwordUpdateState = PasswordUpdateUiState.LOADING
+        viewModelScope.launch {
+            try {
+                val result = wordpressRepo.updatePassword(editPassword)
+                passwordUpdateState = if (result) {
+                    PasswordUpdateUiState.SUCCESS(true)
+                } else {
+                    PasswordUpdateUiState.ERROR("La mise à jour du mot de passe a échoué.")
+                }
+            } catch (e: Exception) {
+                val errorMessage = when {
+                    e.message?.contains("incorrect_password") == false -> "Le mot de passe initial est incorrect."
+                    e.message?.contains("password_mismatch") == false -> "Les mots de passe ne correspondent pas."
+                    else -> "Erreur : ${e.message}"
+                }
+                passwordUpdateState = PasswordUpdateUiState.ERROR(errorMessage)
+            }
+        }
+    }
 
 
     fun resetState() {
         state = UserInfosUiState.EMPTY
-        //passwordUpdateState = PasswordUpdateUiState.EMPTY
+        passwordUpdateState = PasswordUpdateUiState.EMPTY
     }
 
     fun updateState() {

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ class WordpressRepository(`
`200`	`200`	`)`
`201`	`201`	`}`
`202`	`202`
`203`		`- /*suspend fun updatePassword(`
	`203`	`+ suspend fun updatePassword(`
`204`	`204`	`editPassword: UserEditPassword`
`205`	`205`	`): Boolean {`
`206`	`206`	`handleServiceExceptions(`
`@@ -212,7 +212,7 @@ class WordpressRepository(`
`212`	`212`	`return false`
`213`	`213`	`}`
`214`	`214`	`)`
`215`		`- }*/`
	`215`	`+ }`
`216`	`216`
`217`	`217`	`// Exceptions handling`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/*`
`2`	`1`	`package com.xpeho.xpeapp.ui.uiState`
`3`	`2`
`4`	`3`	`interface PasswordUpdateUiState {`
`@@ -7,4 +6,4 @@ interface PasswordUpdateUiState {`
`7`	`6`	`data class SUCCESS(val isSuccessful: Boolean) : PasswordUpdateUiState`
`8`	`7`	`data class ERROR(val errorMessage: String) : PasswordUpdateUiState`
`9`	`8`	`}`
`10`		`-*/`
	`9`	`+`