move auth hostname into custom header (#67)

* catch PropelAuthRateLimit error on all requests

* bump minor version to 0.22.0

* move auth hostname into custom header

* bump patch version to 0.22.1

Author: mrmauer

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "propelauth"
-version = "0.22.0"
+version = "0.22.1"
 authors = ["support@propelauth.com"]
 description = "A Rust crate for managing authentication and authorization with support for multi-tenant / B2B products, powered by PropelAuth"
 keywords = ["authentication", "auth", "authorization", "b2b", "tenant"]

src/apis/access_token_service_api.rs

@@ -1,7 +1,7 @@
 use reqwest;
 
 use super::{configuration, Error};
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, propelauth::auth::AUTH_HOSTNAME_HEADER};
 
 /// struct for passing parameters to the method [`create_access_token`]
 #[derive(Clone, Debug, Default)]
@@ -49,6 +49,11 @@ pub async fn create_access_token(
     if let Some(ref local_var_token) = local_var_configuration.bearer_access_token {
         local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned());
     };
+    local_var_req_builder = local_var_req_builder.header(
+        AUTH_HOSTNAME_HEADER,
+        local_var_configuration.auth_hostname.to_owned(),
+    );
+
     local_var_req_builder = local_var_req_builder.json(&create_access_token_request);
 
     let local_var_req = local_var_req_builder.build()?;
@@ -96,6 +101,11 @@ pub async fn create_access_token_v2(
     if let Some(ref local_var_token) = local_var_configuration.bearer_access_token {
         local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned());
     };
+    local_var_req_builder = local_var_req_builder.header(
+        AUTH_HOSTNAME_HEADER,
+        local_var_configuration.auth_hostname.to_owned(),
+    );
+
     local_var_req_builder = local_var_req_builder.json(&create_access_token_request);
 
     let local_var_req = local_var_req_builder.build()?;

src/apis/api_key_service_api.rs

@@ -7,7 +7,7 @@
 use hex;
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, propelauth::auth::AUTH_HOSTNAME_HEADER};
 
 use super::{configuration, Error};
 
@@ -113,6 +113,7 @@ pub async fn fetch_current_api_keys(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     let req = req_builder.build()?;
     let resp = client.execute(req).await?;
@@ -168,6 +169,7 @@ pub async fn fetch_archived_api_keys(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     let req = req_builder.build()?;
     let resp = client.execute(req).await?;
@@ -210,6 +212,7 @@ pub async fn fetch_api_key(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     let req = req_builder.build()?;
     let resp = client.execute(req).await?;
@@ -248,6 +251,7 @@ pub async fn create_api_key(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     req_builder = req_builder.json(&params);
 
@@ -293,6 +297,7 @@ pub async fn update_api_key(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     req_builder = req_builder.json(&params);
 
@@ -337,6 +342,7 @@ pub async fn delete_api_key(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     let req = req_builder.build()?;
     let resp = client.execute(req).await?;
@@ -375,6 +381,7 @@ pub async fn validate_api_key(
     if let Some(ref bearer_token) = configuration.bearer_access_token {
         req_builder = req_builder.bearer_auth(bearer_token.to_owned());
     }
+    req_builder = req_builder.header(AUTH_HOSTNAME_HEADER, configuration.auth_hostname.to_owned());
 
     req_builder = req_builder.json(&params);
 

src/apis/auth_service_api.rs

@@ -4,16 +4,14 @@
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 0.1.0
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
-
 use reqwest;
 
-use crate::apis::ResponseContent;
-use super::{Error, configuration};
-
+use super::{configuration, Error};
+use crate::{apis::ResponseContent, propelauth::auth::AUTH_HOSTNAME_HEADER};
 
 /// struct for typed errors of method [`token_verification_metadata`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -23,24 +21,33 @@ pub enum TokenVerificationMetadataError {
     UnknownValue(serde_json::Value),
 }
 
-
-pub async fn token_verification_metadata(configuration: &configuration::Configuration) -> Result<crate::models::AuthTokenVerificationMetadata, Error<TokenVerificationMetadataError>> {
+pub async fn token_verification_metadata(
+    configuration: &configuration::Configuration,
+) -> Result<crate::models::AuthTokenVerificationMetadata, Error<TokenVerificationMetadataError>> {
     let local_var_configuration = configuration;
 
     // unbox the parameters
 
-
     let local_var_client = &local_var_configuration.client;
 
-    let local_var_uri_str = format!("{}/api/backend/v1/token_verification_metadata", local_var_configuration.base_path);
-    let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str());
+    let local_var_uri_str = format!(
+        "{}/api/backend/v1/token_verification_metadata",
+        local_var_configuration.base_path
+    );
+    let mut local_var_req_builder =
+        local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_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());
+        local_var_req_builder =
+            local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone());
     }
     if let Some(ref local_var_token) = local_var_configuration.bearer_access_token {
         local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned());
     };
+    local_var_req_builder = local_var_req_builder.header(
+        AUTH_HOSTNAME_HEADER,
+        local_var_configuration.auth_hostname.to_owned(),
+    );
 
     let local_var_req = local_var_req_builder.build()?;
     let local_var_resp = local_var_client.execute(local_var_req).await?;
@@ -51,9 +58,13 @@ pub async fn token_verification_metadata(configuration: &configuration::Configur
     if !local_var_status.is_client_error() && !local_var_status.is_server_error() {
         serde_json::from_str(&local_var_content).map_err(Error::from)
     } else {
-        let local_var_entity: Option<TokenVerificationMetadataError> = serde_json::from_str(&local_var_content).ok();
-        let local_var_error = ResponseContent { status: local_var_status, content: local_var_content, entity: local_var_entity };
+        let local_var_entity: Option<TokenVerificationMetadataError> =
+            serde_json::from_str(&local_var_content).ok();
+        let local_var_error = ResponseContent {
+            status: local_var_status,
+            content: local_var_content,
+            entity: local_var_entity,
+        };
         Err(Error::ResponseError(local_var_error))
     }
 }
-

src/apis/configuration.rs

@@ -4,17 +4,16 @@
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 0.1.0
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
-
 use reqwest;
 
-
 #[derive(Debug, Clone)]
 pub struct Configuration {
     pub base_path: String,
+    pub auth_hostname: String,
     pub user_agent: Option<String>,
     pub client: reqwest::Client,
     pub basic_auth: Option<BasicAuth>,
@@ -32,18 +31,17 @@ pub struct ApiKey {
     pub key: String,
 }
 
-
 impl Default for Configuration {
     fn default() -> Self {
         Configuration {
             base_path: "http://localhost".to_owned(),
+            auth_hostname: "http://localhost".to_owned(),
             user_agent: Some("OpenAPI-Generator/0.1.0/rust".to_owned()),
             client: reqwest::Client::new(),
             basic_auth: None,
             oauth_access_token: None,
             bearer_access_token: None,
             api_key: None,
-
         }
     }
 }