Encryption Flow Coordinators. (#3471)

* Manage the secure backup screens with flow coordinators.

* Add UI tests for the EncryptionSettingsFlowCoordinator.

* Realise that the settings flow can't reset anymore and remove the sub-flow 🤦‍♂️

* Add UI tests for the EncryptionResetFlowCoordinator.

ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/EncryptionResetScreenCoordinator.swift

@@ -9,14 +9,14 @@ import Combine
 import SwiftUI
 
 enum EncryptionResetScreenCoordinatorAction {
-    case cancel
     case requestOIDCAuthorisation(URL)
+    case requestPassword(passwordPublisher: PassthroughSubject<String, Never>)
     case resetFinished
+    case cancel
 }
 
 struct EncryptionResetScreenCoordinatorParameters {
     let clientProxy: ClientProxyProtocol
-    let navigationStackCoordinator: NavigationStackCoordinator
     let userIndicatorController: UserIndicatorControllerProtocol
 }
 
@@ -43,10 +43,10 @@ final class EncryptionResetScreenCoordinator: CoordinatorProtocol {
             
             guard let self else { return }
             switch action {
-            case .requestPassword:
-                presentPasswordScreen()
             case .requestOIDCAuthorisation(let url):
                 self.actionsSubject.send(.requestOIDCAuthorisation(url))
+            case .requestPassword(let passwordPublisher):
+                self.actionsSubject.send(.requestPassword(passwordPublisher: passwordPublisher))
             case .resetFinished:
                 self.actionsSubject.send(.resetFinished)
             case .cancel:
@@ -63,23 +63,4 @@ final class EncryptionResetScreenCoordinator: CoordinatorProtocol {
     func toPresentable() -> AnyView {
         AnyView(EncryptionResetScreen(context: viewModel.context))
     }
-    
-    // MARK: - Private
-    
-    private func presentPasswordScreen() {
-        let coordinator = EncryptionResetPasswordScreenCoordinator(parameters: .init())
-        
-        coordinator.actionsPublisher.sink { [weak self] action in
-            guard let self else { return }
-            
-            switch action {
-            case .resetIdentity(let password):
-                viewModel.continueResetFlowWith(password: password)
-                parameters.navigationStackCoordinator.pop()
-            }
-        }
-        .store(in: &cancellables)
-        
-        parameters.navigationStackCoordinator.push(coordinator)
-    }
 }

ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/EncryptionResetScreenModels.swift

@@ -5,10 +5,11 @@
 // Please see LICENSE in the repository root for full details.
 //
 
+import Combine
 import Foundation
 
 enum EncryptionResetScreenViewModelAction {
-    case requestPassword
+    case requestPassword(passwordPublisher: PassthroughSubject<String, Never>)
     case requestOIDCAuthorisation(url: URL)
     case resetFinished
     case cancel

ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/EncryptionResetScreenViewModel.swift

@@ -21,6 +21,7 @@ class EncryptionResetScreenViewModel: EncryptionResetScreenViewModelType, Encryp
     }
     
     private var identityResetHandle: IdentityResetHandle?
+    private var passwordCancellable: AnyCancellable?
 
     init(clientProxy: ClientProxyProtocol, userIndicatorController: UserIndicatorControllerProtocol) {
         self.clientProxy = clientProxy
@@ -46,12 +47,6 @@ class EncryptionResetScreenViewModel: EncryptionResetScreenViewModelType, Encryp
         }
     }
     
-    func continueResetFlowWith(password: String) {
-        Task {
-            await resetWith(password: password)
-        }
-    }
-    
     func stop() {
         Task {
             await identityResetHandle?.cancel()
@@ -80,7 +75,14 @@ class EncryptionResetScreenViewModel: EncryptionResetScreenViewModelType, Encryp
             
             switch handle.authType() {
             case .uiaa:
-                actionsSubject.send(.requestPassword)
+                let passwordPublisher = PassthroughSubject<String, Never>()
+                passwordCancellable = passwordPublisher.sink { [weak self] password in
+                    guard let self else { return }
+                    passwordCancellable = nil
+                    Task { await self.resetWith(password: password) }
+                }
+                
+                actionsSubject.send(.requestPassword(passwordPublisher: passwordPublisher))
             case .oidc(let oidcInfo):
                 guard let url = URL(string: oidcInfo.approvalUrl) else {
                     fatalError("Invalid URL received through identity reset handle: \(oidcInfo.approvalUrl)")

ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/EncryptionResetScreenViewModelProtocol.swift

@@ -12,6 +12,5 @@ protocol EncryptionResetScreenViewModelProtocol {
     var actionsPublisher: AnyPublisher<EncryptionResetScreenViewModelAction, Never> { get }
     var context: EncryptionResetScreenViewModelType.Context { get }
     
-    func continueResetFlowWith(password: String)
     func stop()
 }

ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift

@@ -19,6 +19,7 @@ struct EncryptionResetScreen: View {
                 context.send(viewAction: .reset)
             }
             .buttonStyle(.compound(.primary))
+            .accessibilityIdentifier(A11yIdentifiers.encryptionResetScreen.continueReset)
         }
         .background()
         .backgroundStyle(.compound.bgSubtleSecondary)