From 8bf606b4d72534d816469d56d3e629533a7987e3 Mon Sep 17 00:00:00 2001 From: Max Hohlfeld Date: Thu, 6 Jun 2024 22:21:04 +0200 Subject: [PATCH] refactor: clean up unused code --- src/auth/mod.rs | 2 -- src/auth/routes/get_register.rs | 18 ----------- src/auth/routes/mod.rs | 9 ------ src/auth/routes/post_register.rs | 54 -------------------------------- src/calendar/routes.rs | 1 - src/main.rs | 1 - templates/register.html | 25 --------------- 7 files changed, 110 deletions(-) delete mode 100644 src/auth/routes/get_register.rs delete mode 100644 src/auth/routes/mod.rs delete mode 100644 src/auth/routes/post_register.rs delete mode 100644 templates/register.html diff --git a/src/auth/mod.rs b/src/auth/mod.rs index e8217bc8..12990fda 100644 --- a/src/auth/mod.rs +++ b/src/auth/mod.rs @@ -1,4 +1,2 @@ -pub mod routes; pub mod utils; -pub use routes::init; diff --git a/src/auth/routes/get_register.rs b/src/auth/routes/get_register.rs deleted file mode 100644 index f5bedfa1..00000000 --- a/src/auth/routes/get_register.rs +++ /dev/null @@ -1,18 +0,0 @@ -use actix_web::{web, HttpResponse, Responder}; -use askama::Template; -use sqlx::PgPool; - -#[derive(Template)] -#[template(path = "register.html")] -struct RegisterTemplate { - // roles: Vec, -} - -#[actix_web::get("/register")] -async fn route(pool: web::Data) -> impl Responder { - - - let bla = RegisterTemplate { }; - - HttpResponse::Ok().body(bla.render().unwrap()) -} diff --git a/src/auth/routes/mod.rs b/src/auth/routes/mod.rs deleted file mode 100644 index d15e29dd..00000000 --- a/src/auth/routes/mod.rs +++ /dev/null @@ -1,9 +0,0 @@ -mod get_register; -mod post_register; - -use actix_web::web; - -pub fn init(cfg: &mut web::ServiceConfig) { - cfg.service(self::get_register::route); - cfg.service(self::post_register::route); -} diff --git a/src/auth/routes/post_register.rs b/src/auth/routes/post_register.rs deleted file mode 100644 index 5d3e9977..00000000 --- a/src/auth/routes/post_register.rs +++ /dev/null @@ -1,54 +0,0 @@ -use actix_web::{http::header::LOCATION, web, HttpResponse, Responder}; -use serde::Deserialize; -use sqlx::PgPool; - -use crate::{auth::utils::generate_salt_and_hash_plain_password, models::User}; - -#[derive(Deserialize)] -struct RegisterForm { - pub name: String, - pub email: String, - pub password: String, - pub role_id: u8, - pub function_id: u8, - pub area_id: i32, -} - -#[actix_web::post("/register")] -async fn route( - web::Form(form): web::Form, - pool: web::Data, -) -> impl Responder { - let (hash, salt) = generate_salt_and_hash_plain_password(&form.password).unwrap(); - - let role = match form.role_id.try_into() { - Ok(role) => role, - Err(_) => return HttpResponse::BadRequest().body("fsdf"), - }; - - let function = match form.function_id.try_into() { - Ok(function) => function, - Err(_) => return HttpResponse::BadRequest().body("fsdf"), - }; - - let result = User::create( - pool.get_ref(), - &form.name, - &form.email, - &hash, - &salt, - role, - function, - form.area_id, - ) - .await; - - match result { - Ok(_) => { - return HttpResponse::PermanentRedirect() - .insert_header((LOCATION, "/")) - .finish() - } - Err(err) => return HttpResponse::BadRequest().body(err.to_string()), - } -} diff --git a/src/calendar/routes.rs b/src/calendar/routes.rs index 49ebaa39..55587ad7 100644 --- a/src/calendar/routes.rs +++ b/src/calendar/routes.rs @@ -1,4 +1,3 @@ -use actix_identity::Identity; use actix_web::{web, HttpResponse, Responder}; use askama::Template; use chrono::{NaiveDate, Utc}; diff --git a/src/main.rs b/src/main.rs index 026cb767..c7abcaaf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -116,7 +116,6 @@ async fn main() -> anyhow::Result<()> { HttpServer::new(move || { App::new() .app_data(web::Data::new(pool.clone())) - .configure(auth::init) .configure(calendar::init) .configure(endpoints::init) .wrap(middleware::RedirectToLogin) diff --git a/templates/register.html b/templates/register.html deleted file mode 100644 index a3dd70f2..00000000 --- a/templates/register.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Brass - Register - - -

Brass - Registrierung

-

Gib dein Nutzernamen und das Passwort ein:

-
- - - - - - - - - - -
- -