From add4b01437b38ebaef3bedb3dac500992684b47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garci=CC=81a?= Date: Thu, 2 Oct 2025 20:08:35 +0200 Subject: [PATCH] Make bindings ?Send only for WASM --- crates/bitwarden-api-api/src/apis/access_policies_api.rs | 6 ++++-- .../src/apis/account_billing_v_next_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/accounts_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/accounts_billing_api.rs | 6 ++++-- .../src/apis/accounts_key_management_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/auth_requests_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/ciphers_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/collections_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/config_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/counts_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/devices_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/emergency_access_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/events_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/folders_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/groups_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/hibp_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/import_ciphers_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/info_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/installations_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/invoices_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/licenses_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/misc_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/notifications_api.rs | 6 ++++-- .../src/apis/organization_auth_requests_api.rs | 6 ++++-- .../bitwarden-api-api/src/apis/organization_billing_api.rs | 6 ++++-- .../src/apis/organization_billing_v_next_api.rs | 6 ++++-- .../src/apis/organization_connections_api.rs | 6 ++++-- .../bitwarden-api-api/src/apis/organization_domain_api.rs | 6 ++++-- .../bitwarden-api-api/src/apis/organization_export_api.rs | 6 ++++-- .../src/apis/organization_integration_api.rs | 6 ++++-- .../src/apis/organization_integration_configuration_api.rs | 6 ++++-- .../bitwarden-api-api/src/apis/organization_reports_api.rs | 6 ++++-- .../src/apis/organization_sponsorships_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/organization_users_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/organizations_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/phishing_domains_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/plans_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/policies_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/projects_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/provider_billing_api.rs | 6 ++++-- .../src/apis/provider_billing_v_next_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/provider_clients_api.rs | 6 ++++-- .../src/apis/provider_organizations_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/provider_users_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/providers_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/push_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/reports_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/request_sm_access_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/secrets_api.rs | 6 ++++-- .../src/apis/secrets_manager_events_api.rs | 6 ++++-- .../src/apis/secrets_manager_porting_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/security_task_api.rs | 6 ++++-- .../src/apis/self_hosted_account_billing_api.rs | 6 ++++-- .../src/apis/self_hosted_organization_licenses_api.rs | 6 ++++-- .../src/apis/self_hosted_organization_sponsorships_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/sends_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/service_accounts_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/settings_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/slack_integration_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/stripe_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/sync_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/tax_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/trash_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/two_factor_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/users_api.rs | 6 ++++-- crates/bitwarden-api-api/src/apis/web_authn_api.rs | 6 ++++-- crates/bitwarden-api-identity/src/apis/accounts_api.rs | 6 ++++-- crates/bitwarden-api-identity/src/apis/info_api.rs | 6 ++++-- crates/bitwarden-api-identity/src/apis/sso_api.rs | 6 ++++-- support/openapi-template/reqwest-trait/api.mustache | 6 ++++-- 70 files changed, 280 insertions(+), 140 deletions(-) diff --git a/crates/bitwarden-api-api/src/apis/access_policies_api.rs b/crates/bitwarden-api-api/src/apis/access_policies_api.rs index 15439c18d..bca6ed19c 100644 --- a/crates/bitwarden-api-api/src/apis/access_policies_api.rs +++ b/crates/bitwarden-api-api/src/apis/access_policies_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AccessPoliciesApi: Send + Sync { /// GET /organizations/{id}/access-policies/people/potential-grantees async fn get_people_potential_grantees<'a>( @@ -149,7 +150,8 @@ impl AccessPoliciesApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AccessPoliciesApi for AccessPoliciesApiClient { async fn get_people_potential_grantees<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/account_billing_v_next_api.rs b/crates/bitwarden-api-api/src/apis/account_billing_v_next_api.rs index 926f9e9f2..e42cf88e4 100644 --- a/crates/bitwarden-api-api/src/apis/account_billing_v_next_api.rs +++ b/crates/bitwarden-api-api/src/apis/account_billing_v_next_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AccountBillingVNextApi: Send + Sync { /// POST /account/billing/vnext/credit/bitpay async fn add_credit_via_bit_pay<'a>( @@ -281,7 +282,8 @@ impl AccountBillingVNextApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AccountBillingVNextApi for AccountBillingVNextApiClient { async fn add_credit_via_bit_pay<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/accounts_api.rs b/crates/bitwarden-api-api/src/apis/accounts_api.rs index 61f967100..54d9ba8d8 100644 --- a/crates/bitwarden-api-api/src/apis/accounts_api.rs +++ b/crates/bitwarden-api-api/src/apis/accounts_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AccountsApi: Send + Sync { /// POST /accounts/api-key async fn api_key<'a>( @@ -258,7 +259,8 @@ impl AccountsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AccountsApi for AccountsApiClient { async fn api_key<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/accounts_billing_api.rs b/crates/bitwarden-api-api/src/apis/accounts_billing_api.rs index 3d2f1e499..086b9cb93 100644 --- a/crates/bitwarden-api-api/src/apis/accounts_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/accounts_billing_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AccountsBillingApi: Send + Sync { /// GET /accounts/billing/history async fn get_billing_history( @@ -67,7 +68,8 @@ impl AccountsBillingApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AccountsBillingApi for AccountsBillingApiClient { async fn get_billing_history( &self, diff --git a/crates/bitwarden-api-api/src/apis/accounts_key_management_api.rs b/crates/bitwarden-api-api/src/apis/accounts_key_management_api.rs index 403ddeba2..3282c352b 100644 --- a/crates/bitwarden-api-api/src/apis/accounts_key_management_api.rs +++ b/crates/bitwarden-api-api/src/apis/accounts_key_management_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AccountsKeyManagementApi: Send + Sync { /// POST /accounts/convert-to-key-connector async fn post_convert_to_key_connector( @@ -61,7 +62,8 @@ impl AccountsKeyManagementApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AccountsKeyManagementApi for AccountsKeyManagementApiClient { async fn post_convert_to_key_connector( &self, diff --git a/crates/bitwarden-api-api/src/apis/auth_requests_api.rs b/crates/bitwarden-api-api/src/apis/auth_requests_api.rs index 6e3153c2c..44ca257da 100644 --- a/crates/bitwarden-api-api/src/apis/auth_requests_api.rs +++ b/crates/bitwarden-api-api/src/apis/auth_requests_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AuthRequestsApi: Send + Sync { /// GET /auth-requests/{id} async fn get<'a>( @@ -81,7 +82,8 @@ impl AuthRequestsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AuthRequestsApi for AuthRequestsApiClient { async fn get<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/ciphers_api.rs b/crates/bitwarden-api-api/src/apis/ciphers_api.rs index d580f8fd5..469f242bd 100644 --- a/crates/bitwarden-api-api/src/apis/ciphers_api.rs +++ b/crates/bitwarden-api-api/src/apis/ciphers_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait CiphersApi: Send + Sync { /// POST /ciphers/attachment/validate/azure async fn azure_validate_file(&self) -> Result<(), Error>; @@ -319,7 +320,8 @@ impl CiphersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl CiphersApi for CiphersApiClient { async fn azure_validate_file(&self) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/collections_api.rs b/crates/bitwarden-api-api/src/apis/collections_api.rs index 9479125f7..ae0978bee 100644 --- a/crates/bitwarden-api-api/src/apis/collections_api.rs +++ b/crates/bitwarden-api-api/src/apis/collections_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait CollectionsApi: Send + Sync { /// DELETE /organizations/{orgId}/collections/{id} async fn delete<'a>( @@ -113,7 +114,8 @@ impl CollectionsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl CollectionsApi for CollectionsApiClient { async fn delete<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/config_api.rs b/crates/bitwarden-api-api/src/apis/config_api.rs index b51c00d5b..d56e019d0 100644 --- a/crates/bitwarden-api-api/src/apis/config_api.rs +++ b/crates/bitwarden-api-api/src/apis/config_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ConfigApi: Send + Sync { /// GET /config async fn get_configs(&self) -> Result>; @@ -39,7 +40,8 @@ impl ConfigApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ConfigApi for ConfigApiClient { async fn get_configs(&self) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/counts_api.rs b/crates/bitwarden-api-api/src/apis/counts_api.rs index 71abc7418..73a2f5ee0 100644 --- a/crates/bitwarden-api-api/src/apis/counts_api.rs +++ b/crates/bitwarden-api-api/src/apis/counts_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait CountsApi: Send + Sync { /// GET /organizations/{organizationId}/sm-counts async fn get_by_organization<'a>( @@ -54,7 +55,8 @@ impl CountsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl CountsApi for CountsApiClient { async fn get_by_organization<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/devices_api.rs b/crates/bitwarden-api-api/src/apis/devices_api.rs index d6b2aa71c..0e06fb902 100644 --- a/crates/bitwarden-api-api/src/apis/devices_api.rs +++ b/crates/bitwarden-api-api/src/apis/devices_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait DevicesApi: Send + Sync { /// DELETE /devices/{id} async fn deactivate<'a>(&self, id: &'a str) -> Result<(), Error>; @@ -115,7 +116,8 @@ impl DevicesApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl DevicesApi for DevicesApiClient { async fn deactivate<'a>(&self, id: &'a str) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/emergency_access_api.rs b/crates/bitwarden-api-api/src/apis/emergency_access_api.rs index 6089f75d4..4627b9ebe 100644 --- a/crates/bitwarden-api-api/src/apis/emergency_access_api.rs +++ b/crates/bitwarden-api-api/src/apis/emergency_access_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait EmergencyAccessApi: Send + Sync { /// POST /emergency-access/{id}/accept async fn accept<'a>( @@ -137,7 +138,8 @@ impl EmergencyAccessApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl EmergencyAccessApi for EmergencyAccessApiClient { async fn accept<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/events_api.rs b/crates/bitwarden-api-api/src/apis/events_api.rs index df75678ca..ee1b252ec 100644 --- a/crates/bitwarden-api-api/src/apis/events_api.rs +++ b/crates/bitwarden-api-api/src/apis/events_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait EventsApi: Send + Sync { /// GET /ciphers/{id}/events async fn get_cipher<'a>( @@ -111,7 +112,8 @@ impl EventsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl EventsApi for EventsApiClient { async fn get_cipher<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/folders_api.rs b/crates/bitwarden-api-api/src/apis/folders_api.rs index df24f0a98..07b8184ca 100644 --- a/crates/bitwarden-api-api/src/apis/folders_api.rs +++ b/crates/bitwarden-api-api/src/apis/folders_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait FoldersApi: Send + Sync { /// DELETE /folders/{id} async fn delete<'a>(&self, id: &'a str) -> Result<(), Error>; @@ -63,7 +64,8 @@ impl FoldersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl FoldersApi for FoldersApiClient { async fn delete<'a>(&self, id: &'a str) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/groups_api.rs b/crates/bitwarden-api-api/src/apis/groups_api.rs index d9295b7e9..734bdfaf6 100644 --- a/crates/bitwarden-api-api/src/apis/groups_api.rs +++ b/crates/bitwarden-api-api/src/apis/groups_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait GroupsApi: Send + Sync { /// DELETE /organizations/{orgId}/groups async fn bulk_delete<'a>( @@ -105,7 +106,8 @@ impl GroupsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl GroupsApi for GroupsApiClient { async fn bulk_delete<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/hibp_api.rs b/crates/bitwarden-api-api/src/apis/hibp_api.rs index 1973938f7..7a3f418a0 100644 --- a/crates/bitwarden-api-api/src/apis/hibp_api.rs +++ b/crates/bitwarden-api-api/src/apis/hibp_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait HibpApi: Send + Sync { /// GET /hibp/breach async fn get<'a>(&self, username: Option<&'a str>) -> Result<(), Error>; @@ -39,7 +40,8 @@ impl HibpApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl HibpApi for HibpApiClient { async fn get<'a>(&self, username: Option<&'a str>) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/import_ciphers_api.rs b/crates/bitwarden-api-api/src/apis/import_ciphers_api.rs index 4381f5a12..ff1a64c8b 100644 --- a/crates/bitwarden-api-api/src/apis/import_ciphers_api.rs +++ b/crates/bitwarden-api-api/src/apis/import_ciphers_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ImportCiphersApi: Send + Sync { /// POST /ciphers/import async fn post_import<'a>( @@ -51,7 +52,8 @@ impl ImportCiphersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ImportCiphersApi for ImportCiphersApiClient { async fn post_import<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/info_api.rs b/crates/bitwarden-api-api/src/apis/info_api.rs index 60335d1b3..f8857adee 100644 --- a/crates/bitwarden-api-api/src/apis/info_api.rs +++ b/crates/bitwarden-api-api/src/apis/info_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait InfoApi: Send + Sync { /// GET /alive async fn get_alive(&self) -> Result>; @@ -42,7 +43,8 @@ impl InfoApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl InfoApi for InfoApiClient { async fn get_alive(&self) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/installations_api.rs b/crates/bitwarden-api-api/src/apis/installations_api.rs index 31416893a..4dd05f442 100644 --- a/crates/bitwarden-api-api/src/apis/installations_api.rs +++ b/crates/bitwarden-api-api/src/apis/installations_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait InstallationsApi: Send + Sync { /// GET /installations/{id} async fn get<'a>( @@ -48,7 +49,8 @@ impl InstallationsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl InstallationsApi for InstallationsApiClient { async fn get<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/invoices_api.rs b/crates/bitwarden-api-api/src/apis/invoices_api.rs index 2fee3f0e6..e8105458a 100644 --- a/crates/bitwarden-api-api/src/apis/invoices_api.rs +++ b/crates/bitwarden-api-api/src/apis/invoices_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait InvoicesApi: Send + Sync { /// POST /invoices/preview-organization async fn preview_invoice<'a>( @@ -44,7 +45,8 @@ impl InvoicesApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl InvoicesApi for InvoicesApiClient { async fn preview_invoice<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/licenses_api.rs b/crates/bitwarden-api-api/src/apis/licenses_api.rs index ec4ab2cb1..69af371c2 100644 --- a/crates/bitwarden-api-api/src/apis/licenses_api.rs +++ b/crates/bitwarden-api-api/src/apis/licenses_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait LicensesApi: Send + Sync { /// GET /licenses/user/{id} async fn get_user<'a>( @@ -52,7 +53,8 @@ impl LicensesApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl LicensesApi for LicensesApiClient { async fn get_user<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/misc_api.rs b/crates/bitwarden-api-api/src/apis/misc_api.rs index d8d3c659d..84dd4da86 100644 --- a/crates/bitwarden-api-api/src/apis/misc_api.rs +++ b/crates/bitwarden-api-api/src/apis/misc_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait MiscApi: Send + Sync { /// POST /bitpay-invoice async fn post_bit_pay_invoice<'a>( @@ -45,7 +46,8 @@ impl MiscApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl MiscApi for MiscApiClient { async fn post_bit_pay_invoice<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/notifications_api.rs b/crates/bitwarden-api-api/src/apis/notifications_api.rs index 45f80e08a..bcff45106 100644 --- a/crates/bitwarden-api-api/src/apis/notifications_api.rs +++ b/crates/bitwarden-api-api/src/apis/notifications_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait NotificationsApi: Send + Sync { /// GET /notifications async fn list<'a>( @@ -51,7 +52,8 @@ impl NotificationsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl NotificationsApi for NotificationsApiClient { async fn list<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_auth_requests_api.rs b/crates/bitwarden-api-api/src/apis/organization_auth_requests_api.rs index 0eb90450c..93776aa62 100644 --- a/crates/bitwarden-api-api/src/apis/organization_auth_requests_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_auth_requests_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationAuthRequestsApi: Send + Sync { /// POST /organizations/{orgId}/auth-requests/deny async fn bulk_deny_requests<'a>( @@ -71,7 +72,8 @@ impl OrganizationAuthRequestsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationAuthRequestsApi for OrganizationAuthRequestsApiClient { async fn bulk_deny_requests<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_billing_api.rs b/crates/bitwarden-api-api/src/apis/organization_billing_api.rs index 22211727e..30586b64c 100644 --- a/crates/bitwarden-api-api/src/apis/organization_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_billing_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationBillingApi: Send + Sync { /// POST /organizations/{organizationId}/billing/change-frequency async fn change_plan_subscription_frequency<'a>( @@ -123,7 +124,8 @@ impl OrganizationBillingApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationBillingApi for OrganizationBillingApiClient { async fn change_plan_subscription_frequency<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_billing_v_next_api.rs b/crates/bitwarden-api-api/src/apis/organization_billing_v_next_api.rs index c7ecbbbc0..413a6552f 100644 --- a/crates/bitwarden-api-api/src/apis/organization_billing_v_next_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_billing_v_next_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationBillingVNextApi: Send + Sync { /// POST /organizations/{organizationId}/billing/vnext/credit/bitpay async fn add_credit_via_bit_pay<'a>( @@ -494,7 +495,8 @@ impl OrganizationBillingVNextApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationBillingVNextApi for OrganizationBillingVNextApiClient { async fn add_credit_via_bit_pay<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_connections_api.rs b/crates/bitwarden-api-api/src/apis/organization_connections_api.rs index ee5283b06..ccd81e995 100644 --- a/crates/bitwarden-api-api/src/apis/organization_connections_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_connections_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationConnectionsApi: Send + Sync { /// GET /organizations/connections/enabled async fn connections_enabled(&self) -> Result>; @@ -65,7 +66,8 @@ impl OrganizationConnectionsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationConnectionsApi for OrganizationConnectionsApiClient { async fn connections_enabled(&self) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/organization_domain_api.rs b/crates/bitwarden-api-api/src/apis/organization_domain_api.rs index bb084395b..9923cab7c 100644 --- a/crates/bitwarden-api-api/src/apis/organization_domain_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_domain_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationDomainApi: Send + Sync { /// GET /organizations/{orgId}/domain/{id} async fn get<'a>( @@ -89,7 +90,8 @@ impl OrganizationDomainApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationDomainApi for OrganizationDomainApiClient { async fn get<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_export_api.rs b/crates/bitwarden-api-api/src/apis/organization_export_api.rs index 92899be1f..febce3a10 100644 --- a/crates/bitwarden-api-api/src/apis/organization_export_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_export_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationExportApi: Send + Sync { /// GET /organizations/{organizationId}/export async fn export<'a>(&self, organization_id: uuid::Uuid) -> Result<(), Error>; @@ -39,7 +40,8 @@ impl OrganizationExportApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationExportApi for OrganizationExportApiClient { async fn export<'a>(&self, organization_id: uuid::Uuid) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/organization_integration_api.rs b/crates/bitwarden-api-api/src/apis/organization_integration_api.rs index 1e25802a6..cb017caae 100644 --- a/crates/bitwarden-api-api/src/apis/organization_integration_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_integration_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationIntegrationApi: Send + Sync { /// POST /organizations/{organizationId}/integrations async fn create<'a>( @@ -64,7 +65,8 @@ impl OrganizationIntegrationApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationIntegrationApi for OrganizationIntegrationApiClient { async fn create<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_integration_configuration_api.rs b/crates/bitwarden-api-api/src/apis/organization_integration_configuration_api.rs index ea6a5c26c..02e9030f7 100644 --- a/crates/bitwarden-api-api/src/apis/organization_integration_configuration_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_integration_configuration_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationIntegrationConfigurationApi: Send + Sync { /// POST /organizations/{organizationId}/integrations/{integrationId}/configurations async fn create<'a>( @@ -74,7 +75,8 @@ impl OrganizationIntegrationConfigurationApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationIntegrationConfigurationApi for OrganizationIntegrationConfigurationApiClient { async fn create<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_reports_api.rs b/crates/bitwarden-api-api/src/apis/organization_reports_api.rs index 886558698..f60a53dcf 100644 --- a/crates/bitwarden-api-api/src/apis/organization_reports_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_reports_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationReportsApi: Send + Sync { /// POST /reports/organizations/{organizationId} async fn create_organization_report<'a>( @@ -123,7 +124,8 @@ impl OrganizationReportsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationReportsApi for OrganizationReportsApiClient { async fn create_organization_report<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_sponsorships_api.rs b/crates/bitwarden-api-api/src/apis/organization_sponsorships_api.rs index b0b8dabb3..cd1f1dd02 100644 --- a/crates/bitwarden-api-api/src/apis/organization_sponsorships_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_sponsorships_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationSponsorshipsApi: Send + Sync { /// DELETE /organization/sponsorship/{sponsoringOrgId}/{sponsoredFriendlyName}/revoke async fn admin_initiated_revoke_sponsorship<'a>( @@ -109,7 +110,8 @@ impl OrganizationSponsorshipsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationSponsorshipsApi for OrganizationSponsorshipsApiClient { async fn admin_initiated_revoke_sponsorship<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organization_users_api.rs b/crates/bitwarden-api-api/src/apis/organization_users_api.rs index 877bdcea6..db0685780 100644 --- a/crates/bitwarden-api-api/src/apis/organization_users_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_users_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationUsersApi: Send + Sync { /// POST /organizations/{orgId}/users/{organizationUserId}/accept async fn accept<'a>( @@ -243,7 +244,8 @@ impl OrganizationUsersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationUsersApi for OrganizationUsersApiClient { async fn accept<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/organizations_api.rs b/crates/bitwarden-api-api/src/apis/organizations_api.rs index ba2c5b80a..0ed2e165a 100644 --- a/crates/bitwarden-api-api/src/apis/organizations_api.rs +++ b/crates/bitwarden-api-api/src/apis/organizations_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait OrganizationsApi: Send + Sync { /// POST /organizations/{id}/api-key async fn api_key<'a>( @@ -246,7 +247,8 @@ impl OrganizationsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl OrganizationsApi for OrganizationsApiClient { async fn api_key<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/phishing_domains_api.rs b/crates/bitwarden-api-api/src/apis/phishing_domains_api.rs index 9d1b89bf0..ca14870d3 100644 --- a/crates/bitwarden-api-api/src/apis/phishing_domains_api.rs +++ b/crates/bitwarden-api-api/src/apis/phishing_domains_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait PhishingDomainsApi: Send + Sync { /// GET /phishing-domains/checksum async fn get_checksum(&self) -> Result>; @@ -42,7 +43,8 @@ impl PhishingDomainsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl PhishingDomainsApi for PhishingDomainsApiClient { async fn get_checksum(&self) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/plans_api.rs b/crates/bitwarden-api-api/src/apis/plans_api.rs index e3290c499..68f718a79 100644 --- a/crates/bitwarden-api-api/src/apis/plans_api.rs +++ b/crates/bitwarden-api-api/src/apis/plans_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait PlansApi: Send + Sync { /// GET /plans async fn get(&self) -> Result>; @@ -39,7 +40,8 @@ impl PlansApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl PlansApi for PlansApiClient { async fn get(&self) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/policies_api.rs b/crates/bitwarden-api-api/src/apis/policies_api.rs index 60b623b76..2ab804723 100644 --- a/crates/bitwarden-api-api/src/apis/policies_api.rs +++ b/crates/bitwarden-api-api/src/apis/policies_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait PoliciesApi: Send + Sync { /// GET /organizations/{orgId}/policies/{type} async fn get<'a>( @@ -80,7 +81,8 @@ impl PoliciesApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl PoliciesApi for PoliciesApiClient { async fn get<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/projects_api.rs b/crates/bitwarden-api-api/src/apis/projects_api.rs index 3ecdf080c..e708adcdf 100644 --- a/crates/bitwarden-api-api/src/apis/projects_api.rs +++ b/crates/bitwarden-api-api/src/apis/projects_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProjectsApi: Send + Sync { /// POST /projects/delete async fn bulk_delete<'a>( @@ -68,7 +69,8 @@ impl ProjectsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProjectsApi for ProjectsApiClient { async fn bulk_delete<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/provider_billing_api.rs b/crates/bitwarden-api-api/src/apis/provider_billing_api.rs index d75501d35..0ecb41804 100644 --- a/crates/bitwarden-api-api/src/apis/provider_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_billing_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProviderBillingApi: Send + Sync { /// GET /providers/{providerId}/billing/invoices/{invoiceId} async fn generate_client_invoice_report<'a>( @@ -82,7 +83,8 @@ impl ProviderBillingApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProviderBillingApi for ProviderBillingApiClient { async fn generate_client_invoice_report<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/provider_billing_v_next_api.rs b/crates/bitwarden-api-api/src/apis/provider_billing_v_next_api.rs index adaf25883..d01618097 100644 --- a/crates/bitwarden-api-api/src/apis/provider_billing_v_next_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_billing_v_next_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProviderBillingVNextApi: Send + Sync { /// POST /providers/{providerId}/billing/vnext/credit/bitpay async fn add_credit_via_bit_pay<'a>( @@ -221,7 +222,8 @@ impl ProviderBillingVNextApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProviderBillingVNextApi for ProviderBillingVNextApiClient { async fn add_credit_via_bit_pay<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/provider_clients_api.rs b/crates/bitwarden-api-api/src/apis/provider_clients_api.rs index d30447942..51848d5f1 100644 --- a/crates/bitwarden-api-api/src/apis/provider_clients_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_clients_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProviderClientsApi: Send + Sync { /// POST /providers/{providerId}/clients/existing async fn add_existing_organization<'a>( @@ -68,7 +69,8 @@ impl ProviderClientsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProviderClientsApi for ProviderClientsApiClient { async fn add_existing_organization<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/provider_organizations_api.rs b/crates/bitwarden-api-api/src/apis/provider_organizations_api.rs index 93a686801..3ab6952fa 100644 --- a/crates/bitwarden-api-api/src/apis/provider_organizations_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_organizations_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProviderOrganizationsApi: Send + Sync { /// POST /providers/{providerId}/organizations/add async fn add<'a>( @@ -70,7 +71,8 @@ impl ProviderOrganizationsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProviderOrganizationsApi for ProviderOrganizationsApiClient { async fn add<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/provider_users_api.rs b/crates/bitwarden-api-api/src/apis/provider_users_api.rs index 10084ecf0..f1fa83ff7 100644 --- a/crates/bitwarden-api-api/src/apis/provider_users_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_users_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProviderUsersApi: Send + Sync { /// POST /providers/{providerId}/users/{id}/accept async fn accept<'a>( @@ -127,7 +128,8 @@ impl ProviderUsersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProviderUsersApi for ProviderUsersApiClient { async fn accept<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/providers_api.rs b/crates/bitwarden-api-api/src/apis/providers_api.rs index d80ce8653..0a5a84fdf 100644 --- a/crates/bitwarden-api-api/src/apis/providers_api.rs +++ b/crates/bitwarden-api-api/src/apis/providers_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ProvidersApi: Send + Sync { /// DELETE /providers/{id} async fn delete<'a>(&self, id: uuid::Uuid) -> Result<(), Error>; @@ -68,7 +69,8 @@ impl ProvidersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ProvidersApi for ProvidersApiClient { async fn delete<'a>(&self, id: uuid::Uuid) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/push_api.rs b/crates/bitwarden-api-api/src/apis/push_api.rs index 64307615e..b5f832d9d 100644 --- a/crates/bitwarden-api-api/src/apis/push_api.rs +++ b/crates/bitwarden-api-api/src/apis/push_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait PushApi: Send + Sync { /// PUT /push/add-organization async fn add_organization<'a>( @@ -66,7 +67,8 @@ impl PushApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl PushApi for PushApiClient { async fn add_organization<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/reports_api.rs b/crates/bitwarden-api-api/src/apis/reports_api.rs index 4ff9e54ef..45e3ca6dd 100644 --- a/crates/bitwarden-api-api/src/apis/reports_api.rs +++ b/crates/bitwarden-api-api/src/apis/reports_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ReportsApi: Send + Sync { /// POST /reports/password-health-report-application async fn add_password_health_report_application<'a>( @@ -87,7 +88,8 @@ impl ReportsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ReportsApi for ReportsApiClient { async fn add_password_health_report_application<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/request_sm_access_api.rs b/crates/bitwarden-api-api/src/apis/request_sm_access_api.rs index d558eef8a..f19a8038a 100644 --- a/crates/bitwarden-api-api/src/apis/request_sm_access_api.rs +++ b/crates/bitwarden-api-api/src/apis/request_sm_access_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait RequestSmAccessApi: Send + Sync { /// POST /request-access/request-sm-access async fn request_sm_access_from_admins<'a>( @@ -42,7 +43,8 @@ impl RequestSmAccessApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl RequestSmAccessApi for RequestSmAccessApiClient { async fn request_sm_access_from_admins<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/secrets_api.rs b/crates/bitwarden-api-api/src/apis/secrets_api.rs index 55410d708..59379dd80 100644 --- a/crates/bitwarden-api-api/src/apis/secrets_api.rs +++ b/crates/bitwarden-api-api/src/apis/secrets_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SecretsApi: Send + Sync { /// POST /secrets/delete async fn bulk_delete<'a>( @@ -85,7 +86,8 @@ impl SecretsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SecretsApi for SecretsApiClient { async fn bulk_delete<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/secrets_manager_events_api.rs b/crates/bitwarden-api-api/src/apis/secrets_manager_events_api.rs index f92ae3001..13607fe1d 100644 --- a/crates/bitwarden-api-api/src/apis/secrets_manager_events_api.rs +++ b/crates/bitwarden-api-api/src/apis/secrets_manager_events_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SecretsManagerEventsApi: Send + Sync { /// GET /sm/events/service-accounts/{serviceAccountId} async fn get_service_account_events<'a>( @@ -45,7 +46,8 @@ impl SecretsManagerEventsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SecretsManagerEventsApi for SecretsManagerEventsApiClient { async fn get_service_account_events<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/secrets_manager_porting_api.rs b/crates/bitwarden-api-api/src/apis/secrets_manager_porting_api.rs index bdb368d63..8e34654f5 100644 --- a/crates/bitwarden-api-api/src/apis/secrets_manager_porting_api.rs +++ b/crates/bitwarden-api-api/src/apis/secrets_manager_porting_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SecretsManagerPortingApi: Send + Sync { /// GET /sm/{organizationId}/export async fn export<'a>( @@ -49,7 +50,8 @@ impl SecretsManagerPortingApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SecretsManagerPortingApi for SecretsManagerPortingApiClient { async fn export<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/security_task_api.rs b/crates/bitwarden-api-api/src/apis/security_task_api.rs index 7cbc81834..aa08273c3 100644 --- a/crates/bitwarden-api-api/src/apis/security_task_api.rs +++ b/crates/bitwarden-api-api/src/apis/security_task_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SecurityTaskApi: Send + Sync { /// POST /tasks/{orgId}/bulk-create async fn bulk_create_tasks<'a>( @@ -67,7 +68,8 @@ impl SecurityTaskApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SecurityTaskApi for SecurityTaskApiClient { async fn bulk_create_tasks<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/self_hosted_account_billing_api.rs b/crates/bitwarden-api-api/src/apis/self_hosted_account_billing_api.rs index 084c736cb..f1710c9e6 100644 --- a/crates/bitwarden-api-api/src/apis/self_hosted_account_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/self_hosted_account_billing_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SelfHostedAccountBillingApi: Send + Sync { /// POST /account/billing/vnext/self-host/license async fn upload_license<'a>( @@ -85,7 +86,8 @@ impl SelfHostedAccountBillingApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SelfHostedAccountBillingApi for SelfHostedAccountBillingApiClient { async fn upload_license<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/self_hosted_organization_licenses_api.rs b/crates/bitwarden-api-api/src/apis/self_hosted_organization_licenses_api.rs index 21a209ce3..794760f29 100644 --- a/crates/bitwarden-api-api/src/apis/self_hosted_organization_licenses_api.rs +++ b/crates/bitwarden-api-api/src/apis/self_hosted_organization_licenses_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SelfHostedOrganizationLicensesApi: Send + Sync { /// POST /organizations/licenses/self-hosted async fn create_license<'a>( @@ -56,7 +57,8 @@ impl SelfHostedOrganizationLicensesApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SelfHostedOrganizationLicensesApi for SelfHostedOrganizationLicensesApiClient { async fn create_license<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/self_hosted_organization_sponsorships_api.rs b/crates/bitwarden-api-api/src/apis/self_hosted_organization_sponsorships_api.rs index c101c51f1..20179fac3 100644 --- a/crates/bitwarden-api-api/src/apis/self_hosted_organization_sponsorships_api.rs +++ b/crates/bitwarden-api-api/src/apis/self_hosted_organization_sponsorships_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SelfHostedOrganizationSponsorshipsApi: Send + Sync { /// DELETE /organization/sponsorship/self-hosted/{sponsoringOrgId}/{sponsoredFriendlyName}/ /// revoke @@ -68,7 +69,8 @@ impl SelfHostedOrganizationSponsorshipsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SelfHostedOrganizationSponsorshipsApi for SelfHostedOrganizationSponsorshipsApiClient { async fn admin_initiated_revoke_sponsorship<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/sends_api.rs b/crates/bitwarden-api-api/src/apis/sends_api.rs index 68ae84d04..b4ae7b459 100644 --- a/crates/bitwarden-api-api/src/apis/sends_api.rs +++ b/crates/bitwarden-api-api/src/apis/sends_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SendsApi: Send + Sync { /// POST /sends/access/{id} async fn access<'a>( @@ -104,7 +105,8 @@ impl SendsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SendsApi for SendsApiClient { async fn access<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/service_accounts_api.rs b/crates/bitwarden-api-api/src/apis/service_accounts_api.rs index c91d9899b..62a5ada61 100644 --- a/crates/bitwarden-api-api/src/apis/service_accounts_api.rs +++ b/crates/bitwarden-api-api/src/apis/service_accounts_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait ServiceAccountsApi: Send + Sync { /// POST /service-accounts/delete async fn bulk_delete<'a>( @@ -92,7 +93,8 @@ impl ServiceAccountsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl ServiceAccountsApi for ServiceAccountsApiClient { async fn bulk_delete<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/settings_api.rs b/crates/bitwarden-api-api/src/apis/settings_api.rs index b3860fb8f..c2c5f62dd 100644 --- a/crates/bitwarden-api-api/src/apis/settings_api.rs +++ b/crates/bitwarden-api-api/src/apis/settings_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SettingsApi: Send + Sync { /// GET /settings/domains async fn get_domains<'a>( @@ -48,7 +49,8 @@ impl SettingsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SettingsApi for SettingsApiClient { async fn get_domains<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/slack_integration_api.rs b/crates/bitwarden-api-api/src/apis/slack_integration_api.rs index 68941bea1..9f69b39e2 100644 --- a/crates/bitwarden-api-api/src/apis/slack_integration_api.rs +++ b/crates/bitwarden-api-api/src/apis/slack_integration_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SlackIntegrationApi: Send + Sync { /// GET /organizations/{organizationId}/integrations/slack/create async fn create<'a>( @@ -46,7 +47,8 @@ impl SlackIntegrationApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SlackIntegrationApi for SlackIntegrationApiClient { async fn create<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/stripe_api.rs b/crates/bitwarden-api-api/src/apis/stripe_api.rs index 73f30dc7a..a27ddd4a0 100644 --- a/crates/bitwarden-api-api/src/apis/stripe_api.rs +++ b/crates/bitwarden-api-api/src/apis/stripe_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait StripeApi: Send + Sync { /// POST /setup-intent/bank-account async fn create_setup_intent_for_bank_account( @@ -52,7 +53,8 @@ impl StripeApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl StripeApi for StripeApiClient { async fn create_setup_intent_for_bank_account( &self, diff --git a/crates/bitwarden-api-api/src/apis/sync_api.rs b/crates/bitwarden-api-api/src/apis/sync_api.rs index c50210bc0..1f2a73304 100644 --- a/crates/bitwarden-api-api/src/apis/sync_api.rs +++ b/crates/bitwarden-api-api/src/apis/sync_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SyncApi: Send + Sync { /// GET /sync async fn get<'a>( @@ -42,7 +43,8 @@ impl SyncApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SyncApi for SyncApiClient { async fn get<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/tax_api.rs b/crates/bitwarden-api-api/src/apis/tax_api.rs index aef66e425..74d1cac7b 100644 --- a/crates/bitwarden-api-api/src/apis/tax_api.rs +++ b/crates/bitwarden-api-api/src/apis/tax_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait TaxApi: Send + Sync { /// POST /tax/preview-amount/organization-trial async fn preview_tax_amount_for_organization_trial<'a>( @@ -44,7 +45,8 @@ impl TaxApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl TaxApi for TaxApiClient { async fn preview_tax_amount_for_organization_trial<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/trash_api.rs b/crates/bitwarden-api-api/src/apis/trash_api.rs index b9c476ae5..c463d28f6 100644 --- a/crates/bitwarden-api-api/src/apis/trash_api.rs +++ b/crates/bitwarden-api-api/src/apis/trash_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait TrashApi: Send + Sync { /// POST /secrets/{organizationId}/trash/empty async fn empty_trash<'a>( @@ -56,7 +57,8 @@ impl TrashApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl TrashApi for TrashApiClient { async fn empty_trash<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/two_factor_api.rs b/crates/bitwarden-api-api/src/apis/two_factor_api.rs index f532cb0ed..3cd30d5fb 100644 --- a/crates/bitwarden-api-api/src/apis/two_factor_api.rs +++ b/crates/bitwarden-api-api/src/apis/two_factor_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait TwoFactorApi: Send + Sync { /// DELETE /two-factor/webauthn async fn delete_web_authn<'a>( @@ -172,7 +173,8 @@ impl TwoFactorApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl TwoFactorApi for TwoFactorApiClient { async fn delete_web_authn<'a>( &self, diff --git a/crates/bitwarden-api-api/src/apis/users_api.rs b/crates/bitwarden-api-api/src/apis/users_api.rs index aa66a7d5b..652f6d6e0 100644 --- a/crates/bitwarden-api-api/src/apis/users_api.rs +++ b/crates/bitwarden-api-api/src/apis/users_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait UsersApi: Send + Sync { /// GET /users/{id}/public-key async fn get<'a>(&self, id: &'a str) -> Result>; @@ -39,7 +40,8 @@ impl UsersApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl UsersApi for UsersApiClient { async fn get<'a>(&self, id: &'a str) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-api/src/apis/web_authn_api.rs b/crates/bitwarden-api-api/src/apis/web_authn_api.rs index 1c3d958b9..fe5725b69 100644 --- a/crates/bitwarden-api-api/src/apis/web_authn_api.rs +++ b/crates/bitwarden-api-api/src/apis/web_authn_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait WebAuthnApi: Send + Sync { /// POST /webauthn/assertion-options async fn assertion_options<'a>( @@ -76,7 +77,8 @@ impl WebAuthnApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl WebAuthnApi for WebAuthnApiClient { async fn assertion_options<'a>( &self, diff --git a/crates/bitwarden-api-identity/src/apis/accounts_api.rs b/crates/bitwarden-api-identity/src/apis/accounts_api.rs index 2574cbb9f..031620804 100644 --- a/crates/bitwarden-api-identity/src/apis/accounts_api.rs +++ b/crates/bitwarden-api-identity/src/apis/accounts_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait AccountsApi: Send + Sync { /// GET /accounts/webauthn/assertion-options async fn get_web_authn_login_assertion_options( @@ -80,7 +81,8 @@ impl AccountsApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl AccountsApi for AccountsApiClient { async fn get_web_authn_login_assertion_options( &self, diff --git a/crates/bitwarden-api-identity/src/apis/info_api.rs b/crates/bitwarden-api-identity/src/apis/info_api.rs index c11229fe9..0349ca5a5 100644 --- a/crates/bitwarden-api-identity/src/apis/info_api.rs +++ b/crates/bitwarden-api-identity/src/apis/info_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait InfoApi: Send + Sync { /// GET /alive async fn get_alive(&self) -> Result>; @@ -42,7 +43,8 @@ impl InfoApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl InfoApi for InfoApiClient { async fn get_alive(&self) -> Result> { let local_var_configuration = &self.configuration; diff --git a/crates/bitwarden-api-identity/src/apis/sso_api.rs b/crates/bitwarden-api-identity/src/apis/sso_api.rs index 70d1c4088..0f8e13268 100644 --- a/crates/bitwarden-api-identity/src/apis/sso_api.rs +++ b/crates/bitwarden-api-identity/src/apis/sso_api.rs @@ -23,7 +23,8 @@ use crate::{ }; #[cfg_attr(feature = "mockall", automock)] -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait SsoApi: Send + Sync { /// GET /sso/ExternalCallback async fn external_callback(&self) -> Result<(), Error>; @@ -57,7 +58,8 @@ impl SsoApiClient { } } -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl SsoApi for SsoApiClient { async fn external_callback(&self) -> Result<(), Error> { let local_var_configuration = &self.configuration; diff --git a/support/openapi-template/reqwest-trait/api.mustache b/support/openapi-template/reqwest-trait/api.mustache index 23f40c038..255512bd7 100644 --- a/support/openapi-template/reqwest-trait/api.mustache +++ b/support/openapi-template/reqwest-trait/api.mustache @@ -15,7 +15,8 @@ use crate::apis::ContentType; {{#mockall}} #[cfg_attr(feature = "mockall", automock)] {{/mockall}} -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] pub trait {{{classname}}}: Send + Sync { {{#operations}} {{#operation}} @@ -118,7 +119,8 @@ pub struct {{{vendorExtensions.x-action-name}}}Params { {{/operation}} {{/operations}} -#[async_trait(?Send)] +#[cfg_attr(target_arch = "wasm32", async_trait(?Send))] +#[cfg_attr(not(target_arch = "wasm32"), async_trait)] impl {{classname}} for {{classname}}Client { {{#operations}} {{#operation}}