From d57cd1230c0cae5a899967c7ba602da4a12ca2ac Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin@tolmer.fr>
Date: Tue, 18 May 2021 17:44:46 +0200
Subject: [PATCH] Turn the login form into a regular form

---
 app/src/login.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/login.rs b/app/src/login.rs
index 498ab22..c781fd6 100644
--- a/app/src/login.rs
+++ b/app/src/login.rs
@@ -3,7 +3,8 @@ use anyhow::{anyhow, Result};
 use lldap_model::*;
 use wasm_bindgen::JsCast;
 use yew::prelude::*;
-use yew::services::fetch::FetchTask;
+use yew::services::{fetch::FetchTask, ConsoleService};
+use yew::FocusEvent;
 
 pub struct LoginForm {
     link: ComponentLink<Self>,
@@ -24,6 +25,13 @@ pub enum Msg {
     AuthenticationResponse(Result<String>),
 }
 
+impl LoginForm {
+    fn set_error(&mut self, error: anyhow::Error) {
+        ConsoleService::error(&error.to_string());
+        self.error = Some(error);
+    }
+}
+
 impl Component for LoginForm {
     type Message = Msg;
     type Properties = Props;
@@ -63,14 +71,14 @@ impl Component for LoginForm {
                     self.link.callback(Msg::AuthenticationResponse),
                 ) {
                     Ok(task) => self._task = Some(task),
-                    Err(e) => self.error = Some(e),
+                    Err(e) => self.set_error(e),
                 }
             }
             Msg::AuthenticationResponse(Ok(user_id)) => {
                 self.on_logged_in.emit(user_id);
             }
             Msg::AuthenticationResponse(Err(e)) => {
-                self.error = Some(anyhow!("Could not log in: {}", e));
+                self.set_error(anyhow!("Could not log in: {}", e));
             }
         };
         true
@@ -82,7 +90,7 @@ impl Component for LoginForm {
 
     fn view(&self) -> Html {
         html! {
-            <form ref=self.node_ref.clone()>
+            <form ref=self.node_ref.clone() onsubmit=self.link.callback(|e: FocusEvent| { e.prevent_default(); Msg::Submit })>
                 <div>
                     <label for="username">{"User name:"}</label>
                     <input type="text" id="username" />
@@ -91,7 +99,7 @@ impl Component for LoginForm {
                     <label for="password">{"Password:"}</label>
                     <input type="password" id="password" />
                 </div>
-                <button type="button" onclick=self.link.callback(|_| { Msg::Submit })>{"Login"}</button>
+                <button type="submit">{"Login"}</button>
                 <div>
                 { if let Some(e) = &self.error {
                     html! { e.to_string() }