Use oauth token for basic bearer auth in Rust. (#2161)

* Use oauth token for basic bearer auth in Rust.

* Add bearer_access_token instead of reusing oauth_access_token
This commit is contained in:
boxdot 2019-02-20 03:17:22 +01:00 committed by William Cheng
parent 1d08296f96
commit bc6c94d412
2 changed files with 9 additions and 0 deletions

View File

@ -78,9 +78,16 @@ impl {{{classname}}} for {{{classname}}}Client {
{{/isKeyInHeader}} {{/isKeyInHeader}}
{{/isApiKey}} {{/isApiKey}}
{{#isBasic}} {{#isBasic}}
{{^isBasicBearer}}
if let Some(ref auth_conf) = configuration.basic_auth { if let Some(ref auth_conf) = configuration.basic_auth {
req_builder = req_builder.basic_auth(auth_conf.0.to_owned(), auth_conf.1.to_owned()); req_builder = req_builder.basic_auth(auth_conf.0.to_owned(), auth_conf.1.to_owned());
}; };
{{/isBasicBearer}}
{{#isBasicBearer}}
if let Some(ref token) = configuration.bearer_access_token {
req_builder = req_builder.bearer_auth(token.to_owned());
};
{{/isBasicBearer}}
{{/isBasic}} {{/isBasic}}
{{#isOAuth}} {{#isOAuth}}
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {

View File

@ -8,6 +8,7 @@ pub struct Configuration {
pub client: reqwest::Client, pub client: reqwest::Client,
pub basic_auth: Option<BasicAuth>, pub basic_auth: Option<BasicAuth>,
pub oauth_access_token: Option<String>, pub oauth_access_token: Option<String>,
pub bearer_access_token: Option<String>,
pub api_key: Option<ApiKey>, pub api_key: Option<ApiKey>,
// TODO: take an oauth2 token source, similar to the go one // TODO: take an oauth2 token source, similar to the go one
} }
@ -33,6 +34,7 @@ impl Default for Configuration {
client: reqwest::Client::new(), client: reqwest::Client::new(),
basic_auth: None, basic_auth: None,
oauth_access_token: None, oauth_access_token: None,
bearer_access_token: None,
api_key: None, api_key: None,
} }
} }