refactor(register): improve code quality across registration flow

- Validate URL scheme in normalize_custom_homeserver (reject ftp://, file://, etc.)
- Add RegisterStatusModal helper methods (set_title, set_status, button_ref)
  following the LoginStatusModal pattern, replacing direct widget tree access
- Extract update_homeserver_option_buttons() to consolidate radio button state
- Initialize selected_homeserver via LiveHook::after_new_from_doc instead of
  lazy init in handle_actions
- Suppress redundant popup for TokenRequired errors (token input field is
  sufficient feedback)
- Stop storing username/password in Cli struct; use RegisterRequest directly
- Improve token error detection with structured UIAA error checking before
  falling back to string matching
- Reduce spawn_sso_server complexity by extracting post_pending/post_status/
  post_failure closures, eliminating 6 duplicated if-else branches

Author: TigerInYourDream

src/register/register_screen.rs

@@ -56,7 +56,7 @@ use url::Url;
 use crate::sliding_sync::{submit_async_request, MatrixRequest, RegisterRequest};
 use crate::login::login_screen::LoginAction;
 use super::{
-    register_status_modal::RegisterStatusModalAction,
+    register_status_modal::{RegisterStatusModalAction, RegisterStatusModalWidgetExt},
     validation::{
         MIN_PASSWORD_CHARS, needs_custom_homeserver_input, normalize_custom_homeserver,
         normalize_username, password_has_min_chars,
@@ -409,7 +409,7 @@ live_design! {
     }
 }
 
-#[derive(Live, LiveHook, Widget)]
+#[derive(Live, Widget)]
 pub struct RegisterScreen {
     #[deref]
     view: View,
@@ -427,6 +427,12 @@ pub struct RegisterScreen {
     registration_token_required: bool,
 }
 
+impl LiveHook for RegisterScreen {
+    fn after_new_from_doc(&mut self, _cx: &mut Cx) {
+        self.selected_homeserver = "matrix.org".to_string();
+    }
+}
+
 impl RegisterScreen {
     fn toggle_homeserver_options(&mut self, cx: &mut Cx) {
         self.is_homeserver_editing = !self.is_homeserver_editing;
@@ -436,6 +442,20 @@ impl RegisterScreen {
         self.redraw(cx);
     }
 
+    /// Updates the radio-style homeserver option buttons to reflect the current selection.
+    fn update_homeserver_option_buttons(&self, cx: &mut Cx) {
+        let is_matrix_org = !self.pending_custom_homeserver;
+        let matrix_btn = self.view.button(ids!(matrix_option));
+        let other_btn = self.view.button(ids!(other_option));
+        if is_matrix_org {
+            matrix_btn.set_text(cx, "● matrix.org");
+            other_btn.set_text(cx, "○ Other homeserver");
+        } else {
+            matrix_btn.set_text(cx, "○ matrix.org");
+            other_btn.set_text(cx, "● Other homeserver");
+        }
+    }
+
     fn show_warning(&self, message: &str) {
         use crate::shared::popup_list::{enqueue_popup_notification, PopupItem, PopupKind};
         enqueue_popup_notification(PopupItem {
@@ -521,10 +541,7 @@ impl RegisterScreen {
             .set_visible(cx, false);
 
         // Reset homeserver option buttons
-        let matrix_option_button = self.view.button(ids!(matrix_option));
-        let other_option_button = self.view.button(ids!(other_option));
-        matrix_option_button.set_text(cx, "● matrix.org");
-        other_option_button.set_text(cx, "○ Other homeserver");
+        self.update_homeserver_option_buttons(cx);
 
         // Clear input fields
         self.view.text_input(ids!(username_input)).set_text(cx, "");
@@ -574,12 +591,6 @@ impl MatchEvent for RegisterScreen {
         let edit_button = self.view.button(ids!(edit_button));
         let sso_button = self.view.button(ids!(sso_button));
 
-        // Initialize selected_homeserver if empty
-        if self.selected_homeserver.is_empty() {
-            self.selected_homeserver = "matrix.org".to_string();
-            self.pending_custom_homeserver = false;
-        }
-
         if login_button.clicked(actions) {
             cx.action(RegisterAction::NavigateToLogin);
         }
@@ -596,10 +607,9 @@ impl MatchEvent for RegisterScreen {
             self.update_button_mask(&sso_button, cx, 1.0);
 
             // Show SSO registration modal immediately
-            let status_label = self.view.label(ids!(status_modal_inner.status));
-            status_label.set_text(cx, "Opening your browser...\n\nPlease complete registration in your browser, then return to Robrix.");
-            let cancel_button = self.view.button(ids!(status_modal_inner.cancel_button));
-            cancel_button.set_text(cx, "Cancel");
+            let status_modal_inner = self.view.register_status_modal(ids!(status_modal_inner));
+            status_modal_inner.set_status(cx, "Opening your browser...\n\nPlease complete registration in your browser, then return to Robrix.");
+            status_modal_inner.button_ref().set_text(cx, "Cancel");
             self.view.modal(ids!(status_modal)).open(cx);
             self.redraw(cx);
 
@@ -629,8 +639,7 @@ impl MatchEvent for RegisterScreen {
                 .set_visible(cx, false);
 
             // Update button styles to show selection
-            matrix_option_button.set_text(cx, "● matrix.org");
-            other_option_button.set_text(cx, "○ Other homeserver");
+            self.update_homeserver_option_buttons(cx);
 
             self.is_homeserver_editing = false;
             self.view
@@ -650,8 +659,7 @@ impl MatchEvent for RegisterScreen {
                 .set_text(cx, "Custom homeserver (required)");
 
             // Update button styles to show selection
-            matrix_option_button.set_text(cx, "○ matrix.org");
-            other_option_button.set_text(cx, "● Other homeserver");
+            self.update_homeserver_option_buttons(cx);
             self.update_registration_mode(cx);
         }
 
@@ -748,12 +756,10 @@ impl MatchEvent for RegisterScreen {
             self.update_button_mask(&register_button, cx, 1.0);
 
             // Show registration status modal with appropriate text for password registration
-            let status_label = self.view.label(ids!(status_modal_inner.status));
-            status_label.set_text(cx, "Registering account, please wait...");
-            let title_label = self.view.label(ids!(status_modal_inner.title));
-            title_label.set_text(cx, "Registration Status");
-            let cancel_button = self.view.button(ids!(status_modal_inner.cancel_button));
-            cancel_button.set_text(cx, "Cancel");
+            let status_modal_inner = self.view.register_status_modal(ids!(status_modal_inner));
+            status_modal_inner.set_status(cx, "Registering account, please wait...");
+            status_modal_inner.set_title(cx, "Registration Status");
+            status_modal_inner.button_ref().set_text(cx, "Cancel");
             self.view.modal(ids!(status_modal)).open(cx);
             self.redraw(cx);
 
@@ -827,11 +833,9 @@ impl MatchEvent for RegisterScreen {
                     RegisterAction::SsoRegistrationStatus { status } => {
                         // Update SSO status in modal (only if our modal is already open)
                         if self.sso_pending {
-                            let status_label = self.view.label(ids!(status_modal_inner.status));
-                            status_label.set_text(cx, status);
-                            let cancel_button =
-                                self.view.button(ids!(status_modal_inner.cancel_button));
-                            cancel_button.set_text(cx, "Cancel");
+                            let status_modal_inner = self.view.register_status_modal(ids!(status_modal_inner));
+                            status_modal_inner.set_status(cx, status);
+                            status_modal_inner.button_ref().set_text(cx, "Cancel");
                             self.redraw(cx);
                         }
                     }

src/register/register_status_modal.rs

@@ -120,6 +120,46 @@ impl MatchEvent for RegisterStatusModal {
     }
 }
 
+impl RegisterStatusModal {
+    /// Sets the title text displayed in the modal.
+    fn set_title(&mut self, cx: &mut Cx, title: &str) {
+        self.label(ids!(title)).set_text(cx, title);
+    }
+
+    /// Sets the status text displayed in the body of the modal.
+    fn set_status(&mut self, cx: &mut Cx, status: &str) {
+        self.label(ids!(status)).set_text(cx, status);
+    }
+
+    /// Returns a reference to the modal's button, enabling you to set its properties.
+    fn button_ref(&self) -> ButtonRef {
+        self.button(ids!(cancel_button))
+    }
+}
+
+impl RegisterStatusModalRef {
+    /// See [`RegisterStatusModal::set_title()`].
+    pub fn set_title(&self, cx: &mut Cx, title: &str) {
+        if let Some(mut inner) = self.borrow_mut() {
+            inner.set_title(cx, title);
+        }
+    }
+
+    /// See [`RegisterStatusModal::set_status()`].
+    pub fn set_status(&self, cx: &mut Cx, status: &str) {
+        if let Some(mut inner) = self.borrow_mut() {
+            inner.set_status(cx, status);
+        }
+    }
+
+    /// See [`RegisterStatusModal::button_ref()`].
+    pub fn button_ref(&self) -> ButtonRef {
+        self.borrow()
+            .map(|inner| inner.button_ref())
+            .unwrap_or_default()
+    }
+}
+
 #[derive(Clone, DefaultNone, Debug)]
 pub enum RegisterStatusModalAction {
     /// The modal requested to be closed

src/register/validation.rs

@@ -42,7 +42,8 @@ pub(super) fn normalize_custom_homeserver(raw: &str) -> Option<String> {
         format!("https://{trimmed}")
     };
 
-    Url::parse(&normalized).ok().map(|_| normalized)
+    let url = Url::parse(&normalized).ok()?;
+    matches!(url.scheme(), "http" | "https").then_some(normalized)
 }
 
 pub(super) fn needs_custom_homeserver_input(
@@ -88,6 +89,16 @@ mod tests {
         );
     }
 
+    #[test]
+    fn normalize_custom_homeserver_rejects_non_http_schemes() {
+        assert_eq!(normalize_custom_homeserver("ftp://evil.com"), None);
+        assert_eq!(normalize_custom_homeserver("file:///etc/passwd"), None);
+        assert_eq!(normalize_custom_homeserver("javascript://alert(1)"), None);
+        // http and https are accepted
+        assert!(normalize_custom_homeserver("http://my-server.example").is_some());
+        assert!(normalize_custom_homeserver("https://my-server.example").is_some());
+    }
+
     #[test]
     fn choosing_other_requires_explicit_custom_value_before_submit() {
         assert!(needs_custom_homeserver_input(true, "matrix.org"));