Merge the AuthenticationService with the QRCodeLoginService. (#4323)

* Merge the AuthenticationServer with the QRCodeLoginService. * Merge AuthenticationClientBuilderFactory and AuthenticationClientBuilder into AuthenticationClientFactory The separation is no longer needed now that password/OIDC login and QR code login have a similar API shape.
2026-11-03 16:10:20 +00:00 · 2025-07-15 17:59:15 +01:00
parent 17000687b5
commit 448bc2d4e3
20 changed files with 275 additions and 502 deletions
@@ -0,0 +1,43 @@
+//
+// Copyright 2024 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 Foundation
+import MatrixRustSDK
+
+// sourcery: AutoMockable
+protocol AuthenticationClientFactoryProtocol {
+    func makeClient(homeserverAddress: String,
+                    sessionDirectories: SessionDirectories,
+                    passphrase: String,
+                    clientSessionDelegate: ClientSessionDelegate,
+                    appSettings: AppSettings,
+                    appHooks: AppHooks) async throws -> ClientProtocol
+}
+
+/// A wrapper around `ClientBuilder` to allow for mocked clients to be injected into authentication tests.
+struct AuthenticationClientFactory: AuthenticationClientFactoryProtocol {
+    func makeClient(homeserverAddress: String,
+                    sessionDirectories: SessionDirectories,
+                    passphrase: String,
+                    clientSessionDelegate: ClientSessionDelegate,
+                    appSettings: AppSettings,
+                    appHooks: AppHooks) async throws -> ClientProtocol {
+        try await ClientBuilder
+            .baseBuilder(httpProxy: appSettings.websiteURL.globalProxy,
+                         slidingSync: .discover,
+                         sessionDelegate: clientSessionDelegate,
+                         appHooks: appHooks,
+                         enableOnlySignedDeviceIsolationMode: appSettings.enableOnlySignedDeviceIsolationMode,
+                         enableKeyShareOnInvite: appSettings.enableKeyShareOnInvite,
+                         threadsEnabled: appSettings.threadsEnabled)
+            .sessionPaths(dataPath: sessionDirectories.dataPath,
+                          cachePath: sessionDirectories.cachePath)
+            .sessionPassphrase(passphrase: passphrase)
+            .serverNameOrHomeserverUrl(serverNameOrUrl: homeserverAddress)
+            .build()
+    }
+}