Add an AccountProvider type and use it within the authentication flow. (#6103)

* Add an AccountProvider type and use it within AppSettings. * Use the AccountProvider type within the Authentication flow too. * Fix unit test compilation with Swift 6.4 * Make sure defaultAccountProvider takes allowOtherAccountProviders into account. * Document a caveat on using AuthenticationService.homeserver.value.accountProvider.
2026-11-04 10:33:45 +00:00 · 2026-09-14 15:25:33 +01:00
parent 26fddb8aa2
commit 64aae09c6d
29 changed files with 442 additions and 265 deletions
@@ -0,0 +1,44 @@
+//
+// Copyright 2026 Element Creations Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+// Please see LICENSE files in the repository root for full details.
+//
+
+@testable import ElementX
+import Foundation
+import Testing
+
+struct AccountProviderTests {
+    @Test
+    func genericAddressIsSanitized() {
+        // Lowercased, whitespace trimmed, https:// dropped and trailing slashes removed.
+        #expect(AccountProvider.generic("Matrix.org").serverNameOrBaseURL == "matrix.org")
+        #expect(AccountProvider.generic("  matrix.org  ").serverNameOrBaseURL == "matrix.org")
+        #expect(AccountProvider.generic("https://matrix.org").serverNameOrBaseURL == "matrix.org")
+        #expect(AccountProvider.generic("https://matrix.org/").serverNameOrBaseURL == "matrix.org")
+        #expect(AccountProvider.generic("HTTPS://Matrix.org///").serverNameOrBaseURL == "matrix.org")
+    }
+    
+    @Test
+    func genericAddressKeepsHTTPScheme() {
+        #expect(AccountProvider.generic("http://localhost:8008").serverNameOrBaseURL == "http://localhost:8008",
+                "The http:// scheme should be preserved as an indicator")
+    }
+    
+    @Test
+    func managedUsesServerNameWhenPresent() {
+        let provider = AccountProvider.managed(serverName: "Matrix.org",
+                                               baseURL: "https://matrix-client.matrix.org",
+                                               canUseServerName: true)
+        #expect(provider.serverNameOrBaseURL == "matrix.org")
+    }
+    
+    @Test
+    func managedFallsBackToBaseURLWhenShouldNotUserServerName() {
+        let provider = AccountProvider.managed(serverName: "Matrix.org",
+                                               baseURL: "https://matrix-client.matrix.org",
+                                               canUseServerName: false)
+        #expect(provider.serverNameOrBaseURL == "matrix-client.matrix.org")
+    }
+}