Merge pull request #536 from paolobarbolini/yup-oauth2-v12

Upgrade yup-oauth2 to v12
Byron · Feb 1, 2025 · 77b4705 · 77b4705
2 parents 68c883e + 493435b
commit 77b4705
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/google-apis-common/Cargo.toml b/google-apis-common/Cargo.toml
@@ -27,4 +27,4 @@ serde_json = "1"
 serde_with = "3"
 tokio = { version = "1", features = ["time"] }
 url = "2"
-yup-oauth2 = { version = "11", optional = true }
+yup-oauth2 = { version = "12", optional = true }
diff --git a/google-apis-common/src/lib.rs b/google-apis-common/src/lib.rs
@@ -423,7 +423,7 @@ impl Read for MultiPartReader<'_> {
                     }
 
                     write!(encoded_headers, "{}: {}", k, v.to_str().unwrap())
-                        .map_err(|err| std::io::Error::other(err))?;
+                        .map_err(std::io::Error::other)?;
                 }
 
                 let mut c = Cursor::new(Vec::<u8>::new());

diff --git a/google-clis-common/Cargo.toml b/google-clis-common/Cargo.toml
@@ -21,4 +21,4 @@ mime = "0.3"
 serde = "1"
 serde_json = "1"
 strsim = "0.11"
-yup-oauth2 = "11"
+yup-oauth2 = "12"
diff --git a/src/generator/templates/Cargo.toml.mako b/src/generator/templates/Cargo.toml.mako
@@ -47,7 +47,7 @@ tokio = { version = "1", features = ["full"] }
 % endif
 url = "2"
 utoipa = { version = "4", optional = true }
-yup-oauth2 = { version = "11", optional = true }
+yup-oauth2 = { version = "12", optional = true }
 
 google-apis-common = { path = "../../google-apis-common", version = "7" }
 % if cargo.get('is_executable'):

diff --git a/src/generator/templates/cli/lib/engine.mako b/src/generator/templates/cli/lib/engine.mako
@@ -139,7 +139,9 @@ where
         let auth = yup_oauth2::InstalledFlowAuthenticator::with_client(
             secret,
             yup_oauth2::InstalledFlowReturnMethod::HTTPRedirect,
-            hyper_util::client::legacy::Client::builder(executor).build(connector),
+            yup_oauth2::client::CustomHyperClientBuilder::from(
+                hyper_util::client::legacy::Client::builder(executor).build(connector),
+            ),
         ).persist_tokens_to_disk(format!("{}/${util.program_name()}", config_dir)).build().await.unwrap();
 
 <% gpm = gen_global_parameter_names(parameters) %>\