diff --git a/Cargo.lock b/Cargo.lock index 2d658af..fb0def9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4432,6 +4432,7 @@ dependencies = [ "image", "listenbox-sync-engine", "reqwest", + "reqwest-middleware", "serde", "serde_json", "tokio", @@ -4476,6 +4477,7 @@ dependencies = [ "parking_lot", "refinery", "reqwest", + "reqwest-middleware", "rusqlite", "serde", "serde_json", @@ -7048,6 +7050,21 @@ dependencies = [ "web-sys", ] +[[package]] +name = "reqwest-middleware" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57f17d28a6e6acfe1733fe24bcd30774d13bffa4b8a22535b4c8c98423088d4e" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "thiserror 1.0.69", + "tower-service", +] + [[package]] name = "resvg" version = "0.45.1" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 0f14cc7..62bcb30 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -11,6 +11,7 @@ clap = { version = "4", features = ["derive"] } chrono = "0.4" image = { version = "0.25", default-features = false, features = ["jpeg", "png"] } reqwest = { version = "0.12", default-features = false } +reqwest-middleware = "0.4.2" serde = { version = "1", features = ["derive"] } serde_json = "1" uuid = { version = "1", features = ["v4"] } diff --git a/crates/cli/src/commands.rs b/crates/cli/src/commands.rs index 7ae8703..2588d70 100644 --- a/crates/cli/src/commands.rs +++ b/crates/cli/src/commands.rs @@ -285,7 +285,7 @@ pub async fn import_rss(api: &Api, source: &str, slug: Option<&str>) -> Result<( pub async fn delete_events( api: &Api, - request: reqwest::RequestBuilder, + request: reqwest_middleware::RequestBuilder, kind: &str, identity_key: &str, identity: &str, diff --git a/crates/sync-engine/Cargo.toml b/crates/sync-engine/Cargo.toml index d023494..195a973 100644 --- a/crates/sync-engine/Cargo.toml +++ b/crates/sync-engine/Cargo.toml @@ -12,6 +12,7 @@ futures-util = "0.3" hex = "0.4" image = { version = "0.25", default-features = false, features = ["jpeg", "png"] } reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls-native-roots"] } +reqwest-middleware = { version = "0.4.2", features = ["json"] } serde = { version = "1", features = ["derive"] } serde_json = "1" serde_yaml = "0.9" diff --git a/crates/sync-engine/src/api.rs b/crates/sync-engine/src/api.rs index 3853f78..1da34ce 100644 --- a/crates/sync-engine/src/api.rs +++ b/crates/sync-engine/src/api.rs @@ -1,6 +1,7 @@ use crate::{auth::StoredAuth, config::Config}; use anyhow::{Context, Result, bail, ensure}; -use reqwest::{Client, RequestBuilder, Response}; +use reqwest::{Client, Response}; +use reqwest_middleware::{ClientWithMiddleware, RequestBuilder}; use serde::de::DeserializeOwned; use serde_json::Value; use std::{future::Future, time::Duration}; @@ -19,7 +20,7 @@ impl std::error::Error for AuthenticationRequired {} pub struct Api { pub config: Config, pub credential: Option, - pub http: Client, + pub http: ClientWithMiddleware, pub cancel: CancellationToken, } @@ -42,7 +43,7 @@ impl Api { Ok(Self { config, credential, - http: builder.build()?, + http: reqwest_middleware::ClientBuilder::new(builder.build()?).build(), cancel, }) } diff --git a/crates/sync-engine/src/events.rs b/crates/sync-engine/src/events.rs index cfb9ac9..4341225 100644 --- a/crates/sync-engine/src/events.rs +++ b/crates/sync-engine/src/events.rs @@ -1,6 +1,7 @@ use crate::api::Api; use anyhow::{Result, bail, ensure}; -use reqwest::{RequestBuilder, Response}; +use reqwest::Response; +use reqwest_middleware::RequestBuilder; use serde_json::Value; pub struct Events { diff --git a/crates/sync-engine/src/publicapi/mod.rs b/crates/sync-engine/src/publicapi/mod.rs index 38de561..2c642c2 100644 --- a/crates/sync-engine/src/publicapi/mod.rs +++ b/crates/sync-engine/src/publicapi/mod.rs @@ -2936,7 +2936,7 @@ impl WhoamiResponse { #[derive(Clone, Debug)] pub struct Client { - http: reqwest::Client, + http: reqwest_middleware::ClientWithMiddleware, base_url: String, bearer_token: Option, } @@ -2948,56 +2948,57 @@ fn encode_path(value: &str) -> String { }).collect() } impl Client { - pub fn new(http: reqwest::Client, base_url: String, bearer_token: Option) -> Self { + /// Every operation uses this client's middleware when its request is sent. + pub fn new(http: reqwest_middleware::ClientWithMiddleware, base_url: String, bearer_token: Option) -> Self { Self { http, base_url: base_url.trim_end_matches('/').to_owned(), bearer_token } } - pub fn openapi(&self) -> reqwest::RequestBuilder { + pub fn openapi(&self) -> reqwest_middleware::RequestBuilder { let path = "/".to_owned(); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn head_openapi(&self) -> reqwest::RequestBuilder { + pub fn head_openapi(&self) -> reqwest_middleware::RequestBuilder { let path = "/".to_owned(); let request = self.http.request(reqwest::Method::HEAD, format!("{}{}", self.base_url, path)).header("Accept", "*/*"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn create_cli_authorization(&self, params: CreateCLIAuthorizationParams) -> reqwest::RequestBuilder { + pub fn create_cli_authorization(&self, params: CreateCLIAuthorizationParams) -> reqwest_middleware::RequestBuilder { let path = "/cli/authorizations".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn cli_authorization_events(&self, params: CliAuthorizationEventsParams) -> reqwest::RequestBuilder { + pub fn cli_authorization_events(&self, params: CliAuthorizationEventsParams) -> reqwest_middleware::RequestBuilder { let path = "/cli/authorizations/{code}/events".to_owned(); let path = path.replace("{code}", &encode_path(¶ms.code.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "text/event-stream"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn episode_deletion_events(&self, params: EpisodeDeletionEventsParams) -> reqwest::RequestBuilder { + pub fn episode_deletion_events(&self, params: EpisodeDeletionEventsParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-deletions/{episode_deletion_run_id}/events".to_owned(); let path = path.replace("{episode_deletion_run_id}", &encode_path(¶ms.episode_deletion_run_id.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "text/event-stream"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn create_episode_package(&self, params: CreateEpisodePackageParams) -> reqwest::RequestBuilder { + pub fn create_episode_package(&self, params: CreateEpisodePackageParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-packages".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn cancel_episode_package(&self, params: CancelEpisodePackageParams) -> reqwest::RequestBuilder { + pub fn cancel_episode_package(&self, params: CancelEpisodePackageParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-packages/{upload_session_id}".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::DELETE, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn complete_episode_package(&self, params: CompleteEpisodePackageParams) -> reqwest::RequestBuilder { + pub fn complete_episode_package(&self, params: CompleteEpisodePackageParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-packages/{upload_session_id}/complete".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn presign_episode_package_parts(&self, params: PresignEpisodePackagePartsParams) -> reqwest::RequestBuilder { + pub fn presign_episode_package_parts(&self, params: PresignEpisodePackagePartsParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-packages/{upload_session_id}/objects/{object_index}/parts".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let path = path.replace("{object_index}", &encode_path(¶ms.object_index.to_string())); @@ -3005,119 +3006,119 @@ impl Client { let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn create_episode_upload_session(&self, params: CreateEpisodeUploadSessionParams) -> reqwest::RequestBuilder { + pub fn create_episode_upload_session(&self, params: CreateEpisodeUploadSessionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn get_episode_upload_session(&self, params: GetEpisodeUploadSessionParams) -> reqwest::RequestBuilder { + pub fn get_episode_upload_session(&self, params: GetEpisodeUploadSessionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions/{upload_session_id}".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn update_episode_upload_session(&self, params: UpdateEpisodeUploadSessionParams) -> reqwest::RequestBuilder { + pub fn update_episode_upload_session(&self, params: UpdateEpisodeUploadSessionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions/{upload_session_id}".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::PUT, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn cancel_episode_upload_session(&self, params: CancelEpisodeUploadSessionParams) -> reqwest::RequestBuilder { + pub fn cancel_episode_upload_session(&self, params: CancelEpisodeUploadSessionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions/{upload_session_id}".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::DELETE, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn complete_episode_upload_session(&self, params: CompleteEpisodeUploadSessionParams) -> reqwest::RequestBuilder { + pub fn complete_episode_upload_session(&self, params: CompleteEpisodeUploadSessionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions/{upload_session_id}/complete".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn episode_upload_session_events(&self, params: EpisodeUploadSessionEventsParams) -> reqwest::RequestBuilder { + pub fn episode_upload_session_events(&self, params: EpisodeUploadSessionEventsParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions/{upload_session_id}/events".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "text/event-stream"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn presign_episode_upload_session_parts(&self, params: PresignEpisodeUploadSessionPartsParams) -> reqwest::RequestBuilder { + pub fn presign_episode_upload_session_parts(&self, params: PresignEpisodeUploadSessionPartsParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episode-upload-sessions/{upload_session_id}/parts/presign".to_owned(); let path = path.replace("{upload_session_id}", &encode_path(¶ms.upload_session_id.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn create_episode_deletion(&self, params: CreateEpisodeDeletionParams) -> reqwest::RequestBuilder { + pub fn create_episode_deletion(&self, params: CreateEpisodeDeletionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/episodes/{episode_id}/deletions".to_owned(); let path = path.replace("{episode_id}", &encode_path(¶ms.episode_id.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn create_image_upload_presign(&self, params: CreateImageUploadPresignParams) -> reqwest::RequestBuilder { + pub fn create_image_upload_presign(&self, params: CreateImageUploadPresignParams) -> reqwest_middleware::RequestBuilder { let path = "/s/image-uploads/presign".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn complete_image_upload(&self, params: CompleteImageUploadParams) -> reqwest::RequestBuilder { + pub fn complete_image_upload(&self, params: CompleteImageUploadParams) -> reqwest_middleware::RequestBuilder { let path = "/s/image-uploads/{image_asset_id}/complete".to_owned(); let path = path.replace("{image_asset_id}", &encode_path(¶ms.image_asset_id.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn import_rss(&self, params: ImportRSSParams) -> reqwest::RequestBuilder { + pub fn import_rss(&self, params: ImportRSSParams) -> reqwest_middleware::RequestBuilder { let path = "/s/rss-imports".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn import_rss_run_events(&self, params: ImportRSSRunEventsParams) -> reqwest::RequestBuilder { + pub fn import_rss_run_events(&self, params: ImportRSSRunEventsParams) -> reqwest_middleware::RequestBuilder { let path = "/s/rss-imports/{import_run_id}/events".to_owned(); let path = path.replace("{import_run_id}", &encode_path(¶ms.import_run_id.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "text/event-stream"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn show_deletion_events(&self, params: ShowDeletionEventsParams) -> reqwest::RequestBuilder { + pub fn show_deletion_events(&self, params: ShowDeletionEventsParams) -> reqwest_middleware::RequestBuilder { let path = "/s/show-deletions/{show_deletion_run_id}/events".to_owned(); let path = path.replace("{show_deletion_run_id}", &encode_path(¶ms.show_deletion_run_id.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "text/event-stream"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn list_shows(&self) -> reqwest::RequestBuilder { + pub fn list_shows(&self) -> reqwest_middleware::RequestBuilder { let path = "/s/shows".to_owned(); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn create_show(&self, params: CreateShowParams) -> reqwest::RequestBuilder { + pub fn create_show(&self, params: CreateShowParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn create_show_deletion(&self, params: CreateShowDeletionParams) -> reqwest::RequestBuilder { + pub fn create_show_deletion(&self, params: CreateShowDeletionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/deletions".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn get_episode_order(&self, params: GetEpisodeOrderParams) -> reqwest::RequestBuilder { + pub fn get_episode_order(&self, params: GetEpisodeOrderParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/episode-order".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn set_episode_order(&self, params: SetEpisodeOrderParams) -> reqwest::RequestBuilder { + pub fn set_episode_order(&self, params: SetEpisodeOrderParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/episode-order".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::PUT, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn list_episodes(&self, params: ListEpisodesParams) -> reqwest::RequestBuilder { + pub fn list_episodes(&self, params: ListEpisodesParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/episodes".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); @@ -3125,14 +3126,14 @@ impl Client { let request = match params.limit { Some(value) => request.query(&[("limit", value)]), None => request }; match params.cursor { Some(value) => request.query(&[("cursor", value)]), None => request } } - pub fn create_show_invitation(&self, params: CreateShowInvitationParams) -> reqwest::RequestBuilder { + pub fn create_show_invitation(&self, params: CreateShowInvitationParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/invitations".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn update_show_invitation_role(&self, params: UpdateShowInvitationRoleParams) -> reqwest::RequestBuilder { + pub fn update_show_invitation_role(&self, params: UpdateShowInvitationRoleParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/invitations/{invitation_id}".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let path = path.replace("{invitation_id}", &encode_path(¶ms.invitation_id.to_string())); @@ -3140,20 +3141,20 @@ impl Client { let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn revoke_show_invitation(&self, params: RevokeShowInvitationParams) -> reqwest::RequestBuilder { + pub fn revoke_show_invitation(&self, params: RevokeShowInvitationParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/invitations/{invitation_id}".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let path = path.replace("{invitation_id}", &encode_path(¶ms.invitation_id.to_string())); let request = self.http.request(reqwest::Method::DELETE, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn list_show_members(&self, params: ListShowMembersParams) -> reqwest::RequestBuilder { + pub fn list_show_members(&self, params: ListShowMembersParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/members".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn update_show_member_role(&self, params: UpdateShowMemberRoleParams) -> reqwest::RequestBuilder { + pub fn update_show_member_role(&self, params: UpdateShowMemberRoleParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/members/{user_id}".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let path = path.replace("{user_id}", &encode_path(¶ms.user_id.to_string())); @@ -3161,14 +3162,14 @@ impl Client { let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn remove_show_member(&self, params: RemoveShowMemberParams) -> reqwest::RequestBuilder { + pub fn remove_show_member(&self, params: RemoveShowMemberParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/members/{user_id}".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let path = path.replace("{user_id}", &encode_path(¶ms.user_id.to_string())); let request = self.http.request(reqwest::Method::DELETE, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn get_sync_inventory(&self, params: GetSyncInventoryParams) -> reqwest::RequestBuilder { + pub fn get_sync_inventory(&self, params: GetSyncInventoryParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/sync".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); @@ -3176,7 +3177,7 @@ impl Client { let request = match params.cursor { Some(value) => request.query(&[("cursor", value)]), None => request }; match params.limit { Some(value) => request.query(&[("limit", value)]), None => request } } - pub fn create_sync_episode_deletion(&self, params: CreateSyncEpisodeDeletionParams) -> reqwest::RequestBuilder { + pub fn create_sync_episode_deletion(&self, params: CreateSyncEpisodeDeletionParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/sync/episodes/{episode_id}/deletion".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let path = path.replace("{episode_id}", &encode_path(¶ms.episode_id.to_string())); @@ -3184,56 +3185,56 @@ impl Client { let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn set_you_tube_source(&self, params: SetYouTubeSourceParams) -> reqwest::RequestBuilder { + pub fn set_you_tube_source(&self, params: SetYouTubeSourceParams) -> reqwest_middleware::RequestBuilder { let path = "/s/shows/{show_slug}/youtube-source".to_owned(); let path = path.replace("{show_slug}", &encode_path(¶ms.show_slug.to_string())); let request = self.http.request(reqwest::Method::PUT, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn create_team_invitation(&self, params: CreateTeamInvitationParams) -> reqwest::RequestBuilder { + pub fn create_team_invitation(&self, params: CreateTeamInvitationParams) -> reqwest_middleware::RequestBuilder { let path = "/s/team/invitations".to_owned(); let request = self.http.request(reqwest::Method::POST, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn update_team_invitation_role(&self, params: UpdateTeamInvitationRoleParams) -> reqwest::RequestBuilder { + pub fn update_team_invitation_role(&self, params: UpdateTeamInvitationRoleParams) -> reqwest_middleware::RequestBuilder { let path = "/s/team/invitations/{invitation_id}".to_owned(); let path = path.replace("{invitation_id}", &encode_path(¶ms.invitation_id.to_string())); let request = self.http.request(reqwest::Method::PUT, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn revoke_team_invitation(&self, params: RevokeTeamInvitationParams) -> reqwest::RequestBuilder { + pub fn revoke_team_invitation(&self, params: RevokeTeamInvitationParams) -> reqwest_middleware::RequestBuilder { let path = "/s/team/invitations/{invitation_id}".to_owned(); let path = path.replace("{invitation_id}", &encode_path(¶ms.invitation_id.to_string())); let request = self.http.request(reqwest::Method::DELETE, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn list_team_members(&self) -> reqwest::RequestBuilder { + pub fn list_team_members(&self) -> reqwest_middleware::RequestBuilder { let path = "/s/team/members".to_owned(); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn update_team_member_role(&self, params: UpdateTeamMemberRoleParams) -> reqwest::RequestBuilder { + pub fn update_team_member_role(&self, params: UpdateTeamMemberRoleParams) -> reqwest_middleware::RequestBuilder { let path = "/s/team/members/{user_id}".to_owned(); let path = path.replace("{user_id}", &encode_path(¶ms.user_id.to_string())); let request = self.http.request(reqwest::Method::PUT, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); let request = match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }; request.json(¶ms.body) } - pub fn remove_team_member(&self, params: RemoveTeamMemberParams) -> reqwest::RequestBuilder { + pub fn remove_team_member(&self, params: RemoveTeamMemberParams) -> reqwest_middleware::RequestBuilder { let path = "/s/team/members/{user_id}".to_owned(); let path = path.replace("{user_id}", &encode_path(¶ms.user_id.to_string())); let request = self.http.request(reqwest::Method::DELETE, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn list_client_teams(&self) -> reqwest::RequestBuilder { + pub fn list_client_teams(&self) -> reqwest_middleware::RequestBuilder { let path = "/s/teams".to_owned(); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request } } - pub fn whoami(&self) -> reqwest::RequestBuilder { + pub fn whoami(&self) -> reqwest_middleware::RequestBuilder { let path = "/s/whoami".to_owned(); let request = self.http.request(reqwest::Method::GET, format!("{}{}", self.base_url, path)).header("Accept", "application/json"); match &self.bearer_token { Some(token) => request.bearer_auth(token), None => request }