work

src/bin/client/account.rs

@@ -1,7 +1,7 @@
 use ed25519_dalek::SigningKey;
 use rand::{
     SeedableRng,
-    rngs::{OsRng, StdRng},
+    rngs::{StdRng, SysRng},
 };
 
 pub struct Account {
@@ -11,7 +11,7 @@ pub struct Account {
 
 impl Account {
     pub fn new() -> Account {
-        let mut csprng = StdRng::try_from_rng(&mut OsRng).unwrap();
+        let mut csprng = StdRng::try_from_rng(&mut SysRng).unwrap();
         let device_key = SigningKey::generate(&mut csprng);
         let account_key = SigningKey::generate(&mut csprng);
         Account {

src/bin/client/ui/connect.rs

@@ -40,6 +40,7 @@ pub fn start(rsc: &mut Rsc) -> WeakWidget {
 
 pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
     let url = field("", "server", rsc);
+    let token = field("", "account token", rsc);
     let username = field("", "username", rsc);
     let password = field("", "password", rsc);
 
@@ -47,6 +48,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
     rsc.events.register(create, Submit, move |ctx, rsc| {
         create.disable(rsc);
         let url = rsc[url].content();
+        let token = rsc[token].content();
         let username = rsc[username].content();
         let password = rsc[password].content();
         let login_key = ctx.state.data.login_key(&username);
@@ -72,6 +74,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
                 .request(CreateAccount {
                     username,
                     password,
+                    token,
                     login_key,
                 })
                 .await
@@ -84,6 +87,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(username, rsc),
         field_box(password, rsc),
         create,