Merge pull request #539 from paolobarbolini/reduce-yup-oauth2-features

Reduce yup-oauth2 features

Author: Byron

etc/api/shared.yaml

@@ -94,7 +94,7 @@ directories:
   # The subdirectory to contain documentation from all APIs and related programs
   doc_subdir: doc
 cargo:
-  build_version: "6.0.0"
+  build_version: "7.0.0"
   repo_base_url: https://github.com/Byron/google-apis-rs
   authors:
     # don't forget to possibly add them to copyright authors

google-apis-common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "google-apis-common"
-version = "7.0.0"
+version = "8.0.0"
 authors = ["Sebastian Thiel <[email protected]>"]
 repository = "https://github.com/Byron/google-apis-rs"
 homepage = "https://github.com/Byron/google-apis-rs/google-apis-common"
@@ -27,4 +27,21 @@ serde_json = "1"
 serde_with = "3"
 tokio = { version = "1", features = ["time"] }
 url = "2"
-yup-oauth2 = { version = "12", optional = true }
+yup-oauth2 = { version = "12", default-features = false, optional = true }
+
+[features]
+## Enable OAuth 2.0 authentication support via the `yup-oauth2` crate
+yup-oauth2 = ["dep:yup-oauth2"]
+
+## Enable Service Account support for the `yup-oauth2 crate
+yup-oauth2-service-account = ["yup-oauth2", "yup-oauth2/service-account"]
+
+## Use AWS-LC as the crypto backend
+##
+## Either this feature or `ring` must be enabled when enabling `yup-oauth2-service-account`
+aws-lc-rs = ["yup-oauth2?/aws-lc-rs"]
+
+## Use Ring as the crypto backend
+##
+## Either this feature or `aws-lc-rs` must be enabled when enabling `yup-oauth2-service-account`
+ring = ["yup-oauth2?/ring"]

google-clis-common/Cargo.toml

@@ -2,7 +2,7 @@
 # This library is just to try out the code that should ultimately go into the code generator !
 [package]
 name = "google-clis-common"
-version = "7.0.0"
+version = "8.0.0"
 authors = ["Sebastian Thiel <[email protected]>"]
 repository = "https://github.com/Byron/google-apis-rs"
 homepage = "https://github.com/Byron/google-apis-rs/google-clis-common"
@@ -21,4 +21,4 @@ mime = "0.3"
 serde = "1"
 serde_json = "1"
 strsim = "0.11"
-yup-oauth2 = "12"
+yup-oauth2 = { version = "12", default-features = false }

src/generator/templates/Cargo.toml.mako

@@ -32,7 +32,7 @@ clap = "2"
 http-body-util = "0.1"
 % endif
 hyper = "1"
-hyper-rustls = { version = "0.27", default-features = false }
+hyper-rustls = { version = "0.27", default-features = false, features = ["http2", "rustls-native-certs", "native-tokio"] }
 hyper-util = "0.1"
 mime = "0.3"
 serde = { version = "1", features = ["derive"] }
@@ -47,11 +47,11 @@ tokio = { version = "1", features = ["full"] }
 % endif
 url = "2"
 utoipa = { version = "4", optional = true }
-yup-oauth2 = { version = "12", optional = true }
+yup-oauth2 = { version = "12", default-features = false, optional = true }
 
-google-apis-common = { path = "../../google-apis-common", version = "7" }
+google-apis-common = { path = "../../google-apis-common", version = "8" }
 % if cargo.get('is_executable'):
-google-clis-common = { path = "../../google-clis-common", version = "7" }
+google-clis-common = { path = "../../google-clis-common", version = "8" }
 % endif
 
 <%
@@ -71,7 +71,22 @@ version = "${util.crate_version()}"
 
 % if not cargo.get('is_executable'):
 [features]
-default = ["yup-oauth2"]
+default = ["yup-oauth2", "ring"]
 utoipa = ["dep:utoipa"]
+
+## Enable OAuth 2.0 authentication support via the `yup-oauth2` crate
 yup-oauth2 = ["dep:yup-oauth2", "google-apis-common/yup-oauth2"]
+
+## Enable Service Account support for the `yup-oauth2 crate
+yup-oauth2-service-account = ["yup-oauth2", "yup-oauth2/service-account", "google-apis-common/yup-oauth2-service-account"]
+
+## Use AWS-LC as the crypto backend
+##
+## Either this feature or `ring` must be enabled when enabling `yup-oauth2-service-account`
+aws-lc-rs = ["yup-oauth2?/aws-lc-rs", "google-apis-common/aws-lc-rs", "hyper-rustls/aws-lc-rs"]
+
+## Use Ring as the crypto backend
+##
+## Either this feature or `aws-lc-rs` must be enabled when enabling `yup-oauth2-service-account`
+ring = ["yup-oauth2?/ring", "google-apis-common/ring", "hyper-rustls/ring"]
 % endif

src/generator/templates/api/lib/lib.mako

@@ -263,9 +263,20 @@ let secret: yup_oauth2::ApplicationSecret = Default::default();
 // what's going on. You probably want to bring in your own `TokenStorage` to persist tokens and
 // retrieve them from storage.
 % endif
-let auth = yup_oauth2::InstalledFlowAuthenticator::builder(
+let connector = hyper_rustls::HttpsConnectorBuilder::new()
+    .with_native_roots()
+    .unwrap()
+    .https_only()
+    .enable_http2()
+    .build();
+
+let executor = hyper_util::rt::TokioExecutor::new();
+let auth = yup_oauth2::InstalledFlowAuthenticator::with_client(
     secret,
     yup_oauth2::InstalledFlowReturnMethod::HTTPRedirect,
+    yup_oauth2::client::CustomHyperClientBuilder::from(
+        hyper_util::client::legacy::Client::builder(executor).build(connector),
+    ),
 ).build().await.unwrap();
 
 let client = hyper_util::client::legacy::Client::builder(
@@ -276,7 +287,7 @@ let client = hyper_util::client::legacy::Client::builder(
         .with_native_roots()
         .unwrap()
         .https_or_http()
-        .enable_http1()
+        .enable_http2()
         .build()
 );
 let mut hub = ${hub_type}::new(client, auth);\

src/generator/templates/cli/main.rs.mako

@@ -39,7 +39,7 @@ async fn main() {
         .with_native_roots()
         .unwrap()
         .https_or_http()
-        .enable_http1()
+        .enable_http2()
         .build();
 
     match Engine::new(matches, connector).await {