From 65dcf64720c3c0cefea274f4ed320b9843055d53 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Sat, 16 Sep 2023 06:57:44 +1000 Subject: [PATCH] fix mtxchat login() --- apps/mtxchat/src/lib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/mtxchat/src/lib.rs b/apps/mtxchat/src/lib.rs index 2f2e1c41f..0c41cfa93 100644 --- a/apps/mtxchat/src/lib.rs +++ b/apps/mtxchat/src/lib.rs @@ -288,8 +288,8 @@ impl<'a> MtxChat<'a> { HTTPS, &self .get(USER_DOMAIN_KEY) - .unwrap_or(Some(DOMAIN_MATRIX.to_string())) - .unwrap_or("".to_string()) + .unwrap_or(None) + .unwrap_or(DOMAIN_MATRIX.to_string()) ) .expect("failed to write server"); if let Some(token) = &self.token { @@ -338,6 +338,10 @@ impl<'a> MtxChat<'a> { log::info!("logged_in"); } else { log::info!("login failed"); + // unset credentials to facilitate re-attempt + self.unset(TOKEN_KEY).expect("failed to unset token"); + self.unset(USER_DOMAIN_KEY) + .expect("failed to unset user domain"); } self.logged_in }