cert work

src/bin/client/ui/connect.rs

@@ -1,6 +1,6 @@
 use openworm::net::{CreateAccount, CreateAccountResp};
 
-use crate::net::{self, ConnectInfo};
+use crate::net::{ConnectInfo, NetHandle};
 
 use super::*;
 
@@ -41,17 +41,23 @@ pub fn start(rsc: &mut Rsc) -> WeakWidget {
 pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
     let url = field("", "server", rsc);
     let token = field("", "account creation token", rsc);
+    let cert = field("", "certificate hex", rsc);
     let username = field("", "username", rsc);
     let password = field("", "password", rsc);
 
     let create = Button::submit("create", rsc);
     rsc.events.register(create, Submit, move |ctx, rsc| {
-        create.disable(rsc);
         let url = rsc[url].content();
         let token = rsc[token].content();
+        let cert = rsc[cert].content();
+        let Ok(cert) = decode_hex(&cert) else {
+            rsc[ctx.state.notif].inner = Some(werror("Invalid certificate hex", rsc));
+            return;
+        };
         let username = rsc[username].content();
         let password = rsc[password].content();
         let login_key = ctx.state.data.login_key(&username);
+        create.disable(rsc);
         rsc.spawn_task(async move |mut ctx| {
             let mut fail = move |reason| {
                 ctx.update(move |ctx, rsc| {
@@ -59,11 +65,11 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
                     create.enable(rsc);
                 })
             };
-            let Ok(net) = net::connect(
+            let Ok(net) = NetHandle::connect(
                 async |msg| {
                     println!("msg recv :joy:");
                 },
-                ConnectInfo { url },
+                ConnectInfo { url, cert },
             )
             .await
             else {
@@ -98,6 +104,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
         wtext("Create Account").text_align(Align::CENTER).size(30),
         field_box(url, rsc),
         field_box(token, rsc),
+        field_box(cert, rsc),
         field_box(username, rsc),
         field_box(password, rsc),
         create,
@@ -108,6 +115,13 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
         .add(rsc)
 }
 
+pub fn decode_hex(s: &str) -> Result<Vec<u8>, std::num::ParseIntError> {
+    (0..s.len())
+        .step_by(2)
+        .map(|i| u8::from_str_radix(&s[i..i + 2], 16))
+        .collect()
+}
+
 // pub fn connect_screen(client: &mut Client, ui: &mut Ui, state: &UiState) -> WeakWidget {
 //     let Client { data, proxy, .. } = client;
 //     let ip = field_widget(&data.ip, "ip", ui);