Default homeserver (#52)

* refactor: set a default homeserver

* fix: login with different homeserver

* chore: use unwrap_or_else

Cargo.toml

@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 dioxus = "0.4"
 dioxus-web = "0.4"
-dioxus-logger = "0.4.0"
 dioxus-router = "0.4.0"
 futures-util = "0.3.27"
 futures = "0.3"
@@ -33,3 +32,4 @@ uuid = "0.8"
 unic-langid = "0.9.1"
 reqwest = "0.11"
 http = "0.2"
+wasm-logger = "0.2.0"

src/hooks/use_auth.rs

@@ -108,7 +108,7 @@ pub struct UseAuthState {
     login_cache: UseSharedState<Option<CacheLogin>>,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct UseAuth {
     pub data: LoginInfoBuilder,
     pub error: Option<AuthError>,
@@ -172,12 +172,18 @@ impl UseAuthState {
                 username_parse = format!("@{}", username_parse);
             }
 
-            if let Some(server) = &self.data.read().server {
-                if let Some(domain) = server.domain() {
-                    let domain_name = extract_domain_name(domain);
-                    if !username_parse.ends_with(domain_name.as_str()) {
-                        username_parse = format!("{}:{}", username_parse, domain_name);
-                    }
+            if !username_parse.contains(':') {
+                let Some(server) = &self.data.read().server else {
+                    return;
+                };
+
+                let Some(domain) = server.domain() else {
+                    return;
+                };
+
+                let domain_name = extract_domain_name(domain);
+                if !username_parse.ends_with(domain_name.as_str()) {
+                    username_parse = format!("{}:{}", username_parse, domain_name);
                 }
             }
         }

src/main.rs

@@ -31,7 +31,7 @@ use unic_langid::LanguageIdentifier;
 use web_sys::window;
 
 fn main() {
-    dioxus_logger::init(LevelFilter::Info).expect("failed to init logger");
+    wasm_logger::init(wasm_logger::Config::default());
     dioxus_web::launch(App);
 }
 
@@ -98,19 +98,20 @@ fn App(cx: Scope) -> Element {
                 HomeserverError::InvalidUrl => key_main_error_homeserver_invalid_url,
             })?;
 
-            let c = create_client(&homeserver.get_base_url())
-                .await
-                .map_err(|_| {
-                    format!(
-                        "{} {}",
-                        key_chat_common_error_default_server,
-                        homeserver.get_base_url()
-                    )
-                })?;
+            let c = match create_client(&homeserver.get_base_url()).await {
+                Ok(c) => c,
+                Err(_) => create_client(&Homeserver::default().get_base_url())
+                    .await
+                    .map_err(|_| {
+                        format!(
+                            "{} {}",
+                            key_chat_common_error_default_server,
+                            homeserver.get_base_url()
+                        )
+                    })?,
+            };
 
-            client.set(MatrixClientState {
-                client: Some(c.clone()),
-            });
+            client.set(MatrixClientState { client: Some(c) });
 
             let serialized_session: Result<String, StorageError> =
                 <LocalStorage as gloo::storage::Storage>::get("session_file");

src/pages/login.rs

@@ -163,9 +163,10 @@ pub fn Login(cx: Scope) -> Element {
                         is_loading_loggedin.set(LoggedInStatus::Start);
                         return;
                     };
+                }else {
+                    auth.set_server(homeserver.get()).await;
                 }
 
-                auth.set_server(homeserver.get()).await;
                 auth.set_username(username.get(), true);
                 auth.set_password(password.get());
 

src/utils/get_homeserver.rs

@@ -8,6 +8,14 @@ pub struct Homeserver {
     base_url: String,
 }
 
+impl Default for Homeserver {
+    fn default() -> Self {
+        Self {
+            base_url: "https://matrix.org".to_string(),
+        }
+    }
+}
+
 pub enum HomeserverError {
     InvalidUrl,
 }