Add our changes to the templates

Author: dani-garcia

Cargo.lock

@@ -12,7 +12,12 @@ repository.workspace = true
 license-file.workspace = true
 keywords.workspace = true
 
+[features]
+mockall = ["dep:mockall"]
+
 [dependencies]
+async-trait = { workspace = true }
+mockall = { version = ">=0.13, <0.14", optional = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/bitwarden-api-api/Cargo.toml

@@ -12,7 +12,12 @@ repository.workspace = true
 license-file.workspace = true
 keywords.workspace = true
 
+[features]
+mockall = ["dep:mockall"]
+
 [dependencies]
+async-trait = { workspace = true }
+mockall = { version = ">=0.13, <0.14", optional = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/bitwarden-api-identity/Cargo.toml

@@ -66,13 +66,15 @@ impl Client {
             HeaderValue::from_str(&(settings.device_type as u8).to_string())
                 .expect("All numbers are valid ASCII"),
         );
-        let client_builder = new_client_builder().default_headers(headers);
+        let client_builder = new_client_builder()
+            .default_headers(headers)
+            .user_agent(settings.user_agent);
 
         let client = client_builder.build().expect("Build should not fail");
 
         let identity = bitwarden_api_identity::apis::configuration::Configuration {
             base_path: settings.identity_url,
-            user_agent: Some(settings.user_agent.clone()),
+            user_agent: None,
             client: client.clone(),
             basic_auth: None,
             oauth_access_token: None,
@@ -82,7 +84,7 @@ impl Client {
 
         let api = bitwarden_api_api::apis::configuration::Configuration {
             base_path: settings.api_url,
-            user_agent: Some(settings.user_agent),
+            user_agent: None,
             client,
             basic_auth: None,
             oauth_access_token: None,

crates/bitwarden-core/src/client/client.rs

@@ -18,7 +18,7 @@ npx openapi-generator-cli generate \
     -o crates/bitwarden-api-api \
     --package-name bitwarden-api-api \
     -t ./support/openapi-template \
-    --additional-properties=packageVersion=$VERSION,packageDescription=\"Api bindings for the Bitwarden API.\"
+    --additional-properties=library=reqwest-trait,topLevelApiClient,packageVersion=$VERSION,packageDescription=\"Api bindings for the Bitwarden API.\"
 
 # Delete old directory to ensure all files are updated
 rm -rf crates/bitwarden-api-identity/src
@@ -30,8 +30,23 @@ npx openapi-generator-cli generate \
     -o crates/bitwarden-api-identity \
     --package-name bitwarden-api-identity \
     -t ./support/openapi-template \
-    --additional-properties=packageVersion=$VERSION,packageDescription=\"Api bindings for the Bitwarden Identity API.\"
+    --additional-properties=library=reqwest-trait,topLevelApiClient,packageVersion=$VERSION,packageDescription=\"Api bindings for the Bitwarden Identity API.\"
 
 rustup toolchain install nightly
+
+# Rustfmt has what looks like a bug, where it requires multiple passes to format the code.
+# For example with code like this:
+# ```rust
+# /// Test Doc
+# ///
+# ///
+# fn test() {}
+# ```
+# The first pass will remove one of the empty lines but not the second one, so we need a
+# second pass to remove the second empty line. The swagger generated code adds three comment
+# lines, for path, description and notes and for us the last two are usually empty, which explains
+# the need for these two passes.
+cargo +nightly fmt
 cargo +nightly fmt
+
 npm run prettier

support/build-api.sh

@@ -1,5 +1,12 @@
-#![allow(unused_imports)]
-#![allow(clippy::too_many_arguments)]
+#![allow(unused_imports, unused_variables, unused_mut, non_camel_case_types)]
+#![allow(
+    clippy::too_many_arguments,
+    clippy::empty_docs,
+    clippy::to_string_in_format_args,
+    clippy::needless_return,
+    clippy::uninlined_format_args,
+    clippy::new_without_default
+)]
 
 extern crate serde_repr;
 extern crate serde;

support/openapi-template/lib.mustache

@@ -129,12 +129,12 @@ pub struct {{{classname}}} {
     /// {{{.}}}
     {{/description}}
     {{#isByteArray}}
-    {{#vendorExtensions.isMandatory}}#[serde_as(as = "serde_with::base64::Base64")]{{/vendorExtensions.isMandatory}}{{^vendorExtensions.isMandatory}}#[serde_as(as = "{{^serdeAsDoubleOption}}Option{{/serdeAsDoubleOption}}{{#serdeAsDoubleOption}}super::DoubleOption{{/serdeAsDoubleOption}}<serde_with::base64::Base64>")]{{/vendorExtensions.isMandatory}}
+    {{#vendorExtensions.isMandatory}}#[serde_as(as = "serde_with::base64::Base64")]{{/vendorExtensions.isMandatory}}{{^vendorExtensions.isMandatory}}#[serde_as(as = "Option<serde_with::base64::Base64>")]{{/vendorExtensions.isMandatory}}
     {{/isByteArray}}
-    #[serde(rename = "{{{baseName}}}"{{^required}}{{#isNullable}}, default{{^isByteArray}}, with = "::serde_with::rust::double_option"{{/isByteArray}}{{/isNullable}}{{/required}}{{^required}}, skip_serializing_if = "Option::is_none"{{/required}}{{#required}}{{#isNullable}}, deserialize_with = "Option::deserialize"{{/isNullable}}{{/required}})]
+    #[serde(rename = "{{{baseName}}}"{{^required}}, skip_serializing_if = "Option::is_none"{{/required}})]
     pub {{{name}}}: {{!
     ### Option Start
-    }}{{#isNullable}}Option<{{/isNullable}}{{^required}}Option<{{/required}}{{!
+    }}{{#isNullable}}Option<{{/isNullable}}{{^required}}{{^isNullable}}Option<{{/isNullable}}{{/required}}{{!
     ### Enums
     }}{{#isEnum}}{{#isArray}}{{#uniqueItems}}std::collections::HashSet<{{/uniqueItems}}{{^uniqueItems}}Vec<{{/uniqueItems}}{{/isArray}}{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{!
     ### Non-Enums Start
@@ -146,7 +146,7 @@ pub struct {{{classname}}} {
     ### Non-Enums End
     }}{{/isEnum}}{{!
     ### Option End (and trailing comma)
-    }}{{#isNullable}}>{{/isNullable}}{{^required}}>{{/required}},
+    }}{{#isNullable}}>{{/isNullable}}{{^required}}{{^isNullable}}>{{/isNullable}}{{/required}},
 {{/vars}}
 }
 

support/openapi-template/model.mustache

@@ -4,42 +4,3 @@ pub mod {{{classFilename}}};
 pub use self::{{{classFilename}}}::{{{classname}}};
 {{/model}}
 {{/models}}
-{{#serdeAsDoubleOption}}
-use serde::{Deserialize, Deserializer, Serializer};
-use serde_with::{de::DeserializeAsWrap, ser::SerializeAsWrap, DeserializeAs, SerializeAs};
-use std::marker::PhantomData;
-
-pub(crate) struct DoubleOption<T>(PhantomData<T>);
-
-impl<T, TAs> SerializeAs<Option<Option<T>>> for DoubleOption<TAs>
-where
-    TAs: SerializeAs<T>,
-{
-    fn serialize_as<S>(values: &Option<Option<T>>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        match values {
-            None => serializer.serialize_unit(),
-            Some(None) => serializer.serialize_none(),
-            Some(Some(v)) => serializer.serialize_some(&SerializeAsWrap::<T, TAs>::new(v)),
-        }
-    }
-}
-
-impl<'de, T, TAs> DeserializeAs<'de, Option<Option<T>>> for DoubleOption<TAs>
-where
-    TAs: DeserializeAs<'de, T>,
-    T: std::fmt::Debug,
-{
-    fn deserialize_as<D>(deserializer: D) -> Result<Option<Option<T>>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(Some(
-            DeserializeAsWrap::<Option<T>, Option<TAs>>::deserialize(deserializer)?
-                .into_inner(),
-        ))
-    }
-}
-{{/serdeAsDoubleOption}}