From 60805ea4497dcdd991e774866b48b8538d0ee2ae Mon Sep 17 00:00:00 2001 From: Mika Bomm Date: Thu, 3 Apr 2025 11:04:49 +0200 Subject: [PATCH] feat: add local_auth entity and restructure project entities --- .env.example | 2 +- crates/backend/src/controller.rs | 4 ++- crates/backend/src/controller/auth.rs | 25 +++++++++++++++++++ crates/backend/src/db.rs | 2 ++ crates/backend/src/db/entity.rs | 1 + .../src => backend/src/db/entity}/group.rs | 2 +- crates/backend/src/db/entity/local_auth.rs | 17 +++++++++++++ crates/backend/src/db/entity/mod.rs | 9 +++++++ .../src => backend/src/db/entity}/prelude.rs | 3 ++- .../src => backend/src/db/entity}/project.rs | 2 +- .../src => backend/src/db/entity}/user.rs | 3 ++- .../src/db/entity}/user_group_project.rs | 2 +- crates/backend/src/dto.rs | 1 - crates/backend/src/dto/project.rs | 8 ------ crates/backend/src/main.rs | 11 +++++++- crates/xtask/src/main.rs | 3 +-- 16 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 crates/backend/src/controller/auth.rs create mode 100644 crates/backend/src/db/entity.rs rename crates/{entity/src => backend/src/db/entity}/group.rs (94%) create mode 100644 crates/backend/src/db/entity/local_auth.rs create mode 100644 crates/backend/src/db/entity/mod.rs rename crates/{entity/src => backend/src/db/entity}/prelude.rs (63%) rename crates/{entity/src => backend/src/db/entity}/project.rs (93%) rename crates/{entity/src => backend/src/db/entity}/user.rs (89%) rename crates/{entity/src => backend/src/db/entity}/user_group_project.rs (96%) delete mode 100644 crates/backend/src/dto.rs delete mode 100644 crates/backend/src/dto/project.rs diff --git a/.env.example b/.env.example index 5ebf9ac..c2d5c14 100644 --- a/.env.example +++ b/.env.example @@ -5,7 +5,7 @@ DB_PASSWORD= DB_HOST= DB_PORT= -DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:{DB_PORT}/${DB_NAME} +DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME} # Redis section REDIS_HOST= diff --git a/crates/backend/src/controller.rs b/crates/backend/src/controller.rs index 1845896..edca1a5 100644 --- a/crates/backend/src/controller.rs +++ b/crates/backend/src/controller.rs @@ -1,5 +1,6 @@ use actix_web::web::{self, ServiceConfig}; +mod auth; mod class; mod group; mod project; @@ -11,5 +12,6 @@ pub fn register_controllers(cfg: &mut ServiceConfig) { .service(web::scope("/group").configure(group::setup)) .service(web::scope("/user").configure(user::setup)) .service(web::scope("/class").configure(class::setup)) - .service(web::scope("/template").configure(template::setup)); + .service(web::scope("/template").configure(template::setup)) + .service(web::scope("/auth").configure(auth::setup)); } diff --git a/crates/backend/src/controller/auth.rs b/crates/backend/src/controller/auth.rs new file mode 100644 index 0000000..4a62ff8 --- /dev/null +++ b/crates/backend/src/controller/auth.rs @@ -0,0 +1,25 @@ +use actix_session::Session; +use actix_web::{ + HttpResponse, get, post, + web::{self, ServiceConfig}, +}; +use serde::Deserialize; + +use crate::error::ApiError; + +#[derive(Deserialize)] +struct LoginRequest { + username: String, + password: String, +} + +pub fn setup(cfg: &mut ServiceConfig) { + cfg.service(login); +} + +#[post("/login")] +async fn login( + login_request: web::Json, + session: Session, +) -> Result { +} diff --git a/crates/backend/src/db.rs b/crates/backend/src/db.rs index 2cc47f5..3a96ee3 100644 --- a/crates/backend/src/db.rs +++ b/crates/backend/src/db.rs @@ -1,5 +1,7 @@ use sea_orm::{ConnectOptions, DatabaseConnection}; +mod auth; +pub mod entity; mod group; pub mod project; mod user; diff --git a/crates/backend/src/db/entity.rs b/crates/backend/src/db/entity.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/crates/backend/src/db/entity.rs @@ -0,0 +1 @@ + diff --git a/crates/entity/src/group.rs b/crates/backend/src/db/entity/group.rs similarity index 94% rename from crates/entity/src/group.rs rename to crates/backend/src/db/entity/group.rs index 50d6e4f..d2c1969 100644 --- a/crates/entity/src/group.rs +++ b/crates/backend/src/db/entity/group.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/crates/backend/src/db/entity/local_auth.rs b/crates/backend/src/db/entity/local_auth.rs new file mode 100644 index 0000000..6d6dc30 --- /dev/null +++ b/crates/backend/src/db/entity/local_auth.rs @@ -0,0 +1,17 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 + +use sea_orm::entity::prelude::*; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[sea_orm(table_name = "local_auth")] +pub struct Model { + #[sea_orm(primary_key, auto_increment = false)] + pub id: Uuid, + pub hash: String, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation {} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/crates/backend/src/db/entity/mod.rs b/crates/backend/src/db/entity/mod.rs new file mode 100644 index 0000000..3167d34 --- /dev/null +++ b/crates/backend/src/db/entity/mod.rs @@ -0,0 +1,9 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 + +pub mod prelude; + +pub mod group; +pub mod local_auth; +pub mod project; +pub mod user; +pub mod user_group_project; diff --git a/crates/entity/src/prelude.rs b/crates/backend/src/db/entity/prelude.rs similarity index 63% rename from crates/entity/src/prelude.rs rename to crates/backend/src/db/entity/prelude.rs index a85fdc4..7521bbd 100644 --- a/crates/entity/src/prelude.rs +++ b/crates/backend/src/db/entity/prelude.rs @@ -1,6 +1,7 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 pub use super::group::Entity as Group; +pub use super::local_auth::Entity as LocalAuth; pub use super::project::Entity as Project; pub use super::user::Entity as User; pub use super::user_group_project::Entity as UserGroupProject; diff --git a/crates/entity/src/project.rs b/crates/backend/src/db/entity/project.rs similarity index 93% rename from crates/entity/src/project.rs rename to crates/backend/src/db/entity/project.rs index 12ac6e0..24e4437 100644 --- a/crates/entity/src/project.rs +++ b/crates/backend/src/db/entity/project.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/crates/entity/src/user.rs b/crates/backend/src/db/entity/user.rs similarity index 89% rename from crates/entity/src/user.rs rename to crates/backend/src/db/entity/user.rs index 852b424..57973c4 100644 --- a/crates/entity/src/user.rs +++ b/crates/backend/src/db/entity/user.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -8,6 +8,7 @@ use serde::{Deserialize, Serialize}; pub struct Model { #[sea_orm(primary_key, auto_increment = false)] pub id: Uuid, + #[sea_orm(unique)] pub name: String, pub role: String, } diff --git a/crates/entity/src/user_group_project.rs b/crates/backend/src/db/entity/user_group_project.rs similarity index 96% rename from crates/entity/src/user_group_project.rs rename to crates/backend/src/db/entity/user_group_project.rs index 53e184b..02874a8 100644 --- a/crates/entity/src/user_group_project.rs +++ b/crates/backend/src/db/entity/user_group_project.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.7 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/crates/backend/src/dto.rs b/crates/backend/src/dto.rs deleted file mode 100644 index 36df406..0000000 --- a/crates/backend/src/dto.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod project; diff --git a/crates/backend/src/dto/project.rs b/crates/backend/src/dto/project.rs deleted file mode 100644 index e9fedc9..0000000 --- a/crates/backend/src/dto/project.rs +++ /dev/null @@ -1,8 +0,0 @@ -use sea_orm::prelude::Uuid; -use serde::{Deserialize, Serialize}; - -#[derive(Serialize, Deserialize, Debug)] -pub struct UpdateProject { - pub id: Uuid, - pub name: String, -} diff --git a/crates/backend/src/main.rs b/crates/backend/src/main.rs index cd67abb..ec7c65c 100644 --- a/crates/backend/src/main.rs +++ b/crates/backend/src/main.rs @@ -7,9 +7,15 @@ use log::debug; mod controller; mod db; -mod dto; mod error; +pub use db::entity; + +#[derive(Clone)] +struct AppConfig { + ldap_auth: bool, +} + #[actix_web::main] async fn main() -> std::io::Result<()> { dotenvy::dotenv().ok(); @@ -21,6 +27,8 @@ async fn main() -> std::io::Result<()> { let redis_conn = connect_to_redis_database().await; + let app_config = AppConfig { ldap_auth: false }; + // use dotenvy here to get SECRET_KEY let secret_key = Key::generate(); debug!("Secret Key {:?}", secret_key.master()); @@ -29,6 +37,7 @@ async fn main() -> std::io::Result<()> { let app = App::new() .app_data(web::Data::new(database.clone())) .app_data(web::Data::new(Argon2::default())) + .app_data(web::Data::new(app_config.clone())) .wrap(Logger::default()) .wrap(SessionMiddleware::new( redis_conn.clone(), diff --git a/crates/xtask/src/main.rs b/crates/xtask/src/main.rs index 9b54e65..4f0e8ce 100644 --- a/crates/xtask/src/main.rs +++ b/crates/xtask/src/main.rs @@ -40,8 +40,7 @@ fn main() { .arg("generate") .arg("entity") .arg("-o") - .arg("crates/entity/src/") - .arg("--lib") + .arg("crates/backend/src/db/entity/") .arg("--with-serde") .arg("both") .current_dir(&workspace_dir)