ellmau/adf-obdd
1
0
Fork 0
mirror of https://github.com/ellmau/adf-obdd.git synced 2025-12-20 09:39:38 +01:00
Code Issues Projects Releases Wiki Activity

Small bugfixes on server side

Browse Source
This commit is contained in:
monsterkrampe 2023-04-03 17:33:00 +02:00
parent 46ad9eb3fa
commit e353e01c1d
No known key found for this signature in database
GPG Key ID: B8ADC1F5A5CE5057
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main.rs
View File

@ -51,6 +51,7 @@ async fn main() -> std::io::Result<()> {
.allowed_origin("http://localhost:1234") .allowed_origin("http://localhost:1234")
.allow_any_method() .allow_any_method()
.allow_any_header() .allow_any_header()
.supports_credentials()
.max_age(3600); .max_age(3600);
#[cfg(feature = "cors_for_local_development")] #[cfg(feature = "cors_for_local_development")]

19
server/src/user.rs
View File

@ -56,6 +56,11 @@ pub(crate) async fn username_exists(user_coll: &mongodb::Collection<User>, usern
#[post("/register")] #[post("/register")]
async fn register(app_state: web::Data<AppState>, user: web::Json<UserPayload>) -> impl Responder { async fn register(app_state: web::Data<AppState>, user: web::Json<UserPayload>) -> impl Responder {
let mut user: UserPayload = user.into_inner(); let mut user: UserPayload = user.into_inner();
if user.username.is_empty() || user.password.is_empty() {
return HttpResponse::BadRequest().body("Username and Password need to be set!");
}
let user_coll = app_state let user_coll = app_state
.mongodb_client .mongodb_client
.database(DB_NAME) .database(DB_NAME)
@ -115,9 +120,6 @@ async fn delete_account(
.await .await
{ {
Err(err) => HttpResponse::InternalServerError().body(err.to_string()), Err(err) => HttpResponse::InternalServerError().body(err.to_string()),
Ok(DeleteResult {
deleted_count: 0, ..
}) => HttpResponse::InternalServerError().body("Account could not be deleted."),
Ok(DeleteResult { Ok(DeleteResult {
deleted_count: _, .. deleted_count: _, ..
}) => { }) => {
@ -163,7 +165,7 @@ async fn login(
{ {
Ok(Some(user)) => { Ok(Some(user)) => {
let stored_password = match &user.password { let stored_password = match &user.password {
None => return HttpResponse::BadRequest().body("Invalid email or password"), // NOTE: login as tremporary user is not allowed None => return HttpResponse::BadRequest().body("Invalid username or password"), // NOTE: login as tremporary user is not allowed
Some(password) => password, Some(password) => password,
}; };
@ -264,6 +266,11 @@ async fn update_user(
user: web::Json<UserPayload>, user: web::Json<UserPayload>,
) -> impl Responder { ) -> impl Responder {
let mut user: UserPayload = user.into_inner(); let mut user: UserPayload = user.into_inner();
if user.username.is_empty() || user.password.is_empty() {
return HttpResponse::BadRequest().body("Username and Password need to be set!");
}
let user_coll = app_state let user_coll = app_state
.mongodb_client .mongodb_client
.database(DB_NAME) .database(DB_NAME)
@ -324,10 +331,6 @@ async fn update_user(
.await .await
{ {
Err(err) => HttpResponse::InternalServerError().body(err.to_string()), Err(err) => HttpResponse::InternalServerError().body(err.to_string()),
Ok(UpdateResult {
modified_count: 0, ..
}) => HttpResponse::InternalServerError()
.body("Account could not be updated."),
Ok(UpdateResult { Ok(UpdateResult {
modified_count: _, .. modified_count: _, ..
}) => HttpResponse::Ok().json(UserInfo { }) => HttpResponse::Ok().json(UserInfo {