From 5e64898de78446cd69e8bd59d612891813de8bc4 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Tue, 25 Mar 2025 16:25:41 +0100
Subject: [PATCH] Fix 'unverified session' flow displayed when creating account
 (#4467)

* Fix 'unverified session' after creating an account: when creating an account, wait until the session is verified before marking the authentication flow as completed.
---
 .../screens/createaccount/CreateAccountPresenter.kt  | 12 ++++++++++++
 .../createaccount/CreateAccountPresenterTest.kt      |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
index 61d90b84e5..ac1d637bc8 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
@@ -19,16 +19,22 @@ import dagger.assisted.AssistedInject
 import io.element.android.features.login.impl.DefaultLoginUserStory
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeout
+import kotlin.time.Duration.Companion.seconds
 
 class CreateAccountPresenter @AssistedInject constructor(
     @Assisted private val url: String,
     private val authenticationService: MatrixAuthenticationService,
+    private val clientProvider: MatrixClientProvider,
     private val defaultLoginUserStory: DefaultLoginUserStory,
     private val messageParser: MessageParser,
     private val buildMeta: BuildMeta,
@@ -73,6 +79,12 @@ class CreateAccountPresenter @AssistedInject constructor(
         }.flatMap { externalSession ->
             authenticationService.importCreatedSession(externalSession)
         }.onSuccess { sessionId ->
+            tryOrNull {
+                // Wait until the session is verified
+                val client = clientProvider.getOrRestore(sessionId).getOrThrow()
+                val sessionVerificationService = client.sessionVerificationService()
+                withTimeout(10.seconds) { sessionVerificationService.sessionVerifiedStatus.first { it.isVerified() } }
+            }
             // We will not navigate to the WaitList screen, so the login user story is done
             defaultLoginUserStory.setLoginFlowIsDone(true)
             loggedInState.value = AsyncAction.Success(sessionId)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt
index ef8cfc86d0..6f95cf199b 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.tests.testutils.WarmUpRule
@@ -135,11 +136,13 @@ class CreateAccountPresenterTest {
         defaultLoginUserStory: DefaultLoginUserStory = DefaultLoginUserStory(),
         messageParser: MessageParser = FakeMessageParser(),
         buildMeta: BuildMeta = aBuildMeta(),
+        clientProvider: FakeMatrixClientProvider = FakeMatrixClientProvider(),
     ) = CreateAccountPresenter(
         url = url,
         authenticationService = authenticationService,
         defaultLoginUserStory = defaultLoginUserStory,
         messageParser = messageParser,
         buildMeta = buildMeta,
+        clientProvider = clientProvider,
     )
 }