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