implement mtxchat::MtxChat::login_modal()

This commit is contained in:
nworbnhoj 2023-07-29 16:32:12 +10:00
parent 8a05e32e86
commit 162a9faa2b
3 changed files with 67 additions and 9 deletions

View file

@ -31,7 +31,9 @@ pddb = { path = "../../services/pddb" }
status = { path = "../../services/status" } status = { path = "../../services/status" }
# new dependencies for mtxcli # new dependencies for mtxcli
chat = { path = "../../libs/chat" } chat = { path = "../../libs/chat" }
modals = { path = "../../services/modals" }
percent-encoding = "2.2" percent-encoding = "2.2"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
serde = { version = "1.0", features = [ "derive" ] } serde = { version = "1.0", features = [ "derive" ] }
ureq = { version = "2.5", features = ["json"] } ureq = { version = "2.5", features = ["json"] }

View file

@ -63,10 +63,12 @@ pub struct MtxChat {
room_id: String, room_id: String,
filter: String, filter: String,
since: String, since: String,
modals: Modals,
} }
impl MtxChat { impl MtxChat {
pub fn new() -> MtxChat { pub fn new() -> MtxChat {
let xns = xous_names::XousNames::new().unwrap(); let xns = xous_names::XousNames::new().unwrap();
let modals = Modals::new(&xns).expect("can't connect to Modals server");
let common = MtxChat { let common = MtxChat {
user: EMPTY.to_string(), user: EMPTY.to_string(),
username: EMPTY.to_string(), username: EMPTY.to_string(),
@ -76,14 +78,15 @@ impl MtxChat {
room_id: EMPTY.to_string(), room_id: EMPTY.to_string(),
filter: EMPTY.to_string(), filter: EMPTY.to_string(),
since: EMPTY.to_string(), since: EMPTY.to_string(),
modals: modals,
}; };
let mut keypath = PathBuf::new(); let mut keypath = PathBuf::new();
keypath.push(MTXCHAT_DICT); keypath.push(MTXCHAT_DICT);
if std::fs::metadata(&keypath).is_ok() { // keypath exists if std::fs::metadata(&keypath).is_ok() { // keypath exists
// log::info!("dict '{}' exists", MTXCHAT_DICT); // log::info!("dict '{}' exists", MTXCHAT_DICT);
} else { } else {
log::info!("dict '{}' does NOT exist.. creating it", MTXCHAT_DICT); log::info!("dict '{}' does NOT exist.. creating it", MTXCHAT_DICT);
match std::fs::create_dir_all(&keypath){ match std::fs::create_dir_all(&keypath) {
Ok(_) => log::info!("created dict: {}", MTXCHAT_DICT), Ok(_) => log::info!("created dict: {}", MTXCHAT_DICT),
Err(e) => log::warn!("failed to create dict: {:?}", e), Err(e) => log::warn!("failed to create dict: {:?}", e),
} }
@ -288,7 +291,6 @@ impl MtxChat {
} }
pub fn login(&mut self) -> bool { pub fn login(&mut self) -> bool {
// self.scalar_async_msg(LOGGING_IN_ID);
self.token = self.get_default(TOKEN_KEY, EMPTY); self.token = self.get_default(TOKEN_KEY, EMPTY);
self.logged_in = false; self.logged_in = false;
if self.token.len() > 0 { if self.token.len() > 0 {
@ -300,14 +302,12 @@ impl MtxChat {
if web::get_login_type(&self.server) { if web::get_login_type(&self.server) {
let user = self.get_default(USER_KEY, USER_KEY); let user = self.get_default(USER_KEY, USER_KEY);
if user.len() == 0 { if user.len() == 0 {
// self.scalar_async_msg(SET_USER_ID);
self.modals self.modals
.show_notification(t!("mtxcli.please.set.user", locales::LANG), None) .show_notification(t!("mtxcli.please.set.user", locales::LANG), None)
.expect("notification failed"); .expect("notification failed");
} }
let password = self.get_default(PASSWORD_KEY, EMPTY); let password = self.get_default(PASSWORD_KEY, EMPTY);
if password.len() == 0 { if password.len() == 0 {
// self.scalar_async_msg(SET_PASSWORD_ID);
} else { } else {
if let Some(new_token) = web::authenticate_user(&self.server, &user, &password) if let Some(new_token) = web::authenticate_user(&self.server, &user, &password)
{ {
@ -331,6 +331,45 @@ impl MtxChat {
} }
self.logged_in self.logged_in
} }
pub fn login_modal(&mut self) {
const HIDE: &str = "*****";
let mut builder = self.modals.alert_builder("Matrix login.");
let builder = match self.get(SERVER_KEY) {
Ok(Some(server)) => builder.field_placeholder_persist(Some(server), None),
_ => builder.field(Some("server".to_string()), None),
};
let builder = match self.get(USERNAME_KEY) {
Ok(Some(user)) => builder.field_placeholder_persist(Some(user), None),
_ => builder.field(Some("username".to_string()), None),
};
let builder = match self.get(PASSWORD_KEY) {
Ok(Some(pwd)) => builder.field_placeholder_persist(Some(HIDE.to_string()), None),
_ => builder.field(Some("password".to_string()), None),
};
if let Ok(payloads) = builder.build() {
let mut user = "@".to_string();
if let Ok(content) = payloads.content()[1].content.as_str() {
self.set(USERNAME_KEY, content)
.expect("failed to save username");
user.push_str(content);
}
user.push_str(":");
if let Ok(content) = payloads.content()[0].content.as_str() {
self.set(SERVER_KEY, content)
.expect("failed to save server");
user.push_str(content);
}
self.set(USER_KEY, &user).expect("failed to save user");
if let Ok(content) = payloads.content()[2].content.as_str() {
if content.ne(HIDE) {
self.set(PASSWORD_KEY, content)
.expect("failed to save password");
}
}
}
}
} }
pub(crate) fn heap_usage() -> usize { pub(crate) fn heap_usage() -> usize {

View file

@ -3,13 +3,14 @@
mod api; mod api;
use api::*; use api::*;
use num_traits::*;
use xous_ipc::Buffer;
use chat::{Chat, ChatOp, Event}; use chat::{Chat, ChatOp, Event};
use locales::t;
use modals::Modals;
use mtxchat::MtxChat; use mtxchat::MtxChat;
use num_traits::*;
fn main () -> ! {
fn main() -> ! {
let stack_size = 1024 * 1024; let stack_size = 1024 * 1024;
std::thread::Builder::new() std::thread::Builder::new()
.stack_size(stack_size) .stack_size(stack_size)
@ -59,11 +60,27 @@ fn wrapped_main() -> ! {
); );
let mut mtxchat = MtxChat::new(); let mut mtxchat = MtxChat::new();
let modals = Modals::new(&xns).expect("can't connect to Modals server");
loop { loop {
let msg = xous::receive_message(sid).unwrap(); let msg = xous::receive_message(sid).unwrap();
log::debug!("got message {:?}", msg); log::debug!("got message {:?}", msg);
match FromPrimitive::from_usize(msg.body.id()) { match FromPrimitive::from_usize(msg.body.id()) {
Some(MtxchatOp::Event) => { Some(MtxchatOp::Event) => {
log::info!("got Chat UI Event");
xous::msg_scalar_unpack!(msg, event_code, _, _, _, {
match FromPrimitive::from_usize(event_code) {
Some(Event::Focus) => {
while !mtxchat.login() {
modals
.show_notification(t!("mtxcli.login.failed", locales::LANG), None)
.expect("notification failed");
mtxchat.login_modal();
}
}
_ => (),
}
})
} }
Some(MtxchatOp::Post) => { Some(MtxchatOp::Post) => {
log::info!("TODO Post to Matrix server"); log::info!("TODO Post to Matrix server");