mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 00:49:44 +00:00
Add a WebRegistrationScreen (not included in the flow yet). (#3281)
This commit is contained in:
@@ -40,15 +40,21 @@ class AuthenticationService: AuthenticationServiceProtocol {
|
||||
|
||||
let client = try await makeClientBuilder().build(homeserverAddress: homeserverAddress)
|
||||
let loginDetails = await client.homeserverLoginDetails()
|
||||
let elementWellKnown = await client.getElementWellKnown()
|
||||
|
||||
MXLog.info("Sliding sync: \(client.slidingSyncVersion())")
|
||||
|
||||
if loginDetails.supportsOidcLogin() {
|
||||
homeserver.loginMode = .oidc
|
||||
homeserver.loginMode = if loginDetails.supportsOidcLogin() {
|
||||
.oidc
|
||||
} else if loginDetails.supportsPasswordLogin() {
|
||||
homeserver.loginMode = .password
|
||||
.password
|
||||
} else {
|
||||
homeserver.loginMode = .unsupported
|
||||
.unsupported
|
||||
}
|
||||
|
||||
homeserver.registrationHelperURL = switch elementWellKnown {
|
||||
case .success(let wellKnown): wellKnown.registrationHelperUrl.flatMap(URL.init)
|
||||
case .failure: nil
|
||||
}
|
||||
|
||||
self.client = client
|
||||
@@ -125,6 +131,25 @@ class AuthenticationService: AuthenticationServiceProtocol {
|
||||
}
|
||||
}
|
||||
|
||||
func completeWebRegistration(using credentials: WebRegistrationCredentials) async -> Result<any UserSessionProtocol, AuthenticationServiceError> {
|
||||
guard let client else { return .failure(.failedLoggingIn) }
|
||||
let session = Session(accessToken: credentials.accessToken,
|
||||
refreshToken: nil,
|
||||
userId: credentials.userID,
|
||||
deviceId: credentials.deviceID,
|
||||
homeserverUrl: client.homeserver(),
|
||||
oidcData: nil,
|
||||
slidingSyncVersion: client.slidingSyncVersion())
|
||||
|
||||
do {
|
||||
try await client.restoreSession(session: session)
|
||||
return await userSession(for: client)
|
||||
} catch {
|
||||
MXLog.error("Failed restoring the client using the provided credentials.")
|
||||
return .failure(.failedUsingWebCredentials)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func makeClientBuilder() -> AuthenticationClientBuilder {
|
||||
|
||||
@@ -27,6 +27,7 @@ enum AuthenticationServiceError: Error {
|
||||
case accountDeactivated
|
||||
case failedLoggingIn
|
||||
case sessionTokenRefreshNotSupported
|
||||
case failedUsingWebCredentials
|
||||
}
|
||||
|
||||
protocol AuthenticationServiceProtocol {
|
||||
@@ -43,6 +44,8 @@ protocol AuthenticationServiceProtocol {
|
||||
func loginWithOIDCCallback(_ callbackURL: URL, data: OIDCAuthorizationDataProxy) async -> Result<UserSessionProtocol, AuthenticationServiceError>
|
||||
/// Performs a password login using the current homeserver.
|
||||
func login(username: String, password: String, initialDeviceName: String?, deviceID: String?) async -> Result<UserSessionProtocol, AuthenticationServiceError>
|
||||
/// Completes registration using the credentials obtained via the helper URL.
|
||||
func completeWebRegistration(using credentials: WebRegistrationCredentials) async -> Result<UserSessionProtocol, AuthenticationServiceError>
|
||||
}
|
||||
|
||||
// MARK: - OIDC
|
||||
|
||||
+5
-1
@@ -9,7 +9,7 @@ import Combine
|
||||
import Foundation
|
||||
import MatrixRustSDK
|
||||
|
||||
class MockAuthenticationServiceProxy: AuthenticationServiceProtocol {
|
||||
class MockAuthenticationService: AuthenticationServiceProtocol {
|
||||
let validCredentials = (username: "alice", password: "12345678")
|
||||
|
||||
private let homeserverSubject: CurrentValueSubject<LoginHomeserver, Never>
|
||||
@@ -58,4 +58,8 @@ class MockAuthenticationServiceProxy: AuthenticationServiceProtocol {
|
||||
let userSession = UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: username))))
|
||||
return .success(userSession)
|
||||
}
|
||||
|
||||
func completeWebRegistration(using credentials: WebRegistrationCredentials) async -> Result<any UserSessionProtocol, AuthenticationServiceError> {
|
||||
.failure(.failedLoggingIn)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user