style: cargo clippy and format
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
This commit is contained in:
parent
5d0d666094
commit
97f7595cc5
10 changed files with 289 additions and 159 deletions
|
@ -1,10 +1,10 @@
|
|||
use actix_web::{error, post, web, Error, HttpResponse};
|
||||
use actix_web::{Error, HttpResponse, error, post, web};
|
||||
use futures::StreamExt;
|
||||
use log::error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use futures::StreamExt;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{api::v1::auth::check_access_token, Data};
|
||||
use crate::{Data, api::v1::auth::check_access_token};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct AuthenticationRequest {
|
||||
|
@ -21,7 +21,11 @@ struct Response {
|
|||
const MAX_SIZE: usize = 262_144;
|
||||
|
||||
#[post("/user/{uuid}")]
|
||||
pub async fn res(mut payload: web::Payload, path: web::Path<(String,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
|
||||
pub async fn res(
|
||||
mut payload: web::Payload,
|
||||
path: web::Path<(String,)>,
|
||||
data: web::Data<Data>,
|
||||
) -> Result<HttpResponse, Error> {
|
||||
let mut body = web::BytesMut::new();
|
||||
while let Some(chunk) = payload.next().await {
|
||||
let chunk = chunk?;
|
||||
|
@ -38,8 +42,8 @@ pub async fn res(mut payload: web::Payload, path: web::Path<(String,)>, data: we
|
|||
|
||||
let authorized = check_access_token(authentication_request.access_token, &data.pool).await;
|
||||
|
||||
if authorized.is_err() {
|
||||
return Ok(authorized.unwrap_err())
|
||||
if let Err(error) = authorized {
|
||||
return Ok(error);
|
||||
}
|
||||
|
||||
let mut uuid = authorized.unwrap();
|
||||
|
@ -48,23 +52,29 @@ pub async fn res(mut payload: web::Payload, path: web::Path<(String,)>, data: we
|
|||
let requested_uuid = Uuid::parse_str(&request);
|
||||
|
||||
if requested_uuid.is_err() {
|
||||
return Ok(HttpResponse::BadRequest().json(r#"{ "error": "UUID is invalid!" }"#))
|
||||
return Ok(HttpResponse::BadRequest().json(r#"{ "error": "UUID is invalid!" }"#));
|
||||
}
|
||||
|
||||
uuid = requested_uuid.unwrap()
|
||||
}
|
||||
|
||||
|
||||
let row = sqlx::query_as(&format!("SELECT username, display_name FROM users WHERE uuid = '{}'", uuid))
|
||||
.fetch_one(&data.pool)
|
||||
.await;
|
||||
let row = sqlx::query_as(&format!(
|
||||
"SELECT username, display_name FROM users WHERE uuid = '{}'",
|
||||
uuid
|
||||
))
|
||||
.fetch_one(&data.pool)
|
||||
.await;
|
||||
|
||||
if row.is_err() {
|
||||
error!("{}", row.unwrap_err());
|
||||
return Ok(HttpResponse::InternalServerError().finish())
|
||||
if let Err(error) = row {
|
||||
error!("{}", error);
|
||||
return Ok(HttpResponse::InternalServerError().finish());
|
||||
}
|
||||
|
||||
let (username, display_name): (String, Option<String>) = row.unwrap();
|
||||
|
||||
Ok(HttpResponse::Ok().json(Response { uuid: uuid.to_string(), username, display_name: display_name.unwrap_or_default() }))
|
||||
Ok(HttpResponse::Ok().json(Response {
|
||||
uuid: uuid.to_string(),
|
||||
username,
|
||||
display_name: display_name.unwrap_or_default(),
|
||||
}))
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue