Implemented deleting games as admin.

2026-01-02 15:24:38 +01:00
parent 0c256846f6
commit 5c928b30f3
26 changed files with 344 additions and 133 deletions
--- a/backend-actix/Cargo.lock
+++ b/backend-actix/Cargo.lock
@@ -338,9 +338,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "base64ct"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a"
+checksum = "7d809780667f4410e7c41b07f52439b94d2bdf8528eeedc287fa38d3b7f95d82"

 [[package]]
 name = "bitflags"
@@ -416,9 +416,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.50"
+version = "1.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c"
+checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
 dependencies = [
 "find-msvc-tools",
 "jobserver",
@@ -516,9 +516,9 @@ dependencies = [

 [[package]]
 name = "crypto-common"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
 "generic-array",
 "typenum",
@@ -872,6 +872,16 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.1"
@@ -890,9 +900,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"

 [[package]]
 name = "find-msvc-tools"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"

 [[package]]
 name = "flate2"
@@ -972,9 +982,9 @@ dependencies = [

 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
 "typenum",
 "version_check",
@@ -1249,15 +1259,15 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"

 [[package]]
 name = "itoa"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"

 [[package]]
 name = "jiff"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
+checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8"
 dependencies = [
 "jiff-static",
 "log",
@@ -1268,9 +1278,9 @@ dependencies = [

 [[package]]
 name = "jiff-static"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
+checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1337,9 +1347,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.179"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f"

 [[package]]
 name = "libm"
@@ -1664,9 +1674,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"

 [[package]]
 name = "portable-atomic"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd"
+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"

 [[package]]
 name = "portable-atomic-util"
@@ -1745,9 +1755,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
 dependencies = [
 "unicode-ident",
 ]
@@ -1928,9 +1938,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"

 [[package]]
 name = "ryu"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea"
+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"

 [[package]]
 name = "scheduled-thread-pool"
@@ -1999,15 +2009,15 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.146"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8"
+checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
 dependencies = [
 "itoa",
 "memchr",
- "ryu",
 "serde",
 "serde_core",
+ "zmij",
 ]

 [[package]]
@@ -2061,10 +2071,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "signal-hook-registry"
-version = "1.4.7"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
 "libc",
 ]

@@ -2164,9 +2175,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2247,9 +2258,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.48.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
 "bytes",
 "libc",
@@ -2263,9 +2274,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.17"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
 "bytes",
 "futures-core",
@@ -2848,6 +2859,12 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "zmij"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868"
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
--- a/backend-actix/gamenight-api.yaml
+++ b/backend-actix/gamenight-api.yaml
@@ -201,9 +201,21 @@ paths:
        $ref: '#/components/requestBodies/AddGameRequest'
      security:
        - JWT-Auth: []
+    delete:
+      responses:
+        '200':
+          description: "Ok"
+        '401':
+          $ref: '#/components/responses/FailureResponse'
+        '422':
+          $ref: '#/components/responses/FailureResponse'
+      requestBody:
+        $ref: '#/components/requestBodies/RemoveGameRequest'
+      security:
+        - JWT-Auth: [ ]
  /rename_game:
    post:
-      responses: 
+      responses:
        '200':
          description: "OK"
        '401':
@@ -315,9 +327,6 @@ paths:
        $ref: '#/components/requestBodies/AuthorizedLocationUserIdsRequest'
      security:
        - JWT-Auth: []
-
-
-
 components:
  schemas:
    Gamenight:
@@ -590,6 +599,11 @@ components:
        application/json:
          schema:
            $ref: '#/components/schemas/RenameGameRequestBody'
+    RemoveGameRequest:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/GameId'
    OwnGameRequest:
      content:
        application/json:
--- a/backend-actix/src/main.rs
+++ b/backend-actix/src/main.rs
@@ -21,7 +21,7 @@ async fn main() -> std::io::Result<()> {
    let mut conn = pool.get_conn();
    run_migration(&mut conn);

-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("debug"));

    HttpServer::new(move || {
        let cors = Cors::default()
@@ -56,6 +56,7 @@ async fn main() -> std::io::Result<()> {
            .service(post_own_game)
            .service(post_disown_game)
            .service(get_owned_games)
+            .service(delete_game)
            .service(get_locations)
            .service(post_location)
            .service(post_location_authorize)
--- a/backend-actix/src/request/authorization.rs
+++ b/backend-actix/src/request/authorization.rs
@@ -21,13 +21,6 @@ pub struct Claims {

 pub struct AuthUser(pub User);

-// pub struct AuthUser {
-//     pub id: Uuid,
-//     pub username: String,
-//     pub email: String,
-//     pub role: Role,
-// }
-
 impl From<User> for AuthUser {
    fn from(value: User) -> Self {
        Self(value)
--- a/backend-actix/src/request/game.rs
+++ b/backend-actix/src/request/game.rs
@@ -1,10 +1,17 @@
-use actix_web::{get, http::header::ContentType, post, web, HttpResponse, Responder};
+use crate::game::rename_game;
+use crate::owned_game::own_game;
+use crate::owned_game::owned_games;
+use crate::owned_game::disown_game;
+use crate::owned_game::OwnedGame;
+use gamenight_database::game::load_game;
+use crate::game::insert_game;
+use uuid::Uuid;
+use crate::game::remove_game;
+use actix_web::{delete, get, http::header::ContentType, post, web, HttpResponse, Responder};
 use gamenight_database::{
-    game::{insert_game, load_game, rename_game},
-    owned_game::{disown_game, own_game, owned_games, OwnedGame},
+    user::Role,
    DbPool, GetConnection,
 };
-use uuid::Uuid;

 use crate::{
    models::{
@@ -77,6 +84,22 @@ pub async fn post_game(
        .body(serde_json::to_string(&GameId{game_id: game.id.to_string()})?))
 }

+#[delete("/game")]
+pub async fn delete_game(
+    pool: web::Data<DbPool>,
+    user: AuthUser,
+    game_id: web::Json<GameId>,
+) -> Result<impl Responder, ApiError> {
+    if user.0.role != Role::Admin {
+        Ok(HttpResponse::Unauthorized())
+    } else {
+        let mut conn = pool.get_conn();
+        remove_game(&mut conn, Uuid::parse_str(&game_id.0.game_id)?)?;
+
+        Ok(HttpResponse::Ok())
+    }
+}
+
 #[post("/rename_game")]
 pub async fn post_rename_game(
    pool: web::Data<DbPool>,
--- a/backend-actix/src/request/mod.rs
+++ b/backend-actix/src/request/mod.rs
@@ -15,6 +15,7 @@ pub use game::post_disown_game;
 pub use game::post_game;
 pub use game::post_own_game;
 pub use game::post_rename_game;
+pub use game::delete_game;
 pub use gamenight_handlers::gamenight_get;
 pub use gamenight_handlers::gamenight_post;
 pub use gamenight_handlers::gamenights;