From f06eaee30f8642361ceb5465a5cf88ef63552d81 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 30 Jun 2026 11:48:15 -0400 Subject: [PATCH 1/5] Updating dependencies --- Cargo.lock | 3 --- Cargo.toml | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fe8c99..acfdd50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3133,18 +3133,15 @@ version = "0.2.0" dependencies = [ "axum", "axum-extra", - "futures", "josekit", "jsonwebtoken", "serde", "serde_json", "sqlx 0.9.0", "swoosh", - "tempfile", "textsender_models", "time", "tokio", - "tokio-util", "tower", "tower-http", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index 4d2860e..0d77a57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,21 +10,18 @@ axum-extra = { version = "0.12.6", features = ["cookie"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } tokio = { version = "1.52.3", features = ["full"] } -tokio-util = { version = "0.7.18", features = ["io"] } -tower = { version = "0.5.3", features = ["full"] } tower-http = { version = "0.6.11", features = ["cors", "timeout"] } tracing-subscriber = "0.3.23" -futures = { version = "0.3.32" } uuid = { version = "1.23.3", features = ["v4", "serde"] } sqlx = { version = "0.9.0", features = ["runtime-tokio", "tls-native-tls", "postgres", "time", "uuid"] } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } jsonwebtoken = { version = "10.4.0", features = ["rust_crypto"] } -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.4.10" } swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2.0" } [dev-dependencies] +tower = { version = "0.5.3", features = ["full"] } +josekit = { version = "0.10.3" } url = { version = "2.5.8" } -tempfile = { version = "3.27.0" } -- 2.47.3 From 7019a2fd94ce4f031cfc69f4ae601ff7e308bee6 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 30 Jun 2026 11:48:38 -0400 Subject: [PATCH 2/5] CORS bug fix --- src/config/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/mod.rs b/src/config/mod.rs index a52ebb8..64f871e 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -33,6 +33,7 @@ pub mod init { let cors = tower_http::cors::CorsLayer::new() .allow_methods([ axum::http::Method::GET, + axum::http::Method::PATCH, axum::http::Method::POST, axum::http::Method::PUT, axum::http::Method::DELETE, -- 2.47.3 From 5eeca8c0af964a15d20c5986498b43f84ade4a76 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 30 Jun 2026 11:49:09 -0400 Subject: [PATCH 3/5] bump: textsender_api --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index acfdd50..e7cea91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3129,7 +3129,7 @@ dependencies = [ [[package]] name = "textsender_api" -version = "0.2.0" +version = "0.2.1" dependencies = [ "axum", "axum-extra", diff --git a/Cargo.toml b/Cargo.toml index 0d77a57..07cc86a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "textsender_api" -version = "0.2.0" +version = "0.2.1" edition = "2024" rust-version = "1.96" -- 2.47.3 From aae52254b9e82b19dfb6cf85011d824fe9a24bb8 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 30 Jun 2026 11:51:00 -0400 Subject: [PATCH 4/5] Test fix --- tests/test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.rs b/tests/test.rs index 09c8172..69289d1 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -204,7 +204,7 @@ pub async fn test_token() -> Result { }; match textsender_models::token::create_token(&key, &token_resource, time::Duration::hours(1)) { - Ok((access_token, _some_time)) => Ok(access_token), + Ok(access_token) => Ok(access_token.access_token), Err(err) => Err(err), } } -- 2.47.3 From 4163973b6840e8d0789ff7846fd447c69dc06488 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 30 Jun 2026 11:51:54 -0400 Subject: [PATCH 5/5] Updated workflow --- .gitea/workflows/pr.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index 81f9e2c..40dfaac 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -5,6 +5,10 @@ on: branches: - main +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: check: name: Check -- 2.47.3