fix cors again?

This commit is contained in:
Mitchell Marino 2023-04-16 17:38:13 -05:00
parent 2f334d233b
commit 334ef065af
2 changed files with 17 additions and 10 deletions

4
README.md Normal file
View File

@ -0,0 +1,4 @@
# EngageEarn API
The api for the EngageEarn app.

View File

@ -18,9 +18,8 @@ pub async fn get_events_preview(
AuthBearer(token): AuthBearer, AuthBearer(token): AuthBearer,
State(app_state): State<AppState>, State(app_state): State<AppState>,
) -> impl IntoResponse { ) -> impl IntoResponse {
match handle_token(token, &app_state, Role::Student) { if let Err(err) = handle_token(token, &app_state, Role::Student) {
Ok(_) => {} return err;
Err(err) => return err,
}; };
let result = query_as!( let result = query_as!(
@ -66,9 +65,8 @@ pub async fn get_all_events(
AuthBearer(token): AuthBearer, AuthBearer(token): AuthBearer,
State(app_state): State<AppState>, State(app_state): State<AppState>,
) -> impl IntoResponse { ) -> impl IntoResponse {
match handle_token(token, &app_state, Role::Student) { if let Err(err) = handle_token(token, &app_state, Role::Student) {
Ok(_) => {} return err;
Err(err) => return err,
}; };
let result = query_as!( let result = query_as!(
@ -220,16 +218,21 @@ pub async fn delete_event(
State(app_state): State<AppState>, State(app_state): State<AppState>,
Query(get_event_query): Query<GetEventQuery>, Query(get_event_query): Query<GetEventQuery>,
) -> impl IntoResponse { ) -> impl IntoResponse {
if let Err(err) = handle_token(token, &app_state, Role::Student) { let token_data = match handle_token(token, &app_state, Role::Teacher) {
return err; Err(err) => return err,
Ok(token_data) => token_data,
}; };
let result = query!( let result = query!(
r#" r#"
DELETE FROM events DELETE FROM events
WHERE id = $1 WHERE
id = $1 AND
(created_by = $2 OR $3)
"#, "#,
get_event_query.id get_event_query.id,
token_data.id,
token_data.role == Role::Admin,
) )
.execute(&app_state.db_pool) .execute(&app_state.db_pool)
.await; .await;