update reqwest

Author: ImShyMike

rustytime/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "rustytime-server"
 description = "🕒 blazingly fast time tracking for developers"
-version = "0.12.5"
+version = "0.12.6"
 edition = "2024"
 authors = ["ImShyMike"]
 readme = "../README.md"
@@ -51,8 +51,7 @@ serde_json = { version = "1.0.148", default-features = false }
 base64 = { version = "0.22.1", default-features = false }
 ipnetwork = { version = "0.21.1", features = ["serde"], default-features = false }
 oauth2 = { version = "5.0.0",  features = ["reqwest"], default-features = false }
-# update to 0.13 when oauth2 supports it (add the "query" feature)
-reqwest = { version = "0.12.28", features = ["json", "cookies"], default-features = false }
+reqwest = { version = "0.13.1", features = ["json", "cookies", "query"], default-features = false }
 url = { version = "2.5.7", default-features = false }
 tower = { version = "0.5.2", default-features = false }
 tower-cookies = { version = "0.11.0", features = ["axum-core"], default-features = false }

rustytime/Cargo.toml

@@ -8,7 +8,7 @@ use chrono::{DateTime, Utc};
 use diesel::prelude::*;
 use oauth2::{
     AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EndpointNotSet, EndpointSet,
-    RedirectUrl, Scope, TokenResponse, TokenUrl, basic::BasicClient, reqwest,
+    RedirectUrl, Scope, TokenResponse, TokenUrl, basic::BasicClient, reqwest as oauth2_reqwest
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -165,11 +165,17 @@ pub async fn callback(
 
     let code = AuthorizationCode::new(params.code.clone());
 
+    // i hate this so much but oauth2 crate is stuck on reqwest 0.12
+    let client = oauth2_reqwest::Client::builder()
+        .redirect(oauth2_reqwest::redirect::Policy::none())
+        .build()
+        .expect("Failed to build OAuth HTTP client");
+
     // exchange code for access token
     let token_response = match app_state
         .github_client
         .exchange_code(code)
-        .request_async(&app_state.http_client)
+        .request_async(&client)
         .await
     {
         Ok(response) => response,