Chellaris/chellaris-rust-api
Chellaris/chellaris-rust-api
Archived
1
0
Fork 0
Code Issues Pull requests Releases16 Packages1 Activity Actions

Various linting changes

Browse source
This commit is contained in:
Neshura 2023-12-12 20:49:39 +01:00
parent 75eefab02c
commit 12938d1ee4
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
5 changed files with 18 additions and 22 deletions
src/v1
mod.rs

29
src/v1/mod.rs
View file

@ -1,5 +1,4 @@
use crate::{db, AppState};
use actix_web::web::Json;
use actix_web::{delete, get, post, put, web, HttpRequest, HttpResponse, Responder};
use std::collections::HashMap;
use std::ops::Deref;
@ -9,7 +8,7 @@ use sqlx::QueryBuilder;
pub(crate) mod schemas;
fn get_auth_header<'a>(req: &'a HttpRequest) -> Option<&'a str> {
fn get_auth_header(req: &HttpRequest) -> Option<&str> {
req.headers().get("x-api-key")?.to_str().ok()
}
@ -90,18 +89,18 @@ async fn get_user(
Err(_) => return HttpResponse::InternalServerError().finish(),
};
let mut permissions: HashMap<String, bool> = HashMap::new();
let mut user_permissions: HashMap<String, bool> = HashMap::new();
permissions.insert("game_permissions".to_string(), user.game_permissions);
permissions.insert("empire_permissions".to_string(), user.empire_permissions);
permissions.insert("data_permissions".to_string(), user.data_permissions);
permissions.insert("user_permissions".to_string(), user.user_permissions);
user_permissions.insert("game_permissions".to_string(), user.game_permissions);
user_permissions.insert("empire_permissions".to_string(), user.empire_permissions);
user_permissions.insert("data_permissions".to_string(), user.data_permissions);
user_permissions.insert("user_permissions".to_string(), user.user_permissions);
let return_data = schemas::User {
user_token: user.token,
discord_handle: user.discord_id,
profile_picture: user.picture_url,
permissions: permissions
permissions: user_permissions
};
return HttpResponse::Ok().json(return_data);
@ -290,17 +289,17 @@ pub(crate) async fn update_user(
};
}
let mut permissions: HashMap<String, bool> = HashMap::new();
permissions.insert("game_permissions".to_string(), user.game_permissions);
permissions.insert("empire_permissions".to_string(), user.empire_permissions);
permissions.insert("data_permissions".to_string(), user.data_permissions);
permissions.insert("user_permissions".to_string(), user.user_permissions);
let mut user_permissions: HashMap<String, bool> = HashMap::new();
user_permissions.insert("game_permissions".to_string(), user.game_permissions);
user_permissions.insert("empire_permissions".to_string(), user.empire_permissions);
user_permissions.insert("data_permissions".to_string(), user.data_permissions);
user_permissions.insert("user_permissions".to_string(), user.user_permissions);
let return_data = schemas::User {
user_token: user.token,
discord_handle: user.discord_id,
profile_picture: user.picture_url,
permissions: permissions
permissions: user_permissions
};
return HttpResponse::Ok().json(return_data);
} else {
@ -348,7 +347,7 @@ pub(crate) async fn delete_user(
.await
{
Ok(_) => {}
Err(e) => {
Err(_) => {
return HttpResponse::InternalServerError().finish();
}
};