From 167695140929c1f109d65ac950341077f0d16798 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:17:21 -0400 Subject: [PATCH 1/4] Fixing token module --- src/token/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/token/mod.rs b/src/token/mod.rs index e2fbf9b..f68cc28 100644 --- a/src/token/mod.rs +++ b/src/token/mod.rs @@ -63,7 +63,7 @@ pub struct TokenResource { pub message: String, pub issuer: String, pub audiences: Vec, - pub id: uuid::Uuid, + pub user_id: uuid::Uuid, } pub const TOKEN_TYPE: &str = "JWT"; @@ -83,8 +83,8 @@ pub fn create_token( payload.set_subject(message); payload.set_issuer(issuer); payload.set_audience(audiences.clone()); - if !token_resource.id.is_nil() { - match payload.set_claim("id", Some(serde_json::json!(token_resource.id))) { + if !token_resource.user_id.is_nil() { + match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) { Ok(_) => {} Err(err) => { return Err(err); -- 2.47.3 From e7d62a8f116256fea4dc160072c429e7bb5062ae Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:18:10 -0400 Subject: [PATCH 2/4] Comment fixes --- src/token/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/token/mod.rs b/src/token/mod.rs index f68cc28..020400d 100644 --- a/src/token/mod.rs +++ b/src/token/mod.rs @@ -42,7 +42,7 @@ pub struct LoginResult { pub issued_at: i64, } -// Alias for LoginResult +/// Alias for LoginResult pub type Login = LoginResult; pub fn get_issued() -> time::Result { @@ -66,6 +66,7 @@ pub struct TokenResource { pub user_id: uuid::Uuid, } +/// Token type pub const TOKEN_TYPE: &str = "JWT"; pub fn create_token( -- 2.47.3 From e50b12be16bc32ba0b61afdd8343d5fac1a8be7b Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:18:27 -0400 Subject: [PATCH 3/4] bump: textsender_models --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a64d03..f36b92a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -522,7 +522,7 @@ dependencies = [ [[package]] name = "textsender_models" -version = "0.3.2" +version = "0.3.3" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 6c9ac16..b25c08c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "textsender_models" -version = "0.3.2" +version = "0.3.3" edition = "2024" rust-version = "1.95" description = "Models used for the textsender project" -- 2.47.3 From ec466977146cdfca34b4fa50d82d63025a9aa82a Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:33:58 -0400 Subject: [PATCH 4/4] Making role in claim optional --- src/token/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/token/mod.rs b/src/token/mod.rs index 020400d..a4a7551 100644 --- a/src/token/mod.rs +++ b/src/token/mod.rs @@ -3,7 +3,8 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct Claims { pub user_id: uuid::Uuid, - pub role: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub role: Option, #[serde(alias = "iss")] pub issued: String, #[serde(alias = "exp")] -- 2.47.3