diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache index f9e6e9db5990..d5568811d854 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache @@ -150,13 +150,9 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{#authMethods}} {{#isApiKey}} {{#isKeyInQuery}} - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.query(&[("{{{keyParamName}}}", local_var_value)]); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("{{{keyParamName}}}") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.query(&[("{{{keyParamName}}}", local_var_key)]); } {{/isKeyInQuery}} {{/isApiKey}} @@ -213,13 +209,9 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{#authMethods}} {{#isApiKey}} {{#isKeyInHeader}} - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("{{{keyParamName}}}", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("{{{keyParamName}}}") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("{{{keyParamName}}}", local_var_key); }; {{/isKeyInHeader}} {{/isApiKey}} diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache index fd6f7d052d97..e202d5f0190c 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache @@ -1,5 +1,5 @@ {{>partial_header}} - +use std::collections::HashMap; {{#withAWSV4Signature}} use std::time::SystemTime; use aws_sigv4::http_request::{sign, SigningSettings, SigningParams, SignableRequest}; @@ -15,7 +15,7 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, {{#withAWSV4Signature}} pub aws_v4_key: Option, {{/withAWSV4Signature}} @@ -24,12 +24,6 @@ pub struct Configuration { pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - {{#withAWSV4Signature}} #[derive(Debug, Clone)] pub struct AWSv4Key { @@ -84,7 +78,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), {{#withAWSV4Signature}} aws_v4_key: None,{{/withAWSV4Signature}} } } diff --git a/samples/client/others/rust/reqwest-regression-16119/src/apis/configuration.rs b/samples/client/others/rust/reqwest-regression-16119/src/apis/configuration.rs index d1b488dc8b82..5c4c3b9af59b 100644 --- a/samples/client/others/rust/reqwest-regression-16119/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest-regression-16119/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/configuration.rs b/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/configuration.rs index 244f8e0b3267..a1297eb9545a 100644 --- a/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/apis/configuration.rs b/samples/client/others/rust/reqwest/composed-oneof/src/apis/configuration.rs index 0cd1c7b22cdd..7ae662330821 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/others/rust/reqwest/emptyObject/src/apis/configuration.rs b/samples/client/others/rust/reqwest/emptyObject/src/apis/configuration.rs index cd823ba99a0c..3bddce910c33 100644 --- a/samples/client/others/rust/reqwest/emptyObject/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest/emptyObject/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/configuration.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/configuration.rs index affdc7fd52d6..732a0c241127 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/configuration.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/configuration.rs index 4dc1cd54751d..82551f89d6fa 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/others/rust/reqwest/oneOf/src/apis/configuration.rs b/samples/client/others/rust/reqwest/oneOf/src/apis/configuration.rs index cfdd5f470ea1..49b5373e5014 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/apis/configuration.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/petstore/rust/reqwest/name-mapping/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/name-mapping/src/apis/configuration.rs index c2176e57ad09..589e195aeb7c 100644 --- a/samples/client/petstore/rust/reqwest/name-mapping/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/name-mapping/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/configuration.rs index 5c15632ff7c6..a451c8ae9634 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs index 0a44b19a32dd..6c053a21a24d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs @@ -386,13 +386,9 @@ pub async fn get_pet_by_id(configuration: &configuration::Configuration, params: if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs index 67fd03a80f54..840cc74ebb01 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs @@ -150,13 +150,9 @@ pub async fn get_inventory(configuration: &configuration::Configuration) -> Resu if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs index 4f28c21c1cf3..ea9c79308a9f 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs @@ -210,13 +210,9 @@ pub async fn create_user(configuration: &configuration::Configuration, params: C if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -253,13 +249,9 @@ pub async fn create_users_with_array_input(configuration: &configuration::Config if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -296,13 +288,9 @@ pub async fn create_users_with_list_input(configuration: &configuration::Configu if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -339,13 +327,9 @@ pub async fn delete_user(configuration: &configuration::Configuration, params: D if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -451,13 +435,9 @@ pub async fn logout_user(configuration: &configuration::Configuration) -> Result if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -494,13 +474,9 @@ pub async fn update_user(configuration: &configuration::Configuration, params: U if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/configuration.rs index ba335d974cc6..4f125eb50765 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs index 0a44b19a32dd..6c053a21a24d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs @@ -386,13 +386,9 @@ pub async fn get_pet_by_id(configuration: &configuration::Configuration, params: if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs index 67fd03a80f54..840cc74ebb01 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs @@ -150,13 +150,9 @@ pub async fn get_inventory(configuration: &configuration::Configuration) -> Resu if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs index 4f28c21c1cf3..ea9c79308a9f 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs @@ -210,13 +210,9 @@ pub async fn create_user(configuration: &configuration::Configuration, params: C if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -253,13 +249,9 @@ pub async fn create_users_with_array_input(configuration: &configuration::Config if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -296,13 +288,9 @@ pub async fn create_users_with_list_input(configuration: &configuration::Configu if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -339,13 +327,9 @@ pub async fn delete_user(configuration: &configuration::Configuration, params: D if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -451,13 +435,9 @@ pub async fn logout_user(configuration: &configuration::Configuration) -> Result if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -494,13 +474,9 @@ pub async fn update_user(configuration: &configuration::Configuration, params: U if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/configuration.rs index ba335d974cc6..4f125eb50765 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs index 0a44b19a32dd..6c053a21a24d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs @@ -386,13 +386,9 @@ pub async fn get_pet_by_id(configuration: &configuration::Configuration, params: if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs index 67fd03a80f54..840cc74ebb01 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs @@ -150,13 +150,9 @@ pub async fn get_inventory(configuration: &configuration::Configuration) -> Resu if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs index 4f28c21c1cf3..ea9c79308a9f 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs @@ -210,13 +210,9 @@ pub async fn create_user(configuration: &configuration::Configuration, params: C if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -253,13 +249,9 @@ pub async fn create_users_with_array_input(configuration: &configuration::Config if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -296,13 +288,9 @@ pub async fn create_users_with_list_input(configuration: &configuration::Configu if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -339,13 +327,9 @@ pub async fn delete_user(configuration: &configuration::Configuration, params: D if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -451,13 +435,9 @@ pub async fn logout_user(configuration: &configuration::Configuration) -> Result if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -494,13 +474,9 @@ pub async fn update_user(configuration: &configuration::Configuration, params: U if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs index f401dc386376..b9f730d1ae84 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; use std::time::SystemTime; use aws_sigv4::http_request::{sign, SigningSettings, SigningParams, SignableRequest}; use http; @@ -22,19 +22,13 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, pub aws_v4_key: Option, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - #[derive(Debug, Clone)] pub struct AWSv4Key { pub access_key: String, @@ -87,7 +81,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), aws_v4_key: None, } } diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs index c48cfb3b2f90..ff1ad1cbb90b 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs @@ -295,13 +295,9 @@ pub fn get_pet_by_id(configuration: &configuration::Configuration, pet_id: i64) if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs index fd42617f4c7d..3c88ffd298cb 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs @@ -102,13 +102,9 @@ pub fn get_inventory(configuration: &configuration::Configuration, ) -> Result format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs index 0eedaddc2e48..b1808f008b3a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs @@ -108,13 +108,9 @@ pub fn create_user(configuration: &configuration::Configuration, user: models::U if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -158,13 +154,9 @@ pub fn create_users_with_array_input(configuration: &configuration::Configuratio if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -208,13 +200,9 @@ pub fn create_users_with_list_input(configuration: &configuration::Configuration if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -258,13 +246,9 @@ pub fn delete_user(configuration: &configuration::Configuration, username: &str) if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -365,13 +349,9 @@ pub fn logout_user(configuration: &configuration::Configuration, ) -> Result<(), if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -414,13 +394,9 @@ pub fn update_user(configuration: &configuration::Configuration, username: &str, if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/configuration.rs index 8a43283dd436..0e4812b281dd 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/configuration.rs @@ -8,7 +8,7 @@ * Generated by: https://openapi-generator.tech */ - +use std::collections::HashMap; #[derive(Debug, Clone)] pub struct Configuration { @@ -18,18 +18,12 @@ pub struct Configuration { pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, - pub api_key: Option, + pub api_keys: HashMap, // TODO: take an oauth2 token source, similar to the go one } pub type BasicAuth = (String, Option); -#[derive(Debug, Clone)] -pub struct ApiKey { - pub prefix: Option, - pub key: String, -} - impl Configuration { pub fn new() -> Configuration { @@ -46,7 +40,7 @@ impl Default for Configuration { basic_auth: None, oauth_access_token: None, bearer_access_token: None, - api_key: None, + api_keys: HashMap::new(), } } diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs index ebff8f8dde98..432374d69fc9 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs @@ -230,13 +230,9 @@ pub fn get_pet_by_id(configuration: &configuration::Configuration, pet_id: i64) if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs index 98c889e0e55f..9a23702615be 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs @@ -89,13 +89,9 @@ pub fn get_inventory(configuration: &configuration::Configuration, ) -> Result format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs index 2f328ace6051..ba4e229dea84 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs @@ -95,13 +95,9 @@ pub fn create_user(configuration: &configuration::Configuration, user: models::U if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -132,13 +128,9 @@ pub fn create_users_with_array_input(configuration: &configuration::Configuratio if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -169,13 +161,9 @@ pub fn create_users_with_list_input(configuration: &configuration::Configuration if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user); @@ -206,13 +194,9 @@ pub fn delete_user(configuration: &configuration::Configuration, username: &str) if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -300,13 +284,9 @@ pub fn logout_user(configuration: &configuration::Configuration, ) -> Result<(), if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; let local_var_req = local_var_req_builder.build()?; @@ -336,13 +316,9 @@ pub fn update_user(configuration: &configuration::Configuration, username: &str, if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - if let Some(ref local_var_apikey) = local_var_configuration.api_key { - let local_var_key = local_var_apikey.key.clone(); - let local_var_value = match local_var_apikey.prefix { - Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), - None => local_var_key, - }; - local_var_req_builder = local_var_req_builder.header("api_key", local_var_value); + if let Some(local_var_apikey) = local_var_configuration.api_keys.get("api_key") { + let local_var_key = local_var_apikey.clone(); + local_var_req_builder = local_var_req_builder.header("api_key", local_var_key); }; local_var_req_builder = local_var_req_builder.json(&user);