move all direct database access to logic crate

1 files changed, 4 insertions, 20 deletions

diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs
index 51da348..2a513a9 100644
--- a/server/src/ui/account/mod.rs
+++ b/server/src/ui/account/mod.rs
@@ -11,13 +11,8 @@ use crate::{
     ui::{error::MyResult, home::rocket_uri_macro_r_home},
 };
 use anyhow::anyhow;
-use jellycommon::user::User;
 use jellyimport::is_importing;
-use jellylogic::{
-    login::{hash_password, login_logic},
-    session::Session,
-    Database,
-};
+use jellylogic::{account::register_user, login::login_logic, session::Session};
 use jellyui::{
     account::{AccountLogin, AccountLogout, AccountRegister, AccountRegisterSuccess},
     render_page,
@@ -29,7 +24,7 @@ use rocket::{
     http::{Cookie, CookieJar},
     post,
     response::{content::RawHtml, Redirect},
-    FromForm, State,
+    FromForm,
 };
 use serde::{Deserialize, Serialize};
 
@@ -98,7 +93,6 @@ pub fn r_account_logout(session: Option<A<Session>>, lang: AcceptLanguage) -> Ra
 
 #[post("/account/register", data = "<form>")]
 pub fn r_account_register_post<'a>(
-    database: &'a State<Database>,
     session: Option<A<Session>>,
     form: Form<Contextual<'a, RegisterForm>>,
     lang: AcceptLanguage,
@@ -110,16 +104,7 @@ pub fn r_account_register_post<'a>(
         None => return Err(MyError(anyhow!(format_form_error(form)))),
     };
 
-    database.register_user(
-        &form.invitation,
-        &form.username,
-        User {
-            display_name: form.username.clone(),
-            name: form.username.clone(),
-            password: hash_password(&form.username, &form.password),
-            ..Default::default()
-        },
-    )?;
+    register_user(&form.invitation, &form.username, &form.password)?;
 
     Ok(RawHtml(render_page(
         &AccountRegisterSuccess {
@@ -136,7 +121,6 @@ pub fn r_account_register_post<'a>(
 
 #[post("/account/login", data = "<form>")]
 pub fn r_account_login_post(
-    database: &State<Database>,
     jar: &CookieJar,
     form: Form<Contextual<LoginForm>>,
 ) -> MyResult<Redirect> {
@@ -147,7 +131,7 @@ pub fn r_account_login_post(
     jar.add(
         Cookie::build((
             "session",
-            login_logic(database, &form.username, &form.password, None, None)?,
+            login_logic(&form.username, &form.password, None, None)?,
         ))
         .permanent()
         .build(),