Compare commits

..

7 Commits

Author SHA1 Message Date
0c5b339c66 Added endpoints to server 2025-03-15 21:17:10 +01:00
cf92b4ede4 Added cases and items endpoints 2025-03-15 21:16:59 +01:00
dbde062e01 Added some structs 2025-03-15 21:16:39 +01:00
f53c086fa6 Added data in db 2025-03-15 21:16:28 +01:00
e6c1d58454 ignore images 2025-03-15 21:16:21 +01:00
9483d067a2 Changed table revoked to add expiry 2025-03-15 21:16:04 +01:00
411f5fbd7e Added expiration time for revoked tokens 2025-03-15 21:15:49 +01:00
8 changed files with 170 additions and 4 deletions

1
.gitignore vendored
View File

@@ -6,3 +6,4 @@ database.db-shm
database.db-wal database.db-wal
priv.pem priv.pem
pub.pem pub.pem
images/*

Binary file not shown.

View File

@@ -1,5 +1,6 @@
-- Add migration script here -- Add migration script here
CREATE TABLE IF NOT EXISTS revoked ( CREATE TABLE IF NOT EXISTS revoked (
'token_id' INTEGER NOT NULL, 'token_id' INTEGER NOT NULL,
'user_id' VARCHAR NOT NULL 'user_id' VARCHAR NOT NULL,
'expires' INTEGER NOT NULL
) )

61
src/cases.rs Normal file
View File

@@ -0,0 +1,61 @@
use crate::AppState;
use actix_web::web::Data;
use actix_web::{get, web, HttpResponse, Responder};
use serde::{Deserialize, Serialize};
use serde_json::to_string;
use sqlx::query_as;
use crate::types::*;
#[get("/case")]
async fn get_case(query: web::Query<DataUuid>, app_state: Data<AppState>) -> impl Responder {
let case = query_as!(Case, "SELECT * FROM cases WHERE uuid = $1", query.uuid).fetch_one(&app_state.database).await;
if case.is_err() {
return HttpResponse::NotFound().finish();
}
let json = to_string(&case.unwrap());
if json.is_err() {
return HttpResponse::InternalServerError().finish();
}
HttpResponse::Ok().body(json.unwrap())
}
#[get("/cases")]
async fn get_cases(app_state: Data<AppState>) -> impl Responder {
let cases = query_as!(Case, "SELECT * FROM cases").fetch_all(&app_state.database).await;
if cases.is_err() {
return HttpResponse::NotFound().finish();
}
let json = to_string(&cases.unwrap());
if json.is_err() {
return HttpResponse::InternalServerError().finish();
}
HttpResponse::Ok().body(json.unwrap())
}
#[get("/case-items")]
async fn get_case_items(query: web::Query<DataUuid>, app_state: Data<AppState>) -> impl Responder {
let case = query_as!(Case, "SELECT * FROM cases WHERE uuid = $1", query.uuid).fetch_one(&app_state.database).await;
if case.is_err() {
return HttpResponse::NotFound().finish();
}
let case = case.unwrap();
let items_cases = query_as!(ItemCases, "SELECT * FROM items_cases WHERE \"case\" = $1", case.id).fetch_all(&app_state.database).await;
if items_cases.is_err() {
return HttpResponse::NotFound().finish();
}
let items_cases = items_cases.unwrap();
let mut items = vec![];
for item_case in items_cases {
if let Ok(item) = query_as!(Item, "SELECT * FROM items WHERE id = $1", item_case.item).fetch_one(&app_state.database).await {
items.push(item);
}
}
let json = to_string(&items);
if json.is_err() {
return HttpResponse::InternalServerError().finish();
}
HttpResponse::Ok().body(json.unwrap())
}

59
src/items.rs Normal file
View File

@@ -0,0 +1,59 @@
use actix_web::{get, web, HttpResponse, Responder};
use actix_web::web::Data;
use serde::{Deserialize, Serialize};
use serde_json::to_string;
use sqlx::query_as;
use crate::AppState;
use crate::types::*;
#[get("/item")]
async fn get_item(query: web::Query<DataUuid>, app_state: Data<AppState>) -> impl Responder {
let item = query_as!(Item, "SELECT * FROM items WHERE uuid = $1", query.uuid).fetch_one(&app_state.database).await;
if item.is_err() {
return HttpResponse::NotFound().finish();
}
let json = to_string(&item.unwrap());
if json.is_err() {
return HttpResponse::InternalServerError().finish();
}
HttpResponse::Ok().body(json.unwrap())
}
#[get("/items")]
async fn get_items(app_state: Data<AppState>) -> impl Responder {
let items = query_as!(Item, "SELECT * FROM items").fetch_all(&app_state.database).await;
if items.is_err() {
return HttpResponse::NotFound().finish();
}
let json = to_string(&items.unwrap());
if json.is_err() {
return HttpResponse::InternalServerError().finish();
}
HttpResponse::Ok().body(json.unwrap())
}
#[get("/item-cases")]
async fn get_item_cases(query: web::Query<DataUuid>, app_state: Data<AppState>) -> impl Responder {
let item = query_as!(Item, "SELECT * FROM items WHERE uuid = $1", query.uuid).fetch_one(&app_state.database).await;
if item.is_err() {
return HttpResponse::NotFound().finish();
}
let item = item.unwrap();
let items_cases = query_as!(ItemCases, "SELECT * FROM items_cases WHERE \"item\" = $1", item.id).fetch_all(&app_state.database).await;
if items_cases.is_err() {
return HttpResponse::NotFound().finish();
}
let items_cases = items_cases.unwrap();
let mut cases = vec![];
for item_case in items_cases {
if let Ok(item) = query_as!(Case, "SELECT * FROM cases WHERE id = $1", item_case.item).fetch_one(&app_state.database).await {
cases.push(item);
}
}
let json = to_string(&cases);
if json.is_err() {
return HttpResponse::InternalServerError().finish();
}
HttpResponse::Ok().body(json.unwrap())
}

View File

@@ -1,6 +1,11 @@
mod users; mod users;
mod cases;
mod items;
mod types;
use users::*; use users::*;
use cases::*;
use items::*;
use actix_web::web::Data; use actix_web::web::Data;
use actix_web::{App, HttpServer}; use actix_web::{App, HttpServer};
@@ -26,6 +31,12 @@ async fn main() -> std::io::Result<()> {
.service(login) .service(login)
.service(register) .service(register)
.service(logout) .service(logout)
.service(get_case)
.service(get_cases)
.service(get_item)
.service(get_items)
.service(get_case_items)
.service(get_item_cases)
.app_data(app_state.clone()) .app_data(app_state.clone())
}) })
.bind(("127.0.0.1", 8000))? .bind(("127.0.0.1", 8000))?

31
src/types.rs Normal file
View File

@@ -0,0 +1,31 @@
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
pub struct ItemCases {
pub item: i64,
pub case: i64,
}
#[derive(Deserialize, Serialize)]
pub struct DataUuid {
pub uuid: String,
}
#[derive(Debug, Serialize)]
pub struct Case {
pub id: i64,
pub uuid: String,
pub name: String,
pub image: String,
pub price: f64,
}
#[derive(Serialize)]
pub struct Item {
pub id: i64,
pub uuid: String,
pub name: String,
pub rarity: i64,
pub image: String,
pub price: f64,
}

View File

@@ -110,10 +110,12 @@ async fn logout(req: HttpRequest, app_state: Data<AppState>) -> impl Responder {
); );
match token { match token {
Ok(token) => { Ok(token) => {
let exp = token.claims.exp as i64;
if query!( if query!(
"INSERT INTO revoked ( token_id, user_id ) VALUES ( $1, $2 )", "INSERT INTO revoked ( token_id, user_id, expires ) VALUES ( $1, $2, $3 )",
token.claims.kid, token.claims.kid,
token.claims.uid token.claims.uid,
exp
) )
.execute(&app_state.database) .execute(&app_state.database)
.await .await