feat: use new auth and convert to get request

This commit is contained in:
Radical 2025-05-04 23:40:03 +02:00
parent fb76e6df08
commit beb9fc10ba

View file

@ -1,19 +1,13 @@
use actix_web::{error, post, web, Error, HttpResponse, Scope}; use actix_web::{get, web, Error, HttpRequest, HttpResponse, Scope};
use futures::StreamExt;
use log::error; use log::error;
use serde::{Deserialize, Serialize}; use serde::Serialize;
use sqlx::FromRow; use sqlx::FromRow;
use uuid::Uuid; use uuid::Uuid;
use std::str::FromStr; use std::str::FromStr;
mod channels; mod channels;
use crate::{api::v1::auth::check_access_token, Data}; use crate::{api::v1::auth::check_access_token, utils::get_auth_header, Data};
#[derive(Deserialize)]
struct Request {
access_token: String,
}
#[derive(Serialize)] #[derive(Serialize)]
struct Response { struct Response {
@ -35,31 +29,25 @@ struct Role {
permissions: i64, permissions: i64,
} }
const MAX_SIZE: usize = 262_144;
pub fn web() -> Scope { pub fn web() -> Scope {
web::scope("/") web::scope("/")
.service(res) .service(res)
.service(channels::web()) .service(channels::web())
} }
#[post("{uuid}")] #[get("{uuid}")]
pub async fn res(mut payload: web::Payload, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn res(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let mut body = web::BytesMut::new(); let headers = req.headers();
while let Some(chunk) = payload.next().await {
let chunk = chunk?; let auth_header = get_auth_header(headers);
// limit max size of in-memory payload
if (body.len() + chunk.len()) > MAX_SIZE { if let Err(error) = auth_header {
return Err(error::ErrorBadRequest("overflow")); return Ok(error)
}
body.extend_from_slice(&chunk);
} }
let guild_uuid = path.into_inner().0; let guild_uuid = path.into_inner().0;
let request = serde_json::from_slice::<Request>(&body)?; let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
let authorized = check_access_token(request.access_token, &data.pool).await;
if let Err(error) = authorized { if let Err(error) = authorized {
return Ok(error) return Ok(error)