,
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 638805f..20d9100 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -54,3 +54,20 @@ pub struct DbEdit {
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "ssr", derive(diesel_derive_newtype::DieselNewType))]
pub struct EditVersion(pub(crate) Uuid);
+
+#[derive(Deserialize, Serialize)]
+pub struct RegisterUserData {
+ pub username: String,
+ pub password: String,
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct LoginResponse {
+ pub jwt: String,
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct LoginUserData {
+ pub username: String,
+ pub password: String,
+}
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 43ea9cb..0515fd5 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -1,4 +1,4 @@
-use crate::common::ArticleView;
+use crate::common::{ArticleView, LoginResponse, LoginUserData, RegisterUserData};
use crate::common::GetArticleData;
use anyhow::anyhow;
use once_cell::sync::Lazy;
@@ -39,3 +39,29 @@ where
Err(anyhow!("API error: {text}")).unwrap()
}
}
+
+pub async fn register(hostname: &str, username: &str, password: &str) -> LoginResponse {
+ let register_form = RegisterUserData {
+ username: username.to_string(),
+ password: password.to_string(),
+ };
+ let req = CLIENT
+ .post(format!("http://{}/api/v1/user/register", hostname))
+ .form(®ister_form);
+ handle_json_res(req).await
+}
+
+pub async fn login(
+ hostname: &str,
+ username: &str,
+ password: &str,
+) -> LoginResponse {
+ let login_form = LoginUserData {
+ username: username.to_string(),
+ password: password.to_string(),
+ };
+ let req = CLIENT
+ .post(format!("http://{}/api/v1/user/login", hostname))
+ .form(&login_form);
+ handle_json_res(req).await
+}
diff --git a/src/frontend/login.rs b/src/frontend/login.rs
index 2993223..b9e4955 100644
--- a/src/frontend/login.rs
+++ b/src/frontend/login.rs
@@ -1,41 +1,52 @@
use leptos::*;
-use leptos_form::prelude::*;
+use leptos::ev::{SubmitEvent};
use log::info;
-use serde::{Deserialize, Serialize};
+use crate::frontend::api::login;
-#[derive(Clone, Debug, Deserialize, Default, Form, Serialize)]
-#[form(
- component(
- action = create_my_data(my_data),
- on_success = |DbMyData { id, .. }, _| view!({format!("Created {id}")}
)
- )
-)
-]
-pub struct MyData {
- pub username: String,
- pub password: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct DbMyData {
- pub id: i32,
- pub name: String,
-}
-
-async fn create_my_data(my_data: MyData) -> Result {
- info!("{:?}", &my_data);
- Ok(DbMyData {
- id: 1,
- name: my_data.username,
- })
+// TODO: this seems to be working, but need to implement registration also
+// TODO: use leptos_form if possible
+// https://github.com/leptos-form/leptos_form/issues/18
+fn do_login(ev: SubmitEvent, username: String, password: String) {
+ ev.prevent_default();
+ spawn_local(
+ async move {
+ let res = login("localhost:8080", &username, &password).await;
+ info!("{}", res.jwt);
+ });
}
#[component]
pub fn Login() -> impl IntoView {
- view! {
- )
- />
- }
+ let name = RwSignal::new(String::new());
+ let password = RwSignal::new(String::new());
+
+ view! {
+
+ }
}
diff --git a/src/main.rs b/src/main.rs
index 63ae4f2..11cd734 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,3 @@
-use log::info;
-
#[cfg(feature = "ssr")]
#[tokio::main]
pub async fn main() -> ibis_lib::backend::error::MyResult<()> {
@@ -25,5 +23,5 @@ fn main() {
mount_to_body(|| {
view! { }
});
- info!("test 2");
+ log::info!("test 2");
}
diff --git a/tests/common.rs b/tests/common.rs
index 5bf150d..0b17a10 100644
--- a/tests/common.rs
+++ b/tests/common.rs
@@ -24,6 +24,7 @@ use std::time::Duration;
use tokio::task::JoinHandle;
use tracing::log::LevelFilter;
use url::Url;
+use ibis_lib::frontend::api;
pub static CLIENT: Lazy = Lazy::new(Client::new);
@@ -122,7 +123,7 @@ impl IbisInstance {
});
// wait a moment for the backend to start
tokio::time::sleep(Duration::from_millis(100)).await;
- let register_res = register(&hostname, username, "hunter2").await.unwrap();
+ let register_res = api::register(&hostname, username, "hunter2").await.unwrap();
assert!(!register_res.jwt.is_empty());
Self {
jwt: register_res.jwt,
@@ -243,29 +244,3 @@ pub async fn follow_instance(instance: &IbisInstance, follow_instance: &str) ->
Err(anyhow!("API error: {}", res.text().await?).into())
}
}
-
-pub async fn register(hostname: &str, username: &str, password: &str) -> MyResult {
- let register_form = RegisterUserData {
- username: username.to_string(),
- password: password.to_string(),
- };
- let req = CLIENT
- .post(format!("http://{}/api/v1/user/register", hostname))
- .form(®ister_form);
- api::handle_json_res(req).await
-}
-
-pub async fn login(
- instance: &IbisInstance,
- username: &str,
- password: &str,
-) -> MyResult {
- let login_form = LoginUserData {
- username: username.to_string(),
- password: password.to_string(),
- };
- let req = CLIENT
- .post(format!("http://{}/api/v1/user/login", instance.hostname))
- .form(&login_form);
- api::handle_json_res(req).await
-}