Implements leaving on the client side

2025-06-24 16:49:21 +02:00
parent d11e31149b
commit fbe456a0f5
43 changed files with 1730 additions and 10 deletions
--- a/gamenight-cli/Cargo.lock
+++ b/gamenight-cli/Cargo.lock
@@ -160,6 +160,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "deranged"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -263,10 +272,26 @@ dependencies = [
 "dyn-clone",
 "gamenight-api-client-rs",
 "inquire",
+ "jsonwebtoken",
+ "serde",
+ "serde_json",
 "tokio",
 "uuid",
 ]

+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.3"
@@ -549,6 +574,21 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "jsonwebtoken"
+version = "9.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
+dependencies = [
+ "base64",
+ "js-sys",
+ "pem",
+ "ring",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.172"
@@ -640,6 +680,31 @@ dependencies = [
 "unicode-segmentation",
 ]

+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -687,6 +752,16 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "pem"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+dependencies = [
+ "base64",
+ "serde",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -714,6 +789,12 @@ dependencies = [
 "zerovec",
 ]

+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -781,6 +862,20 @@ dependencies = [
 "web-sys",
 ]

+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.25"
@@ -896,6 +991,18 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "simple_asn1"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.15.1"
@@ -949,6 +1056,26 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -959,6 +1086,37 @@ dependencies = [
 "once_cell",
 ]

+[[package]]
+name = "time"
+version = "0.3.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+
+[[package]]
+name = "time-macros"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -1092,6 +1250,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"

+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -1115,7 +1279,7 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.3",
 "js-sys",
 "serde",
 "wasm-bindgen",
--- a/gamenight-cli/Cargo.toml
+++ b/gamenight-cli/Cargo.toml
@@ -11,3 +11,6 @@ async-trait = "0.1"
 dyn-clone = "1.0"
 chrono = "0.4"
 uuid = { version = "1.3.0", features = ["serde", "v4"] }
+jsonwebtoken = "9.3"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
--- a/gamenight-cli/src/flows/leave.rs
+++ b/gamenight-cli/src/flows/leave.rs
@@ -0,0 +1,34 @@
+use std::fmt::Display;
+
+use async_trait::async_trait;
+use gamenight_api_client_rs::{apis::default_api::leave_post, models::GamenightId};
+use uuid::Uuid;
+
+use super::{Flow, FlowOutcome, FlowResult, GamenightState};
+
+#[derive(Clone)]
+pub struct Leave {
+    gamenight_id: Uuid
+}
+
+impl Leave {
+    pub fn new(gamenight_id: Uuid) -> Self {
+        Self {
+            gamenight_id
+        }
+    }
+}
+
+#[async_trait]
+impl<'a> Flow<'a> for Leave {
+    async fn run(&self, state: &'a mut GamenightState) -> FlowResult<'a> {
+        let _ = leave_post(&state.configuration, Some(GamenightId{gamenight_id: self.gamenight_id.to_string()})).await?;
+        Ok((FlowOutcome::Successful, state))
+    }
+}
+
+impl Display for Leave {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Leave")
+    }
+}
--- a/gamenight-cli/src/flows/mod.rs
+++ b/gamenight-cli/src/flows/mod.rs
@@ -14,6 +14,7 @@ mod list_gamenights;
 mod add_gamenight;
 mod view_gamenight;
 mod join;
+mod leave;

 pub struct GamenightState {
    configuration: Configuration,
--- a/gamenight-cli/src/flows/view_gamenight.rs
+++ b/gamenight-cli/src/flows/view_gamenight.rs
@@ -1,9 +1,11 @@

 use gamenight_api_client_rs::{apis::default_api::{participants_get, user_get}, models::{GamenightId, UserId}};
 use inquire::Select;
+use jsonwebtoken::{decode, DecodingKey, Validation};
+use serde::{Deserialize, Serialize};
 use uuid::Uuid;

-use crate::{domain::{gamenight::Gamenight, user::User}, flows::{exit::Exit, join::Join}};
+use crate::{domain::{gamenight::Gamenight, user::User}, flows::{exit::Exit, join::Join, leave::Leave}};

 use super::*;

@@ -21,12 +23,26 @@ impl ViewGamenight {
 }


-fn vec_user_to_usernames_string(users: Vec<User>) -> String {
+fn vec_user_to_usernames_string(users: &Vec<User>) -> String {
    
    let string_list: Vec<String> = users.iter().map(|x| {format!("{}", x)}).collect();
    string_list.join(", ")
 }

+#[derive(Debug, Serialize, Deserialize)]
+pub struct Claims {
+    exp: i64,
+    uid: Uuid
+}
+
+impl From<jsonwebtoken::errors::Error> for FlowError {
+    fn from(value: jsonwebtoken::errors::Error) -> Self {
+        Self {
+            error: value.to_string()
+        }
+    }
+}
+
 #[async_trait]
 impl<'a> Flow<'a> for ViewGamenight {
    async fn run(&self, state: &'a mut GamenightState) -> FlowResult<'a> {
@@ -41,9 +57,25 @@ impl<'a> Flow<'a> for ViewGamenight {
            });
        }

-        println!("{}\nwho: {}", self.gamenight, vec_user_to_usernames_string(users));
+        println!("{}\nwho: {}", self.gamenight, vec_user_to_usernames_string(&users));
+        let decoding_key = DecodingKey::from_secret(b"");
+        let mut validation = Validation::default();
+        validation.insecure_disable_signature_validation();
+        let claims = decode::<Claims>(
+            &state.configuration.bearer_access_token.as_ref().unwrap(),
+            &decoding_key,
+            &validation)?.claims;
+            
+        let join_or_leave: Box<dyn Flow<'a> + Send> =
+        if users.iter().map(|x| {x.id}).find(|x| *x == claims.uid) != None {
+            Box::new(Leave::new(claims.uid))
+        }
+        else { 
+            Box::new(Join::new(claims.uid))
+        };
+
        let options: Vec<Box<dyn Flow<'a> + Send>> = vec![
-            Box::new(Join::new(self.gamenight.id)),
+            join_or_leave,
            Box::new(Exit::new())
        ];
        let choice = Select::new("What do you want to do:", options)