spelling, reorganize code
This commit is contained in:
jb-alvarado
parent
15d635a27b
commit
ca48a093a5
@ -32,6 +32,117 @@ struct ResponseObj<T> {
|
|||||||
data: Option<T>,
|
data: Option<T>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// curl -X POST http://127.0.0.1:8080/auth/login/ -H "Content-Type: application/json" \
|
||||||
|
/// -d '{"username": "<USER>", "password": "<PASS>" }'
|
||||||
|
#[post("/auth/login/")]
|
||||||
|
pub async fn login(credentials: web::Json<User>) -> impl Responder {
|
||||||
|
match db_login(&credentials.username).await {
|
||||||
|
Ok(mut user) => {
|
||||||
|
let pass = user.password.clone();
|
||||||
|
let hash = PasswordHash::new(&pass).unwrap();
|
||||||
|
user.password = "".into();
|
||||||
|
user.salt = None;
|
||||||
|
|
||||||
|
if Argon2::default()
|
||||||
|
.verify_password(credentials.password.as_bytes(), &hash)
|
||||||
|
.is_ok()
|
||||||
|
{
|
||||||
|
let role = db_role(&user.role_id.unwrap_or_default())
|
||||||
|
.await
|
||||||
|
.unwrap_or_else(|_| "guest".to_string());
|
||||||
|
let claims = Claims::new(user.id, user.username.clone(), role.clone());
|
||||||
|
|
||||||
|
if let Ok(token) = create_jwt(claims) {
|
||||||
|
user.token = Some(token);
|
||||||
|
};
|
||||||
|
|
||||||
|
info!("user {} login, with role: {role}", credentials.username);
|
||||||
|
|
||||||
|
web::Json(ResponseObj {
|
||||||
|
message: "login correct!".into(),
|
||||||
|
status: 200,
|
||||||
|
data: Some(user),
|
||||||
|
})
|
||||||
|
.customize()
|
||||||
|
.with_status(StatusCode::OK)
|
||||||
|
} else {
|
||||||
|
error!("Wrong password for {}!", credentials.username);
|
||||||
|
web::Json(ResponseObj {
|
||||||
|
message: "Wrong password!".into(),
|
||||||
|
status: 403,
|
||||||
|
data: None,
|
||||||
|
})
|
||||||
|
.customize()
|
||||||
|
.with_status(StatusCode::FORBIDDEN)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
error!("Login {} failed! {e}", credentials.username);
|
||||||
|
return web::Json(ResponseObj {
|
||||||
|
message: format!("Login {} failed!", credentials.username),
|
||||||
|
status: 400,
|
||||||
|
data: None,
|
||||||
|
})
|
||||||
|
.customize()
|
||||||
|
.with_status(StatusCode::BAD_REQUEST);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// curl -X PUT http://localhost:8080/api/user/1 --header 'Content-Type: application/json' \
|
||||||
|
/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
|
||||||
|
#[put("/user/{id}")]
|
||||||
|
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
||||||
|
async fn update_user(
|
||||||
|
id: web::Path<i64>,
|
||||||
|
user: web::ReqData<LoginUser>,
|
||||||
|
data: web::Json<User>,
|
||||||
|
) -> Result<impl Responder, ServiceError> {
|
||||||
|
if id.into_inner() == user.id {
|
||||||
|
let mut fields = String::new();
|
||||||
|
|
||||||
|
if let Some(email) = data.email.clone() {
|
||||||
|
fields.push_str(format!("email = '{email}'").as_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
if !data.password.is_empty() {
|
||||||
|
if !fields.is_empty() {
|
||||||
|
fields.push_str(", ");
|
||||||
|
}
|
||||||
|
|
||||||
|
let salt = SaltString::generate(&mut OsRng);
|
||||||
|
let password_hash = Argon2::default()
|
||||||
|
.hash_password(data.password.clone().as_bytes(), &salt)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
fields.push_str(format!("password = '{}', salt = '{salt}'", password_hash).as_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
if db_update_user(user.id, fields).await.is_ok() {
|
||||||
|
return Ok("Update Success");
|
||||||
|
};
|
||||||
|
|
||||||
|
return Err(ServiceError::InternalServerError);
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(ServiceError::Unauthorized)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// curl -X POST 'http://localhost:8080/api/user/' --header 'Content-Type: application/json' \
|
||||||
|
/// -d '{"email": "<EMAIL>", "username": "<USER>", "password": "<PASS>", "role_id": 1}' \
|
||||||
|
/// --header 'Authorization: Bearer <TOKEN>'
|
||||||
|
#[post("/user/")]
|
||||||
|
#[has_any_role("Role::Admin", type = "Role")]
|
||||||
|
async fn add_user(data: web::Json<User>) -> Result<impl Responder, ServiceError> {
|
||||||
|
match db_add_user(data.into_inner()).await {
|
||||||
|
Ok(_) => Ok("Add User Success"),
|
||||||
|
Err(e) => {
|
||||||
|
error!("{e}");
|
||||||
|
Err(ServiceError::InternalServerError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// curl -X GET http://127.0.0.1:8080/api/settings/1 -H "Authorization: Bearer <TOKEN>"
|
/// curl -X GET http://127.0.0.1:8080/api/settings/1 -H "Authorization: Bearer <TOKEN>"
|
||||||
#[get("/settings/{id}")]
|
#[get("/settings/{id}")]
|
||||||
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
||||||
@ -105,7 +216,7 @@ async fn update_playout_config(
|
|||||||
Err(ServiceError::InternalServerError)
|
Err(ServiceError::InternalServerError)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// curl -X PUT http://localhost:8080/api/presets/ --header 'Content-Type: application/json' \
|
/// curl -X GET http://localhost:8080/api/presets/ --header 'Content-Type: application/json' \
|
||||||
/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
|
/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
|
||||||
#[get("/presets/")]
|
#[get("/presets/")]
|
||||||
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
||||||
@ -118,8 +229,8 @@ async fn get_presets() -> Result<impl Responder, ServiceError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// curl -X PUT http://localhost:8080/api/presets/1 --header 'Content-Type: application/json' \
|
/// curl -X PUT http://localhost:8080/api/presets/1 --header 'Content-Type: application/json' \
|
||||||
/// --data '{"name": "<PRESET NAME>", "text": "TEXT>", "x": "<X>", "y": "<Y>", "fontsize": 24, \
|
/// --data '{"name": "<PRESET NAME>", "text": "<TEXT>", "x": "<X>", "y": "<Y>", "fontsize": 24, \
|
||||||
/// "line_spacing": 4, "fontcolor": "#ffffff", "box": 1, "boxcolor": "#000000", "boxborderw": 4, "alpha": 1.0}}' \
|
/// "line_spacing": 4, "fontcolor": "#ffffff", "box": 1, "boxcolor": "#000000", "boxborderw": 4, "alpha": 1.0}' \
|
||||||
/// --header 'Authorization: <TOKEN>'
|
/// --header 'Authorization: <TOKEN>'
|
||||||
#[put("/presets/{id}")]
|
#[put("/presets/{id}")]
|
||||||
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
||||||
@ -148,117 +259,6 @@ async fn add_preset(data: web::Json<TextPreset>) -> Result<impl Responder, Servi
|
|||||||
Err(ServiceError::InternalServerError)
|
Err(ServiceError::InternalServerError)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// curl -X PUT http://localhost:8080/api/user/1 --header 'Content-Type: application/json' \
|
|
||||||
/// --data '{"email": "<EMAIL>", "password": "<PASS>"}' --header 'Authorization: <TOKEN>'
|
|
||||||
#[put("/user/{id}")]
|
|
||||||
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
|
||||||
async fn update_user(
|
|
||||||
id: web::Path<i64>,
|
|
||||||
user: web::ReqData<LoginUser>,
|
|
||||||
data: web::Json<User>,
|
|
||||||
) -> Result<impl Responder, ServiceError> {
|
|
||||||
if id.into_inner() == user.id {
|
|
||||||
let mut fields = String::new();
|
|
||||||
|
|
||||||
if let Some(email) = data.email.clone() {
|
|
||||||
fields.push_str(format!("email = '{email}'").as_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
if !data.password.is_empty() {
|
|
||||||
if !fields.is_empty() {
|
|
||||||
fields.push_str(", ");
|
|
||||||
}
|
|
||||||
|
|
||||||
let salt = SaltString::generate(&mut OsRng);
|
|
||||||
let password_hash = Argon2::default()
|
|
||||||
.hash_password(data.password.clone().as_bytes(), &salt)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
fields.push_str(format!("password = '{}', salt = '{salt}'", password_hash).as_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
if db_update_user(user.id, fields).await.is_ok() {
|
|
||||||
return Ok("Update Success");
|
|
||||||
};
|
|
||||||
|
|
||||||
return Err(ServiceError::InternalServerError);
|
|
||||||
}
|
|
||||||
|
|
||||||
Err(ServiceError::Unauthorized)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// curl -X POST 'http://localhost:8080/api/user/' --header 'Content-Type: application/json' \
|
|
||||||
/// -d '{"email": "<EMAIL>", "username": "<USER>", "password": "<PASS>", "role_id": 1}' \
|
|
||||||
/// --header 'Authorization: Bearer <TOKEN>'
|
|
||||||
#[post("/user/")]
|
|
||||||
#[has_any_role("Role::Admin", type = "Role")]
|
|
||||||
async fn add_user(data: web::Json<User>) -> Result<impl Responder, ServiceError> {
|
|
||||||
match db_add_user(data.into_inner()).await {
|
|
||||||
Ok(_) => Ok("Add User Success"),
|
|
||||||
Err(e) => {
|
|
||||||
error!("{e}");
|
|
||||||
Err(ServiceError::InternalServerError)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// curl -X POST http://127.0.0.1:8080/auth/login/ -H "Content-Type: application/json" \
|
|
||||||
/// -d '{"username": "<USER>", "password": "<PASS>" }'
|
|
||||||
#[post("/auth/login/")]
|
|
||||||
pub async fn login(credentials: web::Json<User>) -> impl Responder {
|
|
||||||
match db_login(&credentials.username).await {
|
|
||||||
Ok(mut user) => {
|
|
||||||
let pass = user.password.clone();
|
|
||||||
let hash = PasswordHash::new(&pass).unwrap();
|
|
||||||
user.password = "".into();
|
|
||||||
user.salt = None;
|
|
||||||
|
|
||||||
if Argon2::default()
|
|
||||||
.verify_password(credentials.password.as_bytes(), &hash)
|
|
||||||
.is_ok()
|
|
||||||
{
|
|
||||||
let role = db_role(&user.role_id.unwrap_or_default())
|
|
||||||
.await
|
|
||||||
.unwrap_or_else(|_| "guest".to_string());
|
|
||||||
let claims = Claims::new(user.id, user.username.clone(), role.clone());
|
|
||||||
|
|
||||||
if let Ok(token) = create_jwt(claims) {
|
|
||||||
user.token = Some(token);
|
|
||||||
};
|
|
||||||
|
|
||||||
info!("user {} login, with role: {role}", credentials.username);
|
|
||||||
|
|
||||||
web::Json(ResponseObj {
|
|
||||||
message: "login correct!".into(),
|
|
||||||
status: 200,
|
|
||||||
data: Some(user),
|
|
||||||
})
|
|
||||||
.customize()
|
|
||||||
.with_status(StatusCode::OK)
|
|
||||||
} else {
|
|
||||||
error!("Wrong password for {}!", credentials.username);
|
|
||||||
web::Json(ResponseObj {
|
|
||||||
message: "Wrong password!".into(),
|
|
||||||
status: 403,
|
|
||||||
data: None,
|
|
||||||
})
|
|
||||||
.customize()
|
|
||||||
.with_status(StatusCode::FORBIDDEN)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
error!("Login {} failed! {e}", credentials.username);
|
|
||||||
return web::Json(ResponseObj {
|
|
||||||
message: format!("Login {} failed!", credentials.username),
|
|
||||||
status: 400,
|
|
||||||
data: None,
|
|
||||||
})
|
|
||||||
.customize()
|
|
||||||
.with_status(StatusCode::BAD_REQUEST);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// ----------------------------------------------------------------------------
|
/// ----------------------------------------------------------------------------
|
||||||
/// ffplayout process controlling
|
/// ffplayout process controlling
|
||||||
///
|
///
|
||||||
@ -447,7 +447,7 @@ pub async fn move_rename(
|
|||||||
|
|
||||||
/// curl -X DELETE http://localhost:8080/api/file/1/remove/
|
/// curl -X DELETE http://localhost:8080/api/file/1/remove/
|
||||||
/// --header 'Content-Type: application/json' --header 'Authorization: <TOKEN>'
|
/// --header 'Content-Type: application/json' --header 'Authorization: <TOKEN>'
|
||||||
/// -d '{"source": "<SOURCE>", "target": ""}'
|
/// -d '{"source": "<SOURCE>"}'
|
||||||
#[delete("/file/{id}/remove/")]
|
#[delete("/file/{id}/remove/")]
|
||||||
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
#[has_any_role("Role::Admin", "Role::User", type = "Role")]
|
||||||
pub async fn remove(
|
pub async fn remove(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user