mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 16:24:11 +00:00
a520d94760
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@element.io>
202 lines
8.4 KiB
Swift
202 lines
8.4 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import AuthenticationServices
|
|
|
|
/// Presents a web authentication session for an OAuth request.
|
|
///
|
|
/// In certain instances the URL may require opening an external app instead of using a WAS. Because of this
|
|
/// it is recommended to not encode the OAuth authentication within any state machines, as there is no guarantee
|
|
/// that any cancellations/failures will be communicated upwards.
|
|
class OAuthAuthenticationPresenter: NSObject {
|
|
private let authenticationService: AuthenticationServiceProtocol
|
|
private let redirectURL: URL
|
|
private let presentationAnchor: UIWindow
|
|
private let appMediator: AppMediatorProtocol
|
|
private let appHooks: AppHooks
|
|
private let userIndicatorController: UserIndicatorControllerProtocol
|
|
|
|
/// The data required to complete a request.
|
|
struct Request {
|
|
let session: ASWebAuthenticationSession
|
|
let continuation: CheckedContinuation<Response, Never>
|
|
}
|
|
|
|
struct Response {
|
|
let url: URL?
|
|
let isExternal: Bool
|
|
let error: Error?
|
|
}
|
|
|
|
private var activeRequest: Request?
|
|
|
|
init(authenticationService: AuthenticationServiceProtocol,
|
|
redirectURL: URL,
|
|
presentationAnchor: UIWindow,
|
|
appMediator: AppMediatorProtocol,
|
|
appHooks: AppHooks,
|
|
userIndicatorController: UserIndicatorControllerProtocol) {
|
|
self.authenticationService = authenticationService
|
|
self.redirectURL = redirectURL
|
|
self.presentationAnchor = presentationAnchor
|
|
self.appMediator = appMediator
|
|
self.appHooks = appHooks
|
|
self.userIndicatorController = userIndicatorController
|
|
super.init()
|
|
}
|
|
|
|
/// Presents a web authentication session for the supplied data.
|
|
///
|
|
/// **Note:** The failure case cannot be relied upon as a signal that the authentication has ended.
|
|
/// In particular if the authentication URL requires opening an external app, then the user may return
|
|
/// to the app without completing (or cancelling) the authentication.
|
|
func authenticate(using oAuthData: OAuthAuthorizationDataProxy) async -> Result<UserSessionProtocol, AuthenticationServiceError> {
|
|
let authenticationURL = appHooks.oAuthPresenterHook.update(oAuthData.url)
|
|
|
|
let response = await withCheckedContinuation { continuation in
|
|
let session = ASWebAuthenticationSession(url: authenticationURL, callback: .oAuthRedirectURL(redirectURL)) { url, error in
|
|
MXLog.info("Handling callback from the session.")
|
|
continuation.resume(returning: Response(url: url, isExternal: false, error: error))
|
|
}
|
|
|
|
session.prefersEphemeralWebBrowserSession = false
|
|
session.presentationContextProvider = self
|
|
session.additionalHeaderFields = [
|
|
"X-Element-User-Agent": UserAgentBuilder.makeASCIIUserAgent()
|
|
]
|
|
|
|
activeRequest = Request(session: session, continuation: continuation)
|
|
|
|
if authenticationURL.scheme == "https" || authenticationURL.scheme == "http" {
|
|
session.start()
|
|
} else {
|
|
appMediator.open(authenticationURL)
|
|
}
|
|
}
|
|
|
|
if response.isExternal {
|
|
// Manually dismiss the web authentication session if the login was completed outside of the app.
|
|
// Note: This doesn't trigger a callback so no need to worry about the continuation being called twice.
|
|
activeRequest?.session.cancel()
|
|
}
|
|
activeRequest = nil
|
|
|
|
guard let url = response.url else {
|
|
// Check for user cancellation (on the WAS sheet) to avoid showing an alert in that instance.
|
|
if response.error?.isOAuthUserCancellation == true {
|
|
// No need to show an error here, just abort and return a failure.
|
|
await authenticationService.abortOAuthLogin(data: oAuthData)
|
|
return .failure(.oAuthError(.userCancellation))
|
|
}
|
|
|
|
let errorDescription = response.error.map(String.init(describing:)) ?? "Unknown error"
|
|
MXLog.error("Missing callback URL from the web authentication session: \(errorDescription)")
|
|
|
|
showFailureIndicator()
|
|
await authenticationService.abortOAuthLogin(data: oAuthData)
|
|
return .failure(.oAuthError(.unknown))
|
|
}
|
|
|
|
// Exchanging the callback with the homeserver can be slow, so show the loading indicator while we wait (the modal has already been dismissed).
|
|
startLoading(delay: .milliseconds(50)) // Small delay to handle a cancellation callback without the indicator showing.
|
|
defer { stopLoading() }
|
|
|
|
switch await authenticationService.loginWithOAuthCallback(url) {
|
|
case .success(let userSession):
|
|
return .success(userSession)
|
|
case .failure(.oAuthError(.userCancellation)): // Check for user cancellation (on the MAS web page)
|
|
// No need to show an error here, just return the failure.
|
|
return .failure(.oAuthError(.userCancellation))
|
|
case .failure(let error):
|
|
MXLog.error("Error occurred: \(error)")
|
|
showFailureIndicator()
|
|
return .failure(error)
|
|
}
|
|
}
|
|
|
|
/// This method will be used when the web authentication session redirects the user to an external
|
|
/// authentication app. During normal use the redirect is handled automatically by the session's closure.
|
|
func handleUniversalLinkCallback(_ url: URL) {
|
|
guard let activeRequest else {
|
|
MXLog.error("Failed to handle universal link callback. Missing request.")
|
|
return
|
|
}
|
|
MXLog.info("Handling callback from a universal link.")
|
|
activeRequest.continuation.resume(returning: Response(url: url, isExternal: true, error: nil))
|
|
}
|
|
|
|
func cancel() {
|
|
activeRequest?.session.cancel()
|
|
activeRequest = nil // Programatically cancelling the session doesn't trigger a callback.
|
|
}
|
|
|
|
private var loadingIndicatorID: String {
|
|
"\(Self.self)-Loading"
|
|
}
|
|
|
|
private var failureIndicatorID: String {
|
|
"\(Self.self)-Failure"
|
|
}
|
|
|
|
private func startLoading(delay: Duration? = nil) {
|
|
userIndicatorController.submitIndicator(UserIndicator(id: loadingIndicatorID,
|
|
type: .modal,
|
|
title: L10n.commonLoading,
|
|
persistent: true),
|
|
delay: delay)
|
|
}
|
|
|
|
private func stopLoading() {
|
|
userIndicatorController.retractIndicatorWithId(loadingIndicatorID)
|
|
}
|
|
|
|
private func showFailureIndicator() {
|
|
userIndicatorController.submitIndicator(UserIndicator(id: failureIndicatorID,
|
|
type: .toast,
|
|
title: L10n.errorUnknown,
|
|
icon: \.close))
|
|
}
|
|
}
|
|
|
|
// MARK: ASWebAuthenticationPresentationContextProviding
|
|
|
|
extension OAuthAuthenticationPresenter: ASWebAuthenticationPresentationContextProviding {
|
|
func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
|
|
presentationAnchor
|
|
}
|
|
}
|
|
|
|
extension ASWebAuthenticationSession.Callback {
|
|
static func oAuthRedirectURL(_ url: URL) -> Self {
|
|
if url.scheme == "https", let host = url.host() {
|
|
.https(host: host, path: url.path())
|
|
} else if let scheme = url.scheme {
|
|
.customScheme(scheme)
|
|
} else {
|
|
fatalError("Invalid OAuth redirect URL: \(url)")
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Helpers
|
|
|
|
extension Error {
|
|
var isOAuthUserCancellation: Bool {
|
|
let nsError = self as NSError
|
|
|
|
if nsError.domain == ASWebAuthenticationSessionErrorDomain,
|
|
nsError.code == ASWebAuthenticationSessionError.canceledLogin.rawValue,
|
|
// If there's a failure reason then the cancellation wasn't made by the user.
|
|
nsError.localizedFailureReason == nil {
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
}
|