feat(new-registration): new registration personal account creation (WPB-17454)

app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt

@@ -46,11 +46,11 @@ import com.wire.android.navigation.BackStackMode
 import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.annotation.app.WireDestination
-import com.wire.android.ui.authentication.create.common.ServerTitle
 import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
 import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
 import com.wire.android.ui.authentication.create.common.CreatePersonalAccountNavGraph
 import com.wire.android.ui.authentication.create.common.CreateTeamAccountNavGraph
+import com.wire.android.ui.authentication.create.common.ServerTitle
 import com.wire.android.ui.authentication.create.summary.CreateAccountSummaryNavArgs
 import com.wire.android.ui.authentication.verificationcode.ResendCodeText
 import com.wire.android.ui.common.WireDialog
@@ -64,6 +64,7 @@ import com.wire.android.ui.common.topappbar.NavigationIconType
 import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
 import com.wire.android.ui.destinations.CreateAccountSummaryScreenDestination
 import com.wire.android.ui.destinations.RemoveDeviceScreenDestination
+import com.wire.android.ui.registration.code.CreateAccountCodeResult
 import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireDimensions
 import com.wire.android.ui.theme.wireTypography
@@ -96,7 +97,7 @@ fun CreateAccountCodeScreen(
             serverConfig = serverConfig
         )
 
-        (codeState.result as? CreateAccountCodeViewState.Result.Error.DialogError)?.let {
+        (codeState.result as? CreateAccountCodeResult.Error.DialogError)?.let {
             val (title, message) = it.getResources(type = codeState.type)
             WireDialog(
                 title = title,
@@ -110,10 +111,10 @@ fun CreateAccountCodeScreen(
             )
         }
         LaunchedEffect(codeState.result) {
-            if (codeState.result is CreateAccountCodeViewState.Result.Success) {
+            if (codeState.result is CreateAccountCodeResult.Success) {
                 navigateToSummaryScreen()
             }
-            if (codeState.result is CreateAccountCodeViewState.Result.Error.TooManyDevicesError) {
+            if (codeState.result is CreateAccountCodeResult.Error.TooManyDevicesError) {
                 clearCodeError()
                 clearCodeField()
                 navigator.navigate(NavigationCommand(RemoveDeviceScreenDestination, BackStackMode.CLEAR_WHOLE))
@@ -171,7 +172,7 @@ private fun CodeContent(
                     codeLength = state.codeLength,
                     textState = textState,
                     state = when (state.result) {
-                        is CreateAccountCodeViewState.Result.Error.TextFieldError.InvalidActivationCodeError ->
+                        is CreateAccountCodeResult.Error.TextFieldError.InvalidActivationCodeError ->
                             WireTextFieldState.Error(stringResource(id = R.string.create_account_code_error))
 
                         else -> WireTextFieldState.Default
@@ -199,33 +200,33 @@ private fun CodeContent(
 }
 
 @Composable
-private fun CreateAccountCodeViewState.Result.Error.DialogError.getResources(type: CreateAccountFlowType) = when (this) {
-    CreateAccountCodeViewState.Result.Error.DialogError.AccountAlreadyExistsError -> DialogErrorStrings(
+private fun CreateAccountCodeResult.Error.DialogError.getResources(type: CreateAccountFlowType) = when (this) {
+    CreateAccountCodeResult.Error.DialogError.AccountAlreadyExistsError -> DialogErrorStrings(
         stringResource(id = R.string.create_account_code_error_title),
         stringResource(id = R.string.create_account_email_already_in_use_error)
     )
 
-    CreateAccountCodeViewState.Result.Error.DialogError.BlackListedError -> DialogErrorStrings(
+    CreateAccountCodeResult.Error.DialogError.BlackListedError -> DialogErrorStrings(
         stringResource(id = R.string.create_account_code_error_title),
         stringResource(id = R.string.create_account_email_blacklisted_error)
     )
 
-    CreateAccountCodeViewState.Result.Error.DialogError.EmailDomainBlockedError -> DialogErrorStrings(
+    CreateAccountCodeResult.Error.DialogError.EmailDomainBlockedError -> DialogErrorStrings(
         stringResource(id = R.string.create_account_code_error_title),
         stringResource(id = R.string.create_account_email_domain_blocked_error)
     )
 
-    CreateAccountCodeViewState.Result.Error.DialogError.InvalidEmailError -> DialogErrorStrings(
+    CreateAccountCodeResult.Error.DialogError.InvalidEmailError -> DialogErrorStrings(
         stringResource(id = R.string.create_account_code_error_title),
         stringResource(id = R.string.create_account_email_invalid_error)
     )
 
-    CreateAccountCodeViewState.Result.Error.DialogError.TeamMembersLimitError -> DialogErrorStrings(
+    CreateAccountCodeResult.Error.DialogError.TeamMembersLimitError -> DialogErrorStrings(
         stringResource(id = R.string.create_account_code_error_title),
         stringResource(id = R.string.create_account_code_error_team_members_limit_reached)
     )
 
-    CreateAccountCodeViewState.Result.Error.DialogError.CreationRestrictedError -> DialogErrorStrings(
+    CreateAccountCodeResult.Error.DialogError.CreationRestrictedError -> DialogErrorStrings(
         stringResource(id = R.string.create_account_code_error_title),
         stringResource(
             id = when (type) {
@@ -235,10 +236,10 @@ private fun CreateAccountCodeViewState.Result.Error.DialogError.getResources(typ
         )
     )
     // TODO: sync with design about the error message
-    CreateAccountCodeViewState.Result.Error.DialogError.UserAlreadyExistsError ->
+    CreateAccountCodeResult.Error.DialogError.UserAlreadyExistsError ->
         DialogErrorStrings("User Already LoggedIn", "UserAlreadyLoggedIn")
 
-    is CreateAccountCodeViewState.Result.Error.DialogError.GenericError ->
+    is CreateAccountCodeResult.Error.DialogError.GenericError ->
         this.coreFailure.dialogErrorStrings(LocalContext.current.resources)
 }
 

app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewModel.kt

@@ -33,6 +33,7 @@
 import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
 import com.wire.android.ui.common.textfield.textAsFlow
 import com.wire.android.ui.navArgs
+import com.wire.android.ui.registration.code.CreateAccountCodeResult
 import com.wire.android.util.WillNeverOccurError
 import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.configuration.server.ServerConfig
@@ -103,7 +104,7 @@
     }
 
     fun clearCodeError() {
-        codeState = codeState.copy(result = CreateAccountCodeViewState.Result.None)
+        codeState = codeState.copy(result = CreateAccountCodeResult.None)
     }
 
     fun clearCodeField() {
@@ -193,19 +194,19 @@
                     }
 
                     is RegisterClientResult.Success -> {
-                        codeState = codeState.copy(result = CreateAccountCodeViewState.Result.Success)
+                        codeState = codeState.copy(result = CreateAccountCodeResult.Success)
                     }
 
                     is RegisterClientResult.E2EICertificateRequired -> {
                         // TODO
-                        codeState = codeState.copy(result = CreateAccountCodeViewState.Result.Success)
+                        codeState = codeState.copy(result = CreateAccountCodeResult.Success)
                     }
                 }
             }
         }
     }
 
-    private fun updateCodeErrorState(codeError: CreateAccountCodeViewState.Result.Error) {
+    private fun updateCodeErrorState(codeError: CreateAccountCodeResult.Error) {
         codeState = codeState.copy(loading = false, result = codeError)
     }
 
@@ -219,8 +220,8 @@
         )
 
     private fun RegisterClientResult.Failure.toCodeError() = when (this) {
-        is RegisterClientResult.Failure.TooManyClients -> CreateAccountCodeViewState.Result.Error.TooManyDevicesError
-        is RegisterClientResult.Failure.Generic -> CreateAccountCodeViewState.Result.Error.DialogError.GenericError(this.genericFailure)
+        is RegisterClientResult.Failure.TooManyClients -> CreateAccountCodeResult.Error.TooManyDevicesError
+        is RegisterClientResult.Failure.Generic -> CreateAccountCodeResult.Error.DialogError.GenericError(this.genericFailure)
         is RegisterClientResult.Failure.InvalidCredentials ->
             throw WillNeverOccurError("RegisterClient: wrong password when register client after creating a new account")
 
@@ -229,30 +230,30 @@
     }
 
     private fun RegisterResult.Failure.toCodeError() = when (this) {
-        RegisterResult.Failure.InvalidActivationCode -> CreateAccountCodeViewState.Result.Error.TextFieldError.InvalidActivationCodeError
-        RegisterResult.Failure.AccountAlreadyExists -> CreateAccountCodeViewState.Result.Error.DialogError.AccountAlreadyExistsError
-        RegisterResult.Failure.BlackListed -> CreateAccountCodeViewState.Result.Error.DialogError.BlackListedError
-        RegisterResult.Failure.EmailDomainBlocked -> CreateAccountCodeViewState.Result.Error.DialogError.EmailDomainBlockedError
-        RegisterResult.Failure.InvalidEmail -> CreateAccountCodeViewState.Result.Error.DialogError.InvalidEmailError
-        RegisterResult.Failure.TeamMembersLimitReached -> CreateAccountCodeViewState.Result.Error.DialogError.TeamMembersLimitError
-        RegisterResult.Failure.UserCreationRestricted -> CreateAccountCodeViewState.Result.Error.DialogError.CreationRestrictedError
-        is RegisterResult.Failure.Generic -> CreateAccountCodeViewState.Result.Error.DialogError.GenericError(this.failure)
+        RegisterResult.Failure.InvalidActivationCode -> CreateAccountCodeResult.Error.TextFieldError.InvalidActivationCodeError
+        RegisterResult.Failure.AccountAlreadyExists -> CreateAccountCodeResult.Error.DialogError.AccountAlreadyExistsError
+        RegisterResult.Failure.BlackListed -> CreateAccountCodeResult.Error.DialogError.BlackListedError
+        RegisterResult.Failure.EmailDomainBlocked -> CreateAccountCodeResult.Error.DialogError.EmailDomainBlockedError
+        RegisterResult.Failure.InvalidEmail -> CreateAccountCodeResult.Error.DialogError.InvalidEmailError
+        RegisterResult.Failure.TeamMembersLimitReached -> CreateAccountCodeResult.Error.DialogError.TeamMembersLimitError
+        RegisterResult.Failure.UserCreationRestricted -> CreateAccountCodeResult.Error.DialogError.CreationRestrictedError
+        is RegisterResult.Failure.Generic -> CreateAccountCodeResult.Error.DialogError.GenericError(this.failure)
     }
 
     private fun AddAuthenticatedUserUseCase.Result.Failure.toCodeError() = when (this) {
         is AddAuthenticatedUserUseCase.Result.Failure.Generic ->
-            CreateAccountCodeViewState.Result.Error.DialogError.GenericError(this.genericFailure)
+            CreateAccountCodeResult.Error.DialogError.GenericError(this.genericFailure)
 
         AddAuthenticatedUserUseCase.Result.Failure.UserAlreadyExists ->
-            CreateAccountCodeViewState.Result.Error.DialogError.UserAlreadyExistsError
+            CreateAccountCodeResult.Error.DialogError.UserAlreadyExistsError
     }
 
     private fun RequestActivationCodeResult.toCodeError() = when (this) {
-        RequestActivationCodeResult.Failure.AlreadyInUse -> CreateAccountCodeViewState.Result.Error.DialogError.AccountAlreadyExistsError
-        RequestActivationCodeResult.Failure.BlacklistedEmail -> CreateAccountCodeViewState.Result.Error.DialogError.BlackListedError
-        RequestActivationCodeResult.Failure.DomainBlocked -> CreateAccountCodeViewState.Result.Error.DialogError.EmailDomainBlockedError
-        RequestActivationCodeResult.Failure.InvalidEmail -> CreateAccountCodeViewState.Result.Error.DialogError.InvalidEmailError
-        is RequestActivationCodeResult.Failure.Generic -> CreateAccountCodeViewState.Result.Error.DialogError.GenericError(this.failure)
-        RequestActivationCodeResult.Success -> CreateAccountCodeViewState.Result.None
+        RequestActivationCodeResult.Failure.AlreadyInUse -> CreateAccountCodeResult.Error.DialogError.AccountAlreadyExistsError
+        RequestActivationCodeResult.Failure.BlacklistedEmail -> CreateAccountCodeResult.Error.DialogError.BlackListedError
+        RequestActivationCodeResult.Failure.DomainBlocked -> CreateAccountCodeResult.Error.DialogError.EmailDomainBlockedError
+        RequestActivationCodeResult.Failure.InvalidEmail -> CreateAccountCodeResult.Error.DialogError.InvalidEmailError
+        is RequestActivationCodeResult.Failure.Generic -> CreateAccountCodeResult.Error.DialogError.GenericError(this.failure)
+        RequestActivationCodeResult.Success -> CreateAccountCodeResult.None
     }
 }

app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewState.kt

@@ -19,37 +19,13 @@
 package com.wire.android.ui.authentication.create.code
 
 import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
-import com.wire.kalium.common.error.CoreFailure
+import com.wire.android.ui.registration.code.CreateAccountCodeResult
+import com.wire.android.ui.registration.code.CreateAccountVerificationCodeViewState.Companion.DEFAULT_VERIFICATION_CODE_LENGTH
 
 data class CreateAccountCodeViewState(
     val type: CreateAccountFlowType,
     val codeLength: Int = DEFAULT_VERIFICATION_CODE_LENGTH,
     val email: String = "",
     val loading: Boolean = false,
-    val result: Result = Result.None,
-) {
-    sealed interface Result {
-        data object None : Result
-        data object Success : Result
-        sealed class Error : Result {
-            sealed class TextFieldError : Error() {
-                data object InvalidActivationCodeError : TextFieldError()
-            }
-
-            sealed class DialogError : Error() {
-                data object InvalidEmailError : DialogError()
-                data object AccountAlreadyExistsError : DialogError()
-                data object BlackListedError : DialogError()
-                data object EmailDomainBlockedError : DialogError()
-                data object TeamMembersLimitError : DialogError()
-                data object CreationRestrictedError : DialogError()
-                data object UserAlreadyExistsError : DialogError()
-                data class GenericError(val coreFailure: CoreFailure) : DialogError()
-            }
-            data object TooManyDevicesError : Error()
-        }
-    }
-    companion object {
-        const val DEFAULT_VERIFICATION_CODE_LENGTH = 6
-    }
-}
+    val result: CreateAccountCodeResult = CreateAccountCodeResult.None,
+)

app/src/main/kotlin/com/wire/android/ui/authentication/create/common/CreateAccountNavArgs.kt

@@ -24,6 +24,7 @@ import com.wire.kalium.logic.configuration.server.ServerConfig
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 
+@Deprecated("This nav arg belongs to the old registration flow, please use the new one [CreateAccountDataNavArgs]")
 @Parcelize
 @TypeParceler<ServerConfig.Links?, ServerConfigLinksParceler>()
 data class CreateAccountNavArgs(
@@ -32,9 +33,17 @@ data class CreateAccountNavArgs(
     val customServerConfig: ServerConfig.Links? = null,
 ) : Parcelable
 
+@Parcelize
+@TypeParceler<ServerConfig.Links?, ServerConfigLinksParceler>()
+data class CreateAccountDataNavArgs(
+    val userRegistrationInfo: UserRegistrationInfo = UserRegistrationInfo(),
+    val customServerConfig: ServerConfig.Links? = null,
+) : Parcelable
+
 @Parcelize
 data class UserRegistrationInfo(
     val email: String = String.EMPTY,
+    val name: String = String.EMPTY,
     val firstName: String = String.EMPTY,
     val lastName: String = String.EMPTY,
     val password: String = String.EMPTY,

app/src/main/kotlin/com/wire/android/ui/authentication/create/common/CreateAccountNavGraph.kt

@@ -21,14 +21,22 @@ package com.wire.android.ui.authentication.create.common
 import com.ramcosta.composedestinations.annotation.NavGraph
 import com.ramcosta.composedestinations.annotation.RootNavGraph
 
+@Deprecated("These destinations belongs to the old registration flow, please use the new one [CreateAccountNavGraph]")
 @RootNavGraph
 @NavGraph
 annotation class CreatePersonalAccountNavGraph(
     val start: Boolean = false
 )
 
+@Deprecated("These destinations belongs to the old registration flow, please use the new one [CreateAccountNavGraph]")
 @RootNavGraph
 @NavGraph
 annotation class CreateTeamAccountNavGraph(
     val start: Boolean = false
 )
+
+@RootNavGraph
+@NavGraph
+annotation class CreateAccountNavGraph(
+    val start: Boolean = false
+)