ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an OAuthPresenterHook. (#5545)

Browse Source 
* Add an OAuthPresenterHook.

* Update the enterprise submodule.
This commit is contained in:
Doug
2026-05-06 10:29:25 +01:00
committed by GitHub
parent 5e95bd6531
commit 0355e9f708
14 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Authentication/OAuthAuthenticationPresenter.swift
+5 -2
View File
@@ -19,6 +19,7 @@ class OAuthAuthenticationPresenter: NSObject {
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.
@@ -39,11 +40,13 @@ class OAuthAuthenticationPresenter: NSObject {
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()
}
@@ -54,9 +57,9 @@ class OAuthAuthenticationPresenter: NSObject {
/// 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 authenticationURL = oAuthData.url
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))
ElementX/Sources/Screens/Authentication/SoftLogoutScreen/SoftLogoutScreenCoordinator.swift
+2
View File
@@ -15,6 +15,7 @@ struct SoftLogoutScreenCoordinatorParameters {
let keyBackupNeeded: Bool
let appMediator: AppMediatorProtocol
let appSettings: AppSettings
let appHooks: AppHooks
let userIndicatorController: UserIndicatorControllerProtocol
}
@@ -160,6 +161,7 @@ final class SoftLogoutScreenCoordinator: CoordinatorProtocol {
redirectURL: parameters.appSettings.oAuthRedirectURL,
presentationAnchor: presentationAnchor,
appMediator: parameters.appMediator,
appHooks: parameters.appHooks,
userIndicatorController: parameters.userIndicatorController)
self.oAuthPresenter = presenter
switch await presenter.authenticate(using: oAuthData) {
ElementX/Sources/Screens/Settings/AccountSettings/OAuthAccountSettingsPresenter.swift
+5
View File
@@ -20,6 +20,7 @@ class OAuthAccountSettingsPresenter: NSObject {
private let redirectURL: URL
private let presentationAnchor: UIWindow
private let appMediator: AppMediatorProtocol
private let appHooks: AppHooks
typealias Continuation = AsyncStream<Result<Void, OAuthError>>.Continuation
private let continuation: Continuation?
@@ -28,11 +29,13 @@ class OAuthAccountSettingsPresenter: NSObject {
presentationAnchor: UIWindow,
appMediator: AppMediatorProtocol,
appSettings: AppSettings,
appHooks: AppHooks,
continuation: Continuation? = nil) {
self.accountURL = accountURL
redirectURL = appSettings.oAuthRedirectURL
self.presentationAnchor = presentationAnchor
self.appMediator = appMediator
self.appHooks = appHooks
self.continuation = continuation
super.init()
@@ -40,6 +43,8 @@ class OAuthAccountSettingsPresenter: NSObject {
/// Presents a web authentication session for the supplied data.
func start() {
let accountURL = appHooks.oAuthPresenterHook.update(accountURL)
let session = ASWebAuthenticationSession(url: accountURL, callback: .oAuthRedirectURL(redirectURL)) { [continuation] _, error in
guard let continuation else { return }