Merge pull request #7541 from vector-im/nimau/PSB349_force_hs_selection

Feat: add a build setting flag to always show the server selection screen in login/registration flow.
element-hq · May 11, 2023 · cc9bc24 · cc9bc24
2 parents 0c8c1ce + eae51b3
commit cc9bc24
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 6 deletions.
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -98,10 +98,15 @@ final class BuildSettings: NSObject {
 
     // MARK: - Server configuration
 
-    // Default servers proposed on the authentication screen
+    /// Force the user to set a homeserver instead of using the default one
+    static let forceHomeserverSelection = false
+
+    /// Default server proposed on the authentication screen
     static let serverConfigDefaultHomeserverUrlString = "https://matrix.org"
-    static let serverConfigDefaultIdentityServerUrlString = "https://vector.im"
 
+    /// Default identity server
+    static let serverConfigDefaultIdentityServerUrlString = "https://vector.im"
+
     static let serverConfigSygnalAPIUrlString = "https://matrix.org/_matrix/push/v1/notify"
 
 

diff --git a/Riot/Modules/Authentication/AuthenticationCoordinator.swift b/Riot/Modules/Authentication/AuthenticationCoordinator.swift
@@ -130,8 +130,15 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc
         }
 
         let flow: AuthenticationFlow = initialScreen == .login ? .login : .register
+
+        // Check if the user must select a server
+        if BuildSettings.forceHomeserverSelection, authenticationService.provisioningLink?.homeserverUrl == nil {
+            showServerSelectionScreen(for: flow)
+            return
+        }
+
         do {
-            // Start the flow using the default server (or a provisioning link if set).
+            // Start the flow (if homeserverAddress is nil, the default server will be used).
             try await authenticationService.startFlow(flow)
         } catch {
             MXLog.error("[AuthenticationCoordinator] start: Failed to start, showing server selection.")

diff --git a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
@@ -132,7 +132,14 @@ - (void)viewDidLoad
                                                                              target:self
                                                                              action:@selector(onButtonPressed:)];
 
-    self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString;
+    if (BuildSettings.forceHomeserverSelection)
+    {
+        self.defaultHomeServerUrl = nil;
+    }
+    else
+    {
+        self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString;
+    }
 
     self.defaultIdentityServerUrl = RiotSettings.shared.identityServerUrlString;
 
@@ -1207,7 +1214,14 @@ - (void)setCustomServerFieldsVisible:(BOOL)isVisible
         [self saveCustomServerInputs];
 
         // Restore default configuration
-        [self setHomeServerTextFieldText:self.defaultHomeServerUrl];
+        if (BuildSettings.forceHomeserverSelection)
+        {
+            [self setHomeServerTextFieldText:nil];
+        }
+        else
+        {
+            [self setHomeServerTextFieldText:self.defaultHomeServerUrl];
+        }
         [self setIdentityServerTextFieldText:self.defaultIdentityServerUrl];
 
         [self.customServersTickButton setImage:AssetImages.selectionUntick.image forState:UIControlStateNormal];

diff --git a/RiotSwiftUI/Modules/Authentication/Common/AuthenticationModels.swift b/RiotSwiftUI/Modules/Authentication/Common/AuthenticationModels.swift
@@ -86,6 +86,10 @@ class HomeserverAddress: NSObject {
     /// - Ensure the address contains a scheme, otherwise make it `https`.
     /// - Remove any trailing slashes.
     static func sanitized(_ address: String) -> String {
+        guard !address.isEmpty else {
+            // prevent prefixing an empty string with "https:"
+            return address
+        }
         var address = address.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
 
         if !address.contains("://") {

diff --git a/...Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift b/...Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
@@ -57,7 +57,13 @@ final class AuthenticationServerSelectionCoordinator: Coordinator, Presentable {
         self.parameters = parameters
 
         let homeserver = parameters.authenticationService.state.homeserver
-        let viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: homeserver.displayableAddress,
+        let homeserverAddress: String
+        if BuildSettings.forceHomeserverSelection, homeserver.addressFromUser == nil {
+            homeserverAddress = ""
+        } else {
+            homeserverAddress = homeserver.displayableAddress
+        }
+        let viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: homeserverAddress,
                                                                flow: parameters.authenticationService.state.flow,
                                                                hasModalPresentation: parameters.hasModalPresentation)
         let view = AuthenticationServerSelectionScreen(viewModel: viewModel.context)

diff --git a/changelog.d/pr-7541.change b/changelog.d/pr-7541.change
@@ -0,0 +1 @@
+Add a flag in the build settings to force the user to define a homeserver instead of using the default one.