Handle OIDC cancellation and workaround missing progress when linking a new device. (#4935)

* Fix a bug where the link device flow wasn't dismissed when complete.

* Listen for cancellation of the WAS when linking a device (dismissing the QR screen when it happens).

* Add CustomStringConvertible conformances to QRCodeLoginScreen actions.

ElementX/Sources/FlowCoordinators/AuthenticationFlowCoordinator.swift

@@ -322,8 +322,8 @@ class AuthenticationFlowCoordinator: FlowCoordinatorProtocol {
                 DispatchQueue.main.async {
                     self.stateMachine.tryEvent(.signedIn, userInfo: userSession)
                 }
-            case .requestOIDCAuthorisation:
-                fatalError("QR code login shouldn't request an OIDC flow.")
+            case .requestOIDCAuthorisation, .linkedDevice:
+                fatalError("QR code login shouldn't request an OIDC flow or link a device.")
             }
         }
         .store(in: &cancellables)

ElementX/Sources/FlowCoordinators/LinkNewDeviceFlowCoordinator.swift

@@ -9,7 +9,7 @@ import Combine
 import Foundation
 
 enum LinkNewDeviceFlowCoordinatorAction {
-    case requestOIDCAuthorisation(URL)
+    case requestOIDCAuthorisation(URL, OIDCAccountSettingsPresenter.Continuation)
     case dismiss
 }
 
@@ -76,8 +76,10 @@ class LinkNewDeviceFlowCoordinator: FlowCoordinatorProtocol {
                     fatalError("QR linking shouldn't send sign-in actions.")
                 case .dismiss:
                     navigationStackCoordinator.pop()
-                case .requestOIDCAuthorisation(let url):
-                    actionsSubject.send(.requestOIDCAuthorisation(url))
+                case .requestOIDCAuthorisation(let url, let continuation):
+                    actionsSubject.send(.requestOIDCAuthorisation(url, continuation))
+                case .linkedDevice:
+                    actionsSubject.send(.dismiss)
                 }
             }
             .store(in: &cancellables)

ElementX/Sources/FlowCoordinators/SettingsFlowCoordinator.swift

@@ -182,8 +182,8 @@ class SettingsFlowCoordinator: FlowCoordinatorProtocol {
                 switch action {
                 case .dismiss:
                     navigationStackCoordinator.setSheetCoordinator(nil)
-                case .requestOIDCAuthorisation(let url):
-                    presentAccountManagementURL(url)
+                case .requestOIDCAuthorisation(let url, let continuation):
+                    presentAccountManagementURL(url, continuation: continuation)
                 }
             }
             .store(in: &cancellables)
@@ -292,12 +292,13 @@ class SettingsFlowCoordinator: FlowCoordinatorProtocol {
     // MARK: OIDC Account Management
     
     private var accountSettingsPresenter: OIDCAccountSettingsPresenter?
-    private func presentAccountManagementURL(_ url: URL) {
+    private func presentAccountManagementURL(_ url: URL, continuation: OIDCAccountSettingsPresenter.Continuation? = nil) {
         // Note to anyone in the future if you come back here to make this open in Safari instead of a WAS.
         // As of iOS 16, there is an issue on the simulator with accessing the cookie but it works on a device. 🤷‍♂️
         accountSettingsPresenter = OIDCAccountSettingsPresenter(accountURL: url,
                                                                 presentationAnchor: flowParameters.windowManager.mainWindow,
-                                                                appSettings: flowParameters.appSettings)
+                                                                appSettings: flowParameters.appSettings,
+                                                                continuation: continuation)
         accountSettingsPresenter?.start()
     }
 }