From 0f6df61fb9b61ebe6335c8dac34a4860ce54182a Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:26:55 -0400 Subject: [PATCH 1/6] bump: textsender_models --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a3796a..77e23ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2239,8 +2239,8 @@ dependencies = [ [[package]] name = "textsender_models" -version = "0.3.1" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.1#ba998096cb5d35dae8e627136a795c4d9af5c8f5" +version = "0.3.3" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.3-27-e50b12be16-111#e50b12be16bc32ba0b61afdd8343d5fac1a8be7b" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index b09d326..d56ba96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ time = { version = "0.3.47", features = ["macros", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.1" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.3-27-e50b12be16-111" } [dev-dependencies] http-body-util = { version = "0.1.3" } -- 2.47.3 From 3a76ab791bc073e9ae8b0e811e604bc480e26230 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:27:03 -0400 Subject: [PATCH 2/6] Build fix --- src/token_stuff/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs index 7eb3511..02ecccf 100644 --- a/src/token_stuff/mod.rs +++ b/src/token_stuff/mod.rs @@ -24,7 +24,7 @@ pub fn create_token( message: String::from(MESSAGE), issuer: String::from(ISSUER), audiences: vec![String::from(AUDIENCE)], - id: *id, + user_id: *id, }; textsender_models::token::create_token(provided_key, &resource, time::Duration::hours(4)) } @@ -37,7 +37,7 @@ pub fn create_service_token( message: String::from(SERVICE_SUBJECT), issuer: String::from(ISSUER), audiences: vec![String::from(AUDIENCE)], - id: *id, + user_id: *id, }; textsender_models::token::create_token(provided, &resource, time::Duration::hours(1)) } @@ -50,7 +50,7 @@ pub fn create_service_refresh_token( message: String::from(SERVICE_SUBJECT), issuer: String::from(ISSUER), audiences: vec![String::from(AUDIENCE)], - id: *id, + user_id: *id, }; textsender_models::token::create_token(key, &resource, time::Duration::hours(4)) } -- 2.47.3 From d6ed6026ec9d54355ea8d6d8536d835baf4e4e4b Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:35:27 -0400 Subject: [PATCH 3/6] 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 77e23ee..b92ea21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2240,7 +2240,7 @@ dependencies = [ [[package]] name = "textsender_models" version = "0.3.3" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.3-27-e50b12be16-111#e50b12be16bc32ba0b61afdd8343d5fac1a8be7b" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.3-27-ec46697714-111#ec466977146cdfca34b4fa50d82d63025a9aa82a" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index d56ba96..69bf03b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ time = { version = "0.3.47", features = ["macros", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.3-27-e50b12be16-111" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.3-27-ec46697714-111" } [dev-dependencies] http-body-util = { version = "0.1.3" } -- 2.47.3 From 450cba48366f0979eef54b66efe75abf5b61034a Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 18:39:44 -0400 Subject: [PATCH 4/6] Fix --- src/token_stuff/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs index 02ecccf..cdf3870 100644 --- a/src/token_stuff/mod.rs +++ b/src/token_stuff/mod.rs @@ -67,7 +67,7 @@ pub fn verify_token(key: &String, token: &String) -> bool { pub fn extract_id_from_token(key: &String, token: &String) -> Result { match get_payload(key, token) { - Ok((payload, _header)) => match payload.claim("id") { + Ok((payload, _header)) => match payload.claim("user_id") { Some(id) => match uuid::Uuid::parse_str(id.as_str().unwrap()) { Ok(extracted) => Ok(extracted), Err(err) => Err(std::io::Error::other(err.to_string())), -- 2.47.3 From efaffc77789c836f3c6923252982e10656c11b90 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 19:02:06 -0400 Subject: [PATCH 5/6] 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 b92ea21..03e0efa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2240,7 +2240,7 @@ dependencies = [ [[package]] name = "textsender_models" version = "0.3.3" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.3-27-ec46697714-111#ec466977146cdfca34b4fa50d82d63025a9aa82a" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.3#c09fa36b15601b37f65b8baac0d479c30d2c1e44" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 69bf03b..df80c13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ time = { version = "0.3.47", features = ["macros", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.3-27-ec46697714-111" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.3" } [dev-dependencies] http-body-util = { version = "0.1.3" } -- 2.47.3 From 69f9f36290de5860d2e2f7224b2aee8c960d60d3 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 19:03:25 -0400 Subject: [PATCH 6/6] bump: textsender_auth --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03e0efa..8b0b146 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2212,7 +2212,7 @@ dependencies = [ [[package]] name = "textsender_auth" -version = "0.1.22" +version = "0.1.23" dependencies = [ "argon2", "async-std", diff --git a/Cargo.toml b/Cargo.toml index df80c13..bf98d97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "textsender_auth" -version = "0.1.22" +version = "0.1.23" edition = "2024" rust-version = "1.95" -- 2.47.3