From 3139bab32f046e8f43e4c263d05bbc91b4bebbe3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 4 Apr 2025 11:32:19 +0200 Subject: [PATCH] run treefmt --- .vscode/settings.json | 6 +++--- README.md | 3 ++- bruno/bruno.json | 7 ++----- crates/backend/src/controller/auth.rs | 5 +++-- crates/backend/src/controller/class.rs | 2 +- crates/backend/src/controller/group.rs | 2 +- crates/backend/src/controller/project.rs | 4 ++-- crates/backend/src/controller/template.rs | 2 +- crates/backend/src/controller/user.rs | 4 ++-- crates/backend/src/db/user.rs | 4 ++-- crates/backend/src/error.rs | 2 +- crates/backend/src/main.rs | 6 +++--- crates/ldap/src/ldap.rs | 18 ++++++++++-------- dev-compose.yml | 14 +++++++++++--- 14 files changed, 44 insertions(+), 35 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 949809d..b1ff449 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "rust-analyzer.check.features": "all", - "rust-analyzer.cargo.features": "all" -} \ No newline at end of file + "rust-analyzer.check.features": "all", + "rust-analyzer.cargo.features": "all" +} diff --git a/README.md b/README.md index 6d28838..4475f86 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # peer-group-grading -Wir sind cool \ No newline at end of file + +Wir sind cool diff --git a/bruno/bruno.json b/bruno/bruno.json index 7dd5cbe..1f01e68 100644 --- a/bruno/bruno.json +++ b/bruno/bruno.json @@ -2,8 +2,5 @@ "version": "1", "name": "pgg-bruno", "type": "collection", - "ignore": [ - "node_modules", - ".git" - ] -} \ No newline at end of file + "ignore": ["node_modules", ".git"] +} diff --git a/crates/backend/src/controller/auth.rs b/crates/backend/src/controller/auth.rs index 19e0461..03cfb02 100644 --- a/crates/backend/src/controller/auth.rs +++ b/crates/backend/src/controller/auth.rs @@ -1,11 +1,12 @@ use actix_session::Session; use actix_web::{ - HttpResponse, Responder, post, + post, web::{self, ServiceConfig}, + HttpResponse, Responder, }; use serde::Deserialize; -use crate::{Database, error::ApiError}; +use crate::{error::ApiError, Database}; #[derive(Deserialize)] struct LoginRequest { diff --git a/crates/backend/src/controller/class.rs b/crates/backend/src/controller/class.rs index 999afac..2670d21 100644 --- a/crates/backend/src/controller/class.rs +++ b/crates/backend/src/controller/class.rs @@ -1,4 +1,4 @@ -use actix_web::{Responder, delete, get, post, put}; +use actix_web::{delete, get, post, put, Responder}; pub fn setup(cfg: &mut actix_web::web::ServiceConfig) { cfg.service(get_classes) diff --git a/crates/backend/src/controller/group.rs b/crates/backend/src/controller/group.rs index 74f46d7..441b60b 100644 --- a/crates/backend/src/controller/group.rs +++ b/crates/backend/src/controller/group.rs @@ -1,4 +1,4 @@ -use actix_web::{Responder, delete, get, post, put}; +use actix_web::{delete, get, post, put, Responder}; pub fn setup(cfg: &mut actix_web::web::ServiceConfig) { cfg.service(get_groups) diff --git a/crates/backend/src/controller/project.rs b/crates/backend/src/controller/project.rs index 1cec71c..6f55338 100644 --- a/crates/backend/src/controller/project.rs +++ b/crates/backend/src/controller/project.rs @@ -1,9 +1,9 @@ -use actix_web::{Result, delete, get, post, put, web}; +use actix_web::{delete, get, post, put, web, Result}; use uuid::Uuid; use validator::Validate; -use crate::db::Database; use crate::db::project::CreateProject; +use crate::db::Database; use crate::entity; use crate::error::ApiError; diff --git a/crates/backend/src/controller/template.rs b/crates/backend/src/controller/template.rs index 3d927f5..dd9ccc5 100644 --- a/crates/backend/src/controller/template.rs +++ b/crates/backend/src/controller/template.rs @@ -1,4 +1,4 @@ -use actix_web::{Responder, delete, get, post, put}; +use actix_web::{delete, get, post, put, Responder}; pub fn setup(cfg: &mut actix_web::web::ServiceConfig) { cfg.service(get_templates) diff --git a/crates/backend/src/controller/user.rs b/crates/backend/src/controller/user.rs index 14ddc00..c50281e 100644 --- a/crates/backend/src/controller/user.rs +++ b/crates/backend/src/controller/user.rs @@ -1,5 +1,5 @@ -use crate::{Database, entity, error::ApiError}; -use actix_web::{Responder, delete, get, post, put, web}; +use crate::{entity, error::ApiError, Database}; +use actix_web::{delete, get, post, put, web, Responder}; use serde::Deserialize; use validator::Validate; diff --git a/crates/backend/src/db/user.rs b/crates/backend/src/db/user.rs index ed0cca4..340ff49 100644 --- a/crates/backend/src/db/user.rs +++ b/crates/backend/src/db/user.rs @@ -1,7 +1,7 @@ use crate::error::ApiError; use argon2::{ + password_hash::{rand_core::OsRng, PasswordHasher, SaltString}, Argon2, PasswordHash, PasswordVerifier, - password_hash::{PasswordHasher, SaltString, rand_core::OsRng}, }; use sea_orm::{ ActiveModelTrait, @@ -10,7 +10,7 @@ use sea_orm::{ }; use uuid::Uuid; -use crate::{Database, entity}; +use crate::{entity, Database}; impl Database { pub async fn create_user( diff --git a/crates/backend/src/error.rs b/crates/backend/src/error.rs index 4fa1f90..dd52cb2 100644 --- a/crates/backend/src/error.rs +++ b/crates/backend/src/error.rs @@ -1,4 +1,4 @@ -use actix_web::{HttpResponse, ResponseError, cookie::time::error, http::StatusCode}; +use actix_web::{cookie::time::error, http::StatusCode, HttpResponse, ResponseError}; use sea_orm::TransactionError; use thiserror::Error; diff --git a/crates/backend/src/main.rs b/crates/backend/src/main.rs index fb70dff..d35d2e9 100644 --- a/crates/backend/src/main.rs +++ b/crates/backend/src/main.rs @@ -1,14 +1,14 @@ use actix_files::NamedFile; -use actix_session::{SessionMiddleware, storage::RedisSessionStore}; -use actix_web::{App, HttpResponse, HttpServer, cookie::Key, middleware::Logger, web}; +use actix_session::{storage::RedisSessionStore, SessionMiddleware}; +use actix_web::{cookie::Key, middleware::Logger, web, App, HttpResponse, HttpServer}; use log::debug; mod controller; mod db; mod error; -pub use db::Database; pub use db::entity; +pub use db::Database; #[derive(Clone)] struct AppConfig { diff --git a/crates/ldap/src/ldap.rs b/crates/ldap/src/ldap.rs index 7030b63..de0b418 100644 --- a/crates/ldap/src/ldap.rs +++ b/crates/ldap/src/ldap.rs @@ -30,17 +30,19 @@ fn authenticate_user(username: &str, password: &str) -> Result std::io::Result<()> { .bind(("127.0.0.1", 8080))? .run() .await -} \ No newline at end of file +} diff --git a/dev-compose.yml b/dev-compose.yml index 296bc54..5384b24 100644 --- a/dev-compose.yml +++ b/dev-compose.yml @@ -39,13 +39,21 @@ services: - ./crates/ldap/src/users.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/users.ldif healthcheck: - test: ["CMD", "ldapsearch", "-x", "-H", "ldap://localhost", "-b", "dc=Schule,dc=intern"] + test: + [ + "CMD", + "ldapsearch", + "-x", + "-H", + "ldap://localhost", + "-b", + "dc=Schule,dc=intern", + ] interval: 30s retries: 3 - volumes: postgres_data: redis: openldap_data: - openldap_config: \ No newline at end of file + openldap_config: