diff --git a/Cargo.lock b/Cargo.lock index 5c6ab68c2..0aed338f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -406,9 +406,9 @@ version = "0.5.0" dependencies = [ "reqwest", "serde", - "serde_derive", "serde_json", "serde_repr", + "serde_with", "url", "uuid", ] @@ -419,9 +419,9 @@ version = "0.5.0" dependencies = [ "reqwest", "serde", - "serde_derive", "serde_json", "serde_repr", + "serde_with", "url", "uuid", ] @@ -1209,8 +1209,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1227,17 +1237,42 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.63", +] + [[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core 0.20.9", + "quote", + "syn 2.0.63", +] + [[package]] name = "data-encoding" version = "2.6.0" @@ -1280,6 +1315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -1297,7 +1333,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -3436,6 +3472,36 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", + "syn 2.0.63", +] + [[package]] name = "serde_yaml" version = "0.9.34+deprecated" diff --git a/crates/bitwarden-api-api/.openapi-generator/FILES b/crates/bitwarden-api-api/.openapi-generator/FILES index 7f975643a..e9cae26d1 100644 --- a/crates/bitwarden-api-api/.openapi-generator/FILES +++ b/crates/bitwarden-api-api/.openapi-generator/FILES @@ -207,6 +207,7 @@ src/models/master_password_policy_response_model.rs src/models/member_decryption_type.rs src/models/mod.rs src/models/open_id_connect_redirect_behavior.rs +src/models/optional_cipher_details_response_model.rs src/models/organization_api_key_information.rs src/models/organization_api_key_information_list_response_model.rs src/models/organization_api_key_request_model.rs @@ -262,6 +263,7 @@ src/models/organization_user_update_request_model.rs src/models/organization_user_user_details_response_model.rs src/models/organization_user_user_details_response_model_list_response_model.rs src/models/organization_verify_bank_request_model.rs +src/models/organization_verify_delete_recover_request_model.rs src/models/other_device_keys_update_request_model.rs src/models/password_hint_request_model.rs src/models/password_manager_plan_features_response_model.rs diff --git a/crates/bitwarden-api-api/.openapi-generator/VERSION b/crates/bitwarden-api-api/.openapi-generator/VERSION index 4b49d9bb6..93c8ddab9 100644 --- a/crates/bitwarden-api-api/.openapi-generator/VERSION +++ b/crates/bitwarden-api-api/.openapi-generator/VERSION @@ -1 +1 @@ -7.2.0 \ No newline at end of file +7.6.0 diff --git a/crates/bitwarden-api-api/Cargo.toml b/crates/bitwarden-api-api/Cargo.toml index cfe357998..7c6de8278 100644 --- a/crates/bitwarden-api-api/Cargo.toml +++ b/crates/bitwarden-api-api/Cargo.toml @@ -1,8 +1,6 @@ [package] name = "bitwarden-api-api" -description = """ -Api bindings for the Bitwarden API. -""" +description = "Api bindings for the Bitwarden API." categories = ["api-bindings"] version.workspace = true @@ -15,15 +13,10 @@ license-file.workspace = true keywords.workspace = true [dependencies] -serde = ">=1.0.163, <2" -serde_derive = ">=1.0.163, <2" +serde = { version = ">=1.0.163, <2", features = ["derive"] } +serde_with = { version = ">=3.8, <4", default-features = false, features = ["base64", "std", "macros"] } serde_json = ">=1.0.96, <2" serde_repr = ">=0.1.12, <0.2" -url = ">=2.3.1, <3" -uuid = { version = ">=1.3.3, <2", features = ["serde"] } -[dependencies.reqwest] -version = ">=0.12, <0.13" -features = ["http2", "json", "multipart"] -default-features = false - -[dev-dependencies] +url = ">=2.5, <3" +uuid = { version = ">=1.3.3, <2", features = ["serde", "v4"] } +reqwest = { version = ">=0.12, <0.13", features = ["json", "multipart", "http2"], default-features = false } diff --git a/crates/bitwarden-api-api/README.md b/crates/bitwarden-api-api/README.md index a330de62e..84b3e478a 100644 --- a/crates/bitwarden-api-api/README.md +++ b/crates/bitwarden-api-api/README.md @@ -10,7 +10,8 @@ using the [openapi-spec](https://openapis.org) from a remote server, you can eas client. - API version: latest -- Package version: 1.0.0 +- Package version: 0.5.0 +- Generator version: 7.6.0 - Build package: `org.openapitools.codegen.languages.RustClientCodegen` ## Installation @@ -122,6 +123,8 @@ All URIs are relative to _http://localhost_ | _CiphersApi_ | [**ciphers_id_collections_admin_put**](docs/CiphersApi.md#ciphers_id_collections_admin_put) | **PUT** /ciphers/{id}/collections-admin | | _CiphersApi_ | [**ciphers_id_collections_post**](docs/CiphersApi.md#ciphers_id_collections_post) | **POST** /ciphers/{id}/collections | | _CiphersApi_ | [**ciphers_id_collections_put**](docs/CiphersApi.md#ciphers_id_collections_put) | **PUT** /ciphers/{id}/collections | +| _CiphersApi_ | [**ciphers_id_collections_v2_post**](docs/CiphersApi.md#ciphers_id_collections_v2_post) | **POST** /ciphers/{id}/collections_v2 | +| _CiphersApi_ | [**ciphers_id_collections_v2_put**](docs/CiphersApi.md#ciphers_id_collections_v2_put) | **PUT** /ciphers/{id}/collections_v2 | | _CiphersApi_ | [**ciphers_id_delete**](docs/CiphersApi.md#ciphers_id_delete) | **DELETE** /ciphers/{id} | | _CiphersApi_ | [**ciphers_id_delete_admin_post**](docs/CiphersApi.md#ciphers_id_delete_admin_post) | **POST** /ciphers/{id}/delete-admin | | _CiphersApi_ | [**ciphers_id_delete_admin_put**](docs/CiphersApi.md#ciphers_id_delete_admin_put) | **PUT** /ciphers/{id}/delete-admin | @@ -245,6 +248,7 @@ All URIs are relative to _http://localhost_ | _OrganizationAuthRequestsApi_ | [**organizations_org_id_auth_requests_deny_post**](docs/OrganizationAuthRequestsApi.md#organizations_org_id_auth_requests_deny_post) | **POST** /organizations/{orgId}/auth-requests/deny | | _OrganizationAuthRequestsApi_ | [**organizations_org_id_auth_requests_get**](docs/OrganizationAuthRequestsApi.md#organizations_org_id_auth_requests_get) | **GET** /organizations/{orgId}/auth-requests | | _OrganizationAuthRequestsApi_ | [**organizations_org_id_auth_requests_request_id_post**](docs/OrganizationAuthRequestsApi.md#organizations_org_id_auth_requests_request_id_post) | **POST** /organizations/{orgId}/auth-requests/{requestId} | +| _OrganizationBillingApi_ | [**organizations_organization_id_billing_get**](docs/OrganizationBillingApi.md#organizations_organization_id_billing_get) | **GET** /organizations/{organizationId}/billing | | _OrganizationBillingApi_ | [**organizations_organization_id_billing_metadata_get**](docs/OrganizationBillingApi.md#organizations_organization_id_billing_metadata_get) | **GET** /organizations/{organizationId}/billing/metadata | | _OrganizationConnectionsApi_ | [**organizations_connections_enabled_get**](docs/OrganizationConnectionsApi.md#organizations_connections_enabled_get) | **GET** /organizations/connections/enabled | | _OrganizationConnectionsApi_ | [**organizations_connections_organization_connection_id_delete**](docs/OrganizationConnectionsApi.md#organizations_connections_organization_connection_id_delete) | **DELETE** /organizations/connections/{organizationConnectionId} | @@ -303,12 +307,12 @@ All URIs are relative to _http://localhost_ | _OrganizationsApi_ | [**organizations_get**](docs/OrganizationsApi.md#organizations_get) | **GET** /organizations | | _OrganizationsApi_ | [**organizations_id_api_key_information_type_get**](docs/OrganizationsApi.md#organizations_id_api_key_information_type_get) | **GET** /organizations/{id}/api-key-information/{type} | | _OrganizationsApi_ | [**organizations_id_api_key_post**](docs/OrganizationsApi.md#organizations_id_api_key_post) | **POST** /organizations/{id}/api-key | -| _OrganizationsApi_ | [**organizations_id_billing_get**](docs/OrganizationsApi.md#organizations_id_billing_get) | **GET** /organizations/{id}/billing | | _OrganizationsApi_ | [**organizations_id_billing_status_get**](docs/OrganizationsApi.md#organizations_id_billing_status_get) | **GET** /organizations/{id}/billing-status | | _OrganizationsApi_ | [**organizations_id_cancel_post**](docs/OrganizationsApi.md#organizations_id_cancel_post) | **POST** /organizations/{id}/cancel | | _OrganizationsApi_ | [**organizations_id_collection_management_put**](docs/OrganizationsApi.md#organizations_id_collection_management_put) | **PUT** /organizations/{id}/collection-management | | _OrganizationsApi_ | [**organizations_id_delete**](docs/OrganizationsApi.md#organizations_id_delete) | **DELETE** /organizations/{id} | | _OrganizationsApi_ | [**organizations_id_delete_post**](docs/OrganizationsApi.md#organizations_id_delete_post) | **POST** /organizations/{id}/delete | +| _OrganizationsApi_ | [**organizations_id_delete_recover_token_post**](docs/OrganizationsApi.md#organizations_id_delete_recover_token_post) | **POST** /organizations/{id}/delete-recover-token | | _OrganizationsApi_ | [**organizations_id_enable_collection_enhancements_post**](docs/OrganizationsApi.md#organizations_id_enable_collection_enhancements_post) | **POST** /organizations/{id}/enable-collection-enhancements | Migrates user, collection, and group data to the new Flexible Collections permissions scheme, then sets organization.FlexibleCollections to true to enable these new features for the organization. This is irreversible. | | _OrganizationsApi_ | [**organizations_id_get**](docs/OrganizationsApi.md#organizations_id_get) | **GET** /organizations/{id} | | _OrganizationsApi_ | [**organizations_id_import_post**](docs/OrganizationsApi.md#organizations_id_import_post) | **POST** /organizations/{id}/import | @@ -624,6 +628,7 @@ All URIs are relative to _http://localhost_ - [MasterPasswordPolicyResponseModel](docs/MasterPasswordPolicyResponseModel.md) - [MemberDecryptionType](docs/MemberDecryptionType.md) - [OpenIdConnectRedirectBehavior](docs/OpenIdConnectRedirectBehavior.md) +- [OptionalCipherDetailsResponseModel](docs/OptionalCipherDetailsResponseModel.md) - [OrganizationApiKeyInformation](docs/OrganizationApiKeyInformation.md) - [OrganizationApiKeyInformationListResponseModel](docs/OrganizationApiKeyInformationListResponseModel.md) - [OrganizationApiKeyRequestModel](docs/OrganizationApiKeyRequestModel.md) @@ -679,6 +684,7 @@ All URIs are relative to _http://localhost_ - [OrganizationUserUserDetailsResponseModel](docs/OrganizationUserUserDetailsResponseModel.md) - [OrganizationUserUserDetailsResponseModelListResponseModel](docs/OrganizationUserUserDetailsResponseModelListResponseModel.md) - [OrganizationVerifyBankRequestModel](docs/OrganizationVerifyBankRequestModel.md) +- [OrganizationVerifyDeleteRecoverRequestModel](docs/OrganizationVerifyDeleteRecoverRequestModel.md) - [OtherDeviceKeysUpdateRequestModel](docs/OtherDeviceKeysUpdateRequestModel.md) - [PasswordHintRequestModel](docs/PasswordHintRequestModel.md) - [PasswordManagerPlanFeaturesResponseModel](docs/PasswordManagerPlanFeaturesResponseModel.md) 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 bea3fd86d..5ad67157c 100644 --- a/crates/bitwarden-api-api/src/apis/access_policies_api.rs +++ b/crates/bitwarden-api-api/src/apis/access_policies_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method /// [`organizations_id_access_policies_people_potential_grantees_get`] @@ -97,7 +98,7 @@ pub async fn organizations_id_access_policies_people_potential_grantees_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::PotentialGranteeResponseModelListResponseModel, + models::PotentialGranteeResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -144,7 +145,7 @@ pub async fn organizations_id_access_policies_projects_potential_grantees_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::PotentialGranteeResponseModelListResponseModel, + models::PotentialGranteeResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -192,7 +193,7 @@ pub async fn organizations_id_access_policies_service_accounts_potential_grantee configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::PotentialGranteeResponseModelListResponseModel, + models::PotentialGranteeResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -240,7 +241,7 @@ pub async fn projects_id_access_policies_people_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::ProjectPeopleAccessPoliciesResponseModel, + models::ProjectPeopleAccessPoliciesResponseModel, Error, > { let local_var_configuration = configuration; @@ -286,9 +287,9 @@ pub async fn projects_id_access_policies_people_get( pub async fn projects_id_access_policies_people_put( configuration: &configuration::Configuration, id: uuid::Uuid, - people_access_policies_request_model: Option, + people_access_policies_request_model: Option, ) -> Result< - crate::models::ProjectPeopleAccessPoliciesResponseModel, + models::ProjectPeopleAccessPoliciesResponseModel, Error, > { let local_var_configuration = configuration; @@ -336,7 +337,7 @@ pub async fn projects_id_access_policies_service_accounts_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::ProjectServiceAccountsAccessPoliciesResponseModel, + models::ProjectServiceAccountsAccessPoliciesResponseModel, Error, > { let local_var_configuration = configuration; @@ -383,10 +384,10 @@ pub async fn projects_id_access_policies_service_accounts_put( configuration: &configuration::Configuration, id: uuid::Uuid, project_service_accounts_access_policies_request_model: Option< - crate::models::ProjectServiceAccountsAccessPoliciesRequestModel, + models::ProjectServiceAccountsAccessPoliciesRequestModel, >, ) -> Result< - crate::models::ProjectServiceAccountsAccessPoliciesResponseModel, + models::ProjectServiceAccountsAccessPoliciesResponseModel, Error, > { let local_var_configuration = configuration; @@ -435,7 +436,7 @@ pub async fn service_accounts_id_access_policies_people_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::ServiceAccountPeopleAccessPoliciesResponseModel, + models::ServiceAccountPeopleAccessPoliciesResponseModel, Error, > { let local_var_configuration = configuration; @@ -481,9 +482,9 @@ pub async fn service_accounts_id_access_policies_people_get( pub async fn service_accounts_id_access_policies_people_put( configuration: &configuration::Configuration, id: uuid::Uuid, - people_access_policies_request_model: Option, + people_access_policies_request_model: Option, ) -> Result< - crate::models::ServiceAccountPeopleAccessPoliciesResponseModel, + models::ServiceAccountPeopleAccessPoliciesResponseModel, Error, > { let local_var_configuration = configuration; @@ -531,7 +532,7 @@ pub async fn service_accounts_id_granted_policies_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::ServiceAccountGrantedPoliciesPermissionDetailsResponseModel, + models::ServiceAccountGrantedPoliciesPermissionDetailsResponseModel, Error, > { let local_var_configuration = configuration; @@ -578,10 +579,10 @@ pub async fn service_accounts_id_granted_policies_put( configuration: &configuration::Configuration, id: uuid::Uuid, service_account_granted_policies_request_model: Option< - crate::models::ServiceAccountGrantedPoliciesRequestModel, + models::ServiceAccountGrantedPoliciesRequestModel, >, ) -> Result< - crate::models::ServiceAccountGrantedPoliciesPermissionDetailsResponseModel, + models::ServiceAccountGrantedPoliciesPermissionDetailsResponseModel, Error, > { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/accounts_api.rs b/crates/bitwarden-api-api/src/apis/accounts_api.rs index 40db5d15f..da44cffea 100644 --- a/crates/bitwarden-api-api/src/apis/accounts_api.rs +++ b/crates/bitwarden-api-api/src/apis/accounts_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`accounts_api_key_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -323,8 +324,8 @@ pub enum AccountsVerifyPasswordPostError { pub async fn accounts_api_key_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -364,8 +365,8 @@ pub async fn accounts_api_key_post( pub async fn accounts_avatar_post( configuration: &configuration::Configuration, - update_avatar_request_model: Option, -) -> Result> { + update_avatar_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -405,8 +406,8 @@ pub async fn accounts_avatar_post( pub async fn accounts_avatar_put( configuration: &configuration::Configuration, - update_avatar_request_model: Option, -) -> Result> { + update_avatar_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -446,9 +447,7 @@ pub async fn accounts_avatar_put( pub async fn accounts_cancel_post( configuration: &configuration::Configuration, - subscription_cancellation_request_model: Option< - crate::models::SubscriptionCancellationRequestModel, - >, + subscription_cancellation_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -531,7 +530,7 @@ pub async fn accounts_convert_to_key_connector_post( pub async fn accounts_delete( configuration: &configuration::Configuration, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -572,7 +571,7 @@ pub async fn accounts_delete( pub async fn accounts_delete_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -613,7 +612,7 @@ pub async fn accounts_delete_post( pub async fn accounts_delete_recover_post( configuration: &configuration::Configuration, - delete_recover_request_model: Option, + delete_recover_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -657,7 +656,7 @@ pub async fn accounts_delete_recover_post( pub async fn accounts_delete_recover_token_post( configuration: &configuration::Configuration, - verify_delete_recover_request_model: Option, + verify_delete_recover_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -701,7 +700,7 @@ pub async fn accounts_delete_recover_token_post( pub async fn accounts_email_post( configuration: &configuration::Configuration, - email_request_model: Option, + email_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -742,7 +741,7 @@ pub async fn accounts_email_post( pub async fn accounts_email_token_post( configuration: &configuration::Configuration, - email_token_request_model: Option, + email_token_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -783,7 +782,7 @@ pub async fn accounts_email_token_post( pub async fn accounts_kdf_post( configuration: &configuration::Configuration, - kdf_request_model: Option, + kdf_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -824,7 +823,7 @@ pub async fn accounts_kdf_post( pub async fn accounts_key_post( configuration: &configuration::Configuration, - update_key_request_model: Option, + update_key_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -865,7 +864,7 @@ pub async fn accounts_key_post( pub async fn accounts_keys_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -904,8 +903,8 @@ pub async fn accounts_keys_get( pub async fn accounts_keys_post( configuration: &configuration::Configuration, - keys_request_model: Option, -) -> Result> { + keys_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -989,7 +988,7 @@ pub async fn accounts_license_post( pub async fn accounts_organizations_get( configuration: &configuration::Configuration, ) -> Result< - crate::models::ProfileOrganizationResponseModelListResponseModel, + models::ProfileOrganizationResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1033,7 +1032,7 @@ pub async fn accounts_organizations_get( pub async fn accounts_password_hint_post( configuration: &configuration::Configuration, - password_hint_request_model: Option, + password_hint_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1077,7 +1076,7 @@ pub async fn accounts_password_hint_post( pub async fn accounts_password_post( configuration: &configuration::Configuration, - password_request_model: Option, + password_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1118,7 +1117,7 @@ pub async fn accounts_password_post( pub async fn accounts_payment_post( configuration: &configuration::Configuration, - payment_request_model: Option, + payment_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1159,8 +1158,8 @@ pub async fn accounts_payment_post( pub async fn accounts_prelogin_post( configuration: &configuration::Configuration, - prelogin_request_model: Option, -) -> Result> { + prelogin_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1200,13 +1199,13 @@ pub async fn accounts_prelogin_post( pub async fn accounts_premium_post( configuration: &configuration::Configuration, - payment_method_type: crate::models::PaymentMethodType, + payment_method_type: models::PaymentMethodType, payment_token: Option<&str>, additional_storage_gb: Option, country: Option<&str>, postal_code: Option<&str>, license: Option, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1266,7 +1265,7 @@ pub async fn accounts_premium_post( pub async fn accounts_profile_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1305,8 +1304,8 @@ pub async fn accounts_profile_get( pub async fn accounts_profile_post( configuration: &configuration::Configuration, - update_profile_request_model: Option, -) -> Result> { + update_profile_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1346,8 +1345,8 @@ pub async fn accounts_profile_post( pub async fn accounts_profile_put( configuration: &configuration::Configuration, - update_profile_request_model: Option, -) -> Result> { + update_profile_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1387,8 +1386,8 @@ pub async fn accounts_profile_put( pub async fn accounts_register_post( configuration: &configuration::Configuration, - register_request_model: Option, -) -> Result> { + register_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1551,8 +1550,8 @@ pub async fn accounts_revision_date_get( pub async fn accounts_rotate_api_key_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1595,7 +1594,7 @@ pub async fn accounts_rotate_api_key_post( pub async fn accounts_security_stamp_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1639,7 +1638,7 @@ pub async fn accounts_security_stamp_post( pub async fn accounts_set_key_connector_key_post( configuration: &configuration::Configuration, - set_key_connector_key_request_model: Option, + set_key_connector_key_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1683,7 +1682,7 @@ pub async fn accounts_set_key_connector_key_post( pub async fn accounts_set_password_post( configuration: &configuration::Configuration, - set_password_request_model: Option, + set_password_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1736,7 +1735,7 @@ pub async fn accounts_sso_organization_id_delete( let local_var_uri_str = format!( "{}/accounts/sso/{organizationId}", local_var_configuration.base_path, - organizationId = crate::apis::urlencode(organization_id.to_string()) + organizationId = crate::apis::urlencode(organization_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -1813,8 +1812,8 @@ pub async fn accounts_sso_user_identifier_get( pub async fn accounts_storage_post( configuration: &configuration::Configuration, - storage_request_model: Option, -) -> Result> { + storage_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1854,7 +1853,7 @@ pub async fn accounts_storage_post( pub async fn accounts_subscription_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1896,7 +1895,7 @@ pub async fn accounts_subscription_get( pub async fn accounts_tax_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1935,7 +1934,7 @@ pub async fn accounts_tax_get( pub async fn accounts_tax_put( configuration: &configuration::Configuration, - tax_info_update_request_model: Option, + tax_info_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1976,7 +1975,7 @@ pub async fn accounts_tax_put( pub async fn accounts_update_temp_password_put( configuration: &configuration::Configuration, - update_temp_password_request_model: Option, + update_temp_password_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2062,7 +2061,7 @@ pub async fn accounts_verify_email_post( pub async fn accounts_verify_email_token_post( configuration: &configuration::Configuration, - verify_email_request_model: Option, + verify_email_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2106,7 +2105,7 @@ pub async fn accounts_verify_email_token_post( pub async fn accounts_verify_otp_post( configuration: &configuration::Configuration, - verify_otp_request_model: Option, + verify_otp_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2147,9 +2146,8 @@ pub async fn accounts_verify_otp_post( pub async fn accounts_verify_password_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> -{ + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 cb28f46b6..99306bb9d 100644 --- a/crates/bitwarden-api-api/src/apis/accounts_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/accounts_billing_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`accounts_billing_history_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -29,7 +30,7 @@ pub enum AccountsBillingPaymentMethodGetError { pub async fn accounts_billing_history_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -71,8 +72,7 @@ pub async fn accounts_billing_history_get( pub async fn accounts_billing_payment_method_get( configuration: &configuration::Configuration, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 39c4dd7b4..aaddb061c 100644 --- a/crates/bitwarden-api-api/src/apis/auth_requests_api.rs +++ b/crates/bitwarden-api-api/src/apis/auth_requests_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`auth_requests_admin_request_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -57,8 +58,8 @@ pub enum AuthRequestsPostError { pub async fn auth_requests_admin_request_post( configuration: &configuration::Configuration, - auth_request_create_request_model: Option, -) -> Result> { + auth_request_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -101,7 +102,7 @@ pub async fn auth_requests_admin_request_post( pub async fn auth_requests_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -141,7 +142,7 @@ pub async fn auth_requests_get( pub async fn auth_requests_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -185,8 +186,8 @@ pub async fn auth_requests_id_get( pub async fn auth_requests_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - auth_request_update_request_model: Option, -) -> Result> { + auth_request_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -232,7 +233,7 @@ pub async fn auth_requests_id_response_get( configuration: &configuration::Configuration, id: uuid::Uuid, code: Option<&str>, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -279,8 +280,8 @@ pub async fn auth_requests_id_response_get( pub async fn auth_requests_post( configuration: &configuration::Configuration, - auth_request_create_request_model: Option, -) -> Result> { + auth_request_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/ciphers_api.rs b/crates/bitwarden-api-api/src/apis/ciphers_api.rs index 662a928b6..ee9cb11b7 100644 --- a/crates/bitwarden-api-api/src/apis/ciphers_api.rs +++ b/crates/bitwarden-api-api/src/apis/ciphers_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`ciphers_admin_delete`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -230,6 +231,20 @@ pub enum CiphersIdCollectionsPutError { UnknownValue(serde_json::Value), } +/// struct for typed errors of method [`ciphers_id_collections_v2_post`] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(untagged)] +pub enum CiphersIdCollectionsV2PostError { + UnknownValue(serde_json::Value), +} + +/// struct for typed errors of method [`ciphers_id_collections_v2_put`] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(untagged)] +pub enum CiphersIdCollectionsV2PutError { + UnknownValue(serde_json::Value), +} + /// struct for typed errors of method [`ciphers_id_delete`] #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] @@ -414,7 +429,7 @@ pub enum CiphersSharePutError { pub async fn ciphers_admin_delete( configuration: &configuration::Configuration, - cipher_bulk_delete_request_model: Option, + cipher_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -455,8 +470,8 @@ pub async fn ciphers_admin_delete( pub async fn ciphers_admin_post( configuration: &configuration::Configuration, - cipher_create_request_model: Option, -) -> Result> { + cipher_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -539,7 +554,7 @@ pub async fn ciphers_attachment_validate_azure_post( pub async fn ciphers_bulk_collections_post( configuration: &configuration::Configuration, cipher_bulk_update_collections_request_model: Option< - crate::models::CipherBulkUpdateCollectionsRequestModel, + models::CipherBulkUpdateCollectionsRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -585,8 +600,8 @@ pub async fn ciphers_bulk_collections_post( pub async fn ciphers_create_post( configuration: &configuration::Configuration, - cipher_create_request_model: Option, -) -> Result> { + cipher_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -626,7 +641,7 @@ pub async fn ciphers_create_post( pub async fn ciphers_delete( configuration: &configuration::Configuration, - cipher_bulk_delete_request_model: Option, + cipher_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -667,7 +682,7 @@ pub async fn ciphers_delete( pub async fn ciphers_delete_admin_post( configuration: &configuration::Configuration, - cipher_bulk_delete_request_model: Option, + cipher_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -708,7 +723,7 @@ pub async fn ciphers_delete_admin_post( pub async fn ciphers_delete_admin_put( configuration: &configuration::Configuration, - cipher_bulk_delete_request_model: Option, + cipher_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -749,7 +764,7 @@ pub async fn ciphers_delete_admin_put( pub async fn ciphers_delete_post( configuration: &configuration::Configuration, - cipher_bulk_delete_request_model: Option, + cipher_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -790,7 +805,7 @@ pub async fn ciphers_delete_post( pub async fn ciphers_delete_put( configuration: &configuration::Configuration, - cipher_bulk_delete_request_model: Option, + cipher_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -831,7 +846,7 @@ pub async fn ciphers_delete_put( pub async fn ciphers_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -921,7 +936,7 @@ pub async fn ciphers_id_admin_delete( let local_var_uri_str = format!( "{}/ciphers/{id}/admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -957,7 +972,7 @@ pub async fn ciphers_id_admin_delete( pub async fn ciphers_id_admin_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -965,7 +980,7 @@ pub async fn ciphers_id_admin_get( let local_var_uri_str = format!( "{}/ciphers/{id}/admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -1001,8 +1016,8 @@ pub async fn ciphers_id_admin_get( pub async fn ciphers_id_admin_post( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_request_model: Option, -) -> Result> { + cipher_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1047,8 +1062,8 @@ pub async fn ciphers_id_admin_post( pub async fn ciphers_id_admin_put( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_request_model: Option, -) -> Result> { + cipher_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1093,7 +1108,7 @@ pub async fn ciphers_id_admin_put( pub async fn ciphers_id_attachment_admin_post( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1101,7 +1116,7 @@ pub async fn ciphers_id_attachment_admin_post( let local_var_uri_str = format!( "{}/ciphers/{id}/attachment-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1146,8 +1161,8 @@ pub async fn ciphers_id_attachment_attachment_id_admin_delete( let local_var_uri_str = format!( "{}/ciphers/{id}/attachment/{attachmentId}/admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + id = crate::apis::urlencode(id), + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -1193,7 +1208,7 @@ pub async fn ciphers_id_attachment_attachment_id_delete( "{}/ciphers/{id}/attachment/{attachmentId}", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -1238,8 +1253,8 @@ pub async fn ciphers_id_attachment_attachment_id_delete_admin_post( let local_var_uri_str = format!( "{}/ciphers/{id}/attachment/{attachmentId}/delete-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + id = crate::apis::urlencode(id), + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1285,7 +1300,7 @@ pub async fn ciphers_id_attachment_attachment_id_delete_post( "{}/ciphers/{id}/attachment/{attachmentId}/delete", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1322,8 +1337,7 @@ pub async fn ciphers_id_attachment_attachment_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, attachment_id: &str, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1332,7 +1346,7 @@ pub async fn ciphers_id_attachment_attachment_id_get( "{}/ciphers/{id}/attachment/{attachmentId}", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -1378,7 +1392,7 @@ pub async fn ciphers_id_attachment_attachment_id_post( "{}/ciphers/{id}/attachment/{attachmentId}", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1416,7 +1430,7 @@ pub async fn ciphers_id_attachment_attachment_id_renew_get( id: uuid::Uuid, attachment_id: &str, ) -> Result< - crate::models::AttachmentUploadDataResponseModel, + models::AttachmentUploadDataResponseModel, Error, > { let local_var_configuration = configuration; @@ -1427,7 +1441,7 @@ pub async fn ciphers_id_attachment_attachment_id_renew_get( "{}/ciphers/{id}/attachment/{attachmentId}/renew", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -1473,8 +1487,8 @@ pub async fn ciphers_id_attachment_attachment_id_share_post( let local_var_uri_str = format!( "{}/ciphers/{id}/attachment/{attachmentId}/share", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + id = crate::apis::urlencode(id), + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1514,7 +1528,7 @@ pub async fn ciphers_id_attachment_attachment_id_share_post( pub async fn ciphers_id_attachment_post( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1558,9 +1572,8 @@ pub async fn ciphers_id_attachment_post( pub async fn ciphers_id_attachment_v2_post( configuration: &configuration::Configuration, id: uuid::Uuid, - attachment_request_model: Option, -) -> Result> -{ + attachment_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1605,7 +1618,7 @@ pub async fn ciphers_id_attachment_v2_post( pub async fn ciphers_id_collections_admin_post( configuration: &configuration::Configuration, id: &str, - cipher_collections_request_model: Option, + cipher_collections_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1614,7 +1627,7 @@ pub async fn ciphers_id_collections_admin_post( let local_var_uri_str = format!( "{}/ciphers/{id}/collections-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1651,7 +1664,7 @@ pub async fn ciphers_id_collections_admin_post( pub async fn ciphers_id_collections_admin_put( configuration: &configuration::Configuration, id: &str, - cipher_collections_request_model: Option, + cipher_collections_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1660,7 +1673,7 @@ pub async fn ciphers_id_collections_admin_put( let local_var_uri_str = format!( "{}/ciphers/{id}/collections-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -1697,8 +1710,8 @@ pub async fn ciphers_id_collections_admin_put( pub async fn ciphers_id_collections_post( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_collections_request_model: Option, -) -> Result> { + cipher_collections_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1743,8 +1756,8 @@ pub async fn ciphers_id_collections_post( pub async fn ciphers_id_collections_put( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_collections_request_model: Option, -) -> Result> { + cipher_collections_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1786,6 +1799,98 @@ pub async fn ciphers_id_collections_put( } } +pub async fn ciphers_id_collections_v2_post( + configuration: &configuration::Configuration, + id: uuid::Uuid, + cipher_collections_request_model: Option, +) -> Result> { + let local_var_configuration = configuration; + + let local_var_client = &local_var_configuration.client; + + let local_var_uri_str = format!( + "{}/ciphers/{id}/collections_v2", + local_var_configuration.base_path, + id = crate::apis::urlencode(id.to_string()) + ); + let mut local_var_req_builder = + local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + + if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { + local_var_req_builder = + local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + } + if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { + local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); + }; + local_var_req_builder = local_var_req_builder.json(&cipher_collections_request_model); + + let local_var_req = local_var_req_builder.build()?; + let local_var_resp = local_var_client.execute(local_var_req).await?; + + let local_var_status = local_var_resp.status(); + let local_var_content = local_var_resp.text().await?; + + if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + serde_json::from_str(&local_var_content).map_err(Error::from) + } else { + let local_var_entity: Option = + serde_json::from_str(&local_var_content).ok(); + let local_var_error = ResponseContent { + status: local_var_status, + content: local_var_content, + entity: local_var_entity, + }; + Err(Error::ResponseError(local_var_error)) + } +} + +pub async fn ciphers_id_collections_v2_put( + configuration: &configuration::Configuration, + id: uuid::Uuid, + cipher_collections_request_model: Option, +) -> Result> { + let local_var_configuration = configuration; + + let local_var_client = &local_var_configuration.client; + + let local_var_uri_str = format!( + "{}/ciphers/{id}/collections_v2", + local_var_configuration.base_path, + id = crate::apis::urlencode(id.to_string()) + ); + let mut local_var_req_builder = + local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + + if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { + local_var_req_builder = + local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + } + if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { + local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); + }; + local_var_req_builder = local_var_req_builder.json(&cipher_collections_request_model); + + let local_var_req = local_var_req_builder.build()?; + let local_var_resp = local_var_client.execute(local_var_req).await?; + + let local_var_status = local_var_resp.status(); + let local_var_content = local_var_resp.text().await?; + + if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + serde_json::from_str(&local_var_content).map_err(Error::from) + } else { + let local_var_entity: Option = + serde_json::from_str(&local_var_content).ok(); + let local_var_error = ResponseContent { + status: local_var_status, + content: local_var_content, + entity: local_var_entity, + }; + Err(Error::ResponseError(local_var_error)) + } +} + pub async fn ciphers_id_delete( configuration: &configuration::Configuration, id: uuid::Uuid, @@ -1841,7 +1946,7 @@ pub async fn ciphers_id_delete_admin_post( let local_var_uri_str = format!( "{}/ciphers/{id}/delete-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1885,7 +1990,7 @@ pub async fn ciphers_id_delete_admin_put( let local_var_uri_str = format!( "{}/ciphers/{id}/delete-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -2009,7 +2114,7 @@ pub async fn ciphers_id_delete_put( pub async fn ciphers_id_details_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2053,7 +2158,7 @@ pub async fn ciphers_id_details_get( pub async fn ciphers_id_full_details_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2097,7 +2202,7 @@ pub async fn ciphers_id_full_details_get( pub async fn ciphers_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2141,8 +2246,8 @@ pub async fn ciphers_id_get( pub async fn ciphers_id_partial_post( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_partial_request_model: Option, -) -> Result> { + cipher_partial_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2187,8 +2292,8 @@ pub async fn ciphers_id_partial_post( pub async fn ciphers_id_partial_put( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_partial_request_model: Option, -) -> Result> { + cipher_partial_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2233,8 +2338,8 @@ pub async fn ciphers_id_partial_put( pub async fn ciphers_id_post( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_request_model: Option, -) -> Result> { + cipher_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2279,8 +2384,8 @@ pub async fn ciphers_id_post( pub async fn ciphers_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_request_model: Option, -) -> Result> { + cipher_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2325,7 +2430,7 @@ pub async fn ciphers_id_put( pub async fn ciphers_id_restore_admin_put( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2333,7 +2438,7 @@ pub async fn ciphers_id_restore_admin_put( let local_var_uri_str = format!( "{}/ciphers/{id}/restore-admin", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -2369,7 +2474,7 @@ pub async fn ciphers_id_restore_admin_put( pub async fn ciphers_id_restore_put( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2413,8 +2518,8 @@ pub async fn ciphers_id_restore_put( pub async fn ciphers_id_share_post( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_share_request_model: Option, -) -> Result> { + cipher_share_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2459,8 +2564,8 @@ pub async fn ciphers_id_share_post( pub async fn ciphers_id_share_put( configuration: &configuration::Configuration, id: uuid::Uuid, - cipher_share_request_model: Option, -) -> Result> { + cipher_share_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2504,7 +2609,7 @@ pub async fn ciphers_id_share_put( pub async fn ciphers_move_post( configuration: &configuration::Configuration, - cipher_bulk_move_request_model: Option, + cipher_bulk_move_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2545,7 +2650,7 @@ pub async fn ciphers_move_post( pub async fn ciphers_move_put( configuration: &configuration::Configuration, - cipher_bulk_move_request_model: Option, + cipher_bulk_move_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2588,7 +2693,7 @@ pub async fn ciphers_organization_details_assigned_get( configuration: &configuration::Configuration, organization_id: Option, ) -> Result< - crate::models::CipherDetailsResponseModelListResponseModel, + models::CipherDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -2638,7 +2743,7 @@ pub async fn ciphers_organization_details_get( configuration: &configuration::Configuration, organization_id: Option, ) -> Result< - crate::models::CipherMiniDetailsResponseModelListResponseModel, + models::CipherMiniDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -2686,8 +2791,8 @@ pub async fn ciphers_organization_details_get( pub async fn ciphers_post( configuration: &configuration::Configuration, - cipher_request_model: Option, -) -> Result> { + cipher_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2728,7 +2833,7 @@ pub async fn ciphers_post( pub async fn ciphers_purge_post( configuration: &configuration::Configuration, organization_id: Option<&str>, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2773,11 +2878,8 @@ pub async fn ciphers_purge_post( pub async fn ciphers_restore_admin_put( configuration: &configuration::Configuration, - cipher_bulk_restore_request_model: Option, -) -> Result< - crate::models::CipherMiniResponseModelListResponseModel, - Error, -> { + cipher_bulk_restore_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2820,9 +2922,8 @@ pub async fn ciphers_restore_admin_put( pub async fn ciphers_restore_put( configuration: &configuration::Configuration, - cipher_bulk_restore_request_model: Option, -) -> Result> -{ + cipher_bulk_restore_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -2862,7 +2963,7 @@ pub async fn ciphers_restore_put( pub async fn ciphers_share_post( configuration: &configuration::Configuration, - cipher_bulk_share_request_model: Option, + cipher_bulk_share_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -2903,7 +3004,7 @@ pub async fn ciphers_share_post( pub async fn ciphers_share_put( configuration: &configuration::Configuration, - cipher_bulk_share_request_model: Option, + cipher_bulk_share_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/collections_api.rs b/crates/bitwarden-api-api/src/apis/collections_api.rs index d6c302538..2da881e7a 100644 --- a/crates/bitwarden-api-api/src/apis/collections_api.rs +++ b/crates/bitwarden-api-api/src/apis/collections_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`collections_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -136,10 +137,7 @@ pub enum OrganizationsOrgIdCollectionsPostError { pub async fn collections_get( configuration: &configuration::Configuration, -) -> Result< - crate::models::CollectionDetailsResponseModelListResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -179,7 +177,7 @@ pub async fn collections_get( pub async fn organizations_org_id_collections_bulk_access_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, - bulk_collection_access_request_model: Option, + bulk_collection_access_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -225,7 +223,7 @@ pub async fn organizations_org_id_collections_bulk_access_post( pub async fn organizations_org_id_collections_delete( configuration: &configuration::Configuration, org_id: uuid::Uuid, - collection_bulk_delete_request_model: Option, + collection_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -271,7 +269,7 @@ pub async fn organizations_org_id_collections_delete( pub async fn organizations_org_id_collections_delete_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, - collection_bulk_delete_request_model: Option, + collection_bulk_delete_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -318,7 +316,7 @@ pub async fn organizations_org_id_collections_details_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, ) -> Result< - crate::models::CollectionAccessDetailsResponseModelListResponseModel, + models::CollectionAccessDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -365,7 +363,7 @@ pub async fn organizations_org_id_collections_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, ) -> Result< - crate::models::CollectionResponseModelListResponseModel, + models::CollectionResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -553,7 +551,7 @@ pub async fn organizations_org_id_collections_id_details_get( org_id: uuid::Uuid, id: uuid::Uuid, ) -> Result< - crate::models::CollectionAccessDetailsResponseModel, + models::CollectionAccessDetailsResponseModel, Error, > { let local_var_configuration = configuration; @@ -601,8 +599,7 @@ pub async fn organizations_org_id_collections_id_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -648,9 +645,8 @@ pub async fn organizations_org_id_collections_id_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - collection_request_model: Option, -) -> Result> -{ + collection_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -697,9 +693,8 @@ pub async fn organizations_org_id_collections_id_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - collection_request_model: Option, -) -> Result> -{ + collection_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -795,7 +790,7 @@ pub async fn organizations_org_id_collections_id_users_get( org_id: uuid::Uuid, id: uuid::Uuid, ) -> Result< - Vec, + Vec, Error, > { let local_var_configuration = configuration; @@ -843,7 +838,7 @@ pub async fn organizations_org_id_collections_id_users_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - selection_read_only_request_model: Option>, + selection_read_only_request_model: Option>, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -890,8 +885,8 @@ pub async fn organizations_org_id_collections_id_users_put( pub async fn organizations_org_id_collections_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, - collection_request_model: Option, -) -> Result> { + collection_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/config_api.rs b/crates/bitwarden-api-api/src/apis/config_api.rs index a4a548542..e9b862825 100644 --- a/crates/bitwarden-api-api/src/apis/config_api.rs +++ b/crates/bitwarden-api-api/src/apis/config_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`config_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -22,7 +23,7 @@ pub enum ConfigGetError { pub async fn config_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/devices_api.rs b/crates/bitwarden-api-api/src/apis/devices_api.rs index 71cfdaade..c7f3d29a0 100644 --- a/crates/bitwarden-api-api/src/apis/devices_api.rs +++ b/crates/bitwarden-api-api/src/apis/devices_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`devices_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -141,7 +142,7 @@ pub enum DevicesUpdateTrustPostError { pub async fn devices_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -189,7 +190,7 @@ pub async fn devices_id_delete( let local_var_uri_str = format!( "{}/devices/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -233,7 +234,7 @@ pub async fn devices_id_delete_post( let local_var_uri_str = format!( "{}/devices/{id}/delete", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -269,7 +270,7 @@ pub async fn devices_id_delete_post( pub async fn devices_id_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -277,7 +278,7 @@ pub async fn devices_id_get( let local_var_uri_str = format!( "{}/devices/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -313,8 +314,8 @@ pub async fn devices_id_get( pub async fn devices_id_post( configuration: &configuration::Configuration, id: &str, - device_request_model: Option, -) -> Result> { + device_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -322,7 +323,7 @@ pub async fn devices_id_post( let local_var_uri_str = format!( "{}/devices/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -359,8 +360,8 @@ pub async fn devices_id_post( pub async fn devices_id_put( configuration: &configuration::Configuration, id: &str, - device_request_model: Option, -) -> Result> { + device_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -368,7 +369,7 @@ pub async fn devices_id_put( let local_var_uri_str = format!( "{}/devices/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -413,7 +414,7 @@ pub async fn devices_identifier_identifier_clear_token_post( let local_var_uri_str = format!( "{}/devices/identifier/{identifier}/clear-token", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -457,7 +458,7 @@ pub async fn devices_identifier_identifier_clear_token_put( let local_var_uri_str = format!( "{}/devices/identifier/{identifier}/clear-token", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -493,7 +494,7 @@ pub async fn devices_identifier_identifier_clear_token_put( pub async fn devices_identifier_identifier_get( configuration: &configuration::Configuration, identifier: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -501,7 +502,7 @@ pub async fn devices_identifier_identifier_get( let local_var_uri_str = format!( "{}/devices/identifier/{identifier}", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -537,7 +538,7 @@ pub async fn devices_identifier_identifier_get( pub async fn devices_identifier_identifier_token_post( configuration: &configuration::Configuration, identifier: &str, - device_token_request_model: Option, + device_token_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -546,7 +547,7 @@ pub async fn devices_identifier_identifier_token_post( let local_var_uri_str = format!( "{}/devices/identifier/{identifier}/token", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -583,7 +584,7 @@ pub async fn devices_identifier_identifier_token_post( pub async fn devices_identifier_identifier_token_put( configuration: &configuration::Configuration, identifier: &str, - device_token_request_model: Option, + device_token_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -592,7 +593,7 @@ pub async fn devices_identifier_identifier_token_put( let local_var_uri_str = format!( "{}/devices/identifier/{identifier}/token", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -629,8 +630,8 @@ pub async fn devices_identifier_identifier_token_put( pub async fn devices_identifier_keys_post( configuration: &configuration::Configuration, identifier: &str, - device_keys_request_model: Option, -) -> Result> { + device_keys_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -638,7 +639,7 @@ pub async fn devices_identifier_keys_post( let local_var_uri_str = format!( "{}/devices/{identifier}/keys", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -675,8 +676,8 @@ pub async fn devices_identifier_keys_post( pub async fn devices_identifier_keys_put( configuration: &configuration::Configuration, identifier: &str, - device_keys_request_model: Option, -) -> Result> { + device_keys_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -684,7 +685,7 @@ pub async fn devices_identifier_keys_put( let local_var_uri_str = format!( "{}/devices/{identifier}/keys", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -721,11 +722,8 @@ pub async fn devices_identifier_keys_put( pub async fn devices_identifier_retrieve_keys_post( configuration: &configuration::Configuration, identifier: &str, - secret_verification_request_model: Option, -) -> Result< - crate::models::ProtectedDeviceResponseModel, - Error, -> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -733,7 +731,7 @@ pub async fn devices_identifier_retrieve_keys_post( let local_var_uri_str = format!( "{}/devices/{identifier}/retrieve-keys", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -779,8 +777,8 @@ pub async fn devices_knowndevice_email_identifier_get( let local_var_uri_str = format!( "{}/devices/knowndevice/{email}/{identifier}", local_var_configuration.base_path, - email = crate::apis::urlencode(email.to_string()), - identifier = crate::apis::urlencode(identifier.to_string()) + email = crate::apis::urlencode(email), + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -860,8 +858,8 @@ pub async fn devices_knowndevice_get( pub async fn devices_post( configuration: &configuration::Configuration, - device_request_model: Option, -) -> Result> { + device_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -901,7 +899,7 @@ pub async fn devices_post( pub async fn devices_update_trust_post( configuration: &configuration::Configuration, - update_devices_trust_request_model: Option, + update_devices_trust_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = 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 636f28d32..8a42a8432 100644 --- a/crates/bitwarden-api-api/src/apis/emergency_access_api.rs +++ b/crates/bitwarden-api-api/src/apis/emergency_access_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`emergency_access_granted_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -149,7 +150,7 @@ pub enum EmergencyAccessTrustedGetError { pub async fn emergency_access_granted_get( configuration: &configuration::Configuration, ) -> Result< - crate::models::EmergencyAccessGrantorDetailsResponseModelListResponseModel, + models::EmergencyAccessGrantorDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -194,9 +195,7 @@ pub async fn emergency_access_granted_get( pub async fn emergency_access_id_accept_post( configuration: &configuration::Configuration, id: uuid::Uuid, - organization_user_accept_request_model: Option< - crate::models::OrganizationUserAcceptRequestModel, - >, + organization_user_accept_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -289,7 +288,7 @@ pub async fn emergency_access_id_cipher_id_attachment_attachment_id_get( cipher_id: uuid::Uuid, attachment_id: &str, ) -> Result< - crate::models::AttachmentResponseModel, + models::AttachmentResponseModel, Error, > { let local_var_configuration = configuration; @@ -301,7 +300,7 @@ pub async fn emergency_access_id_cipher_id_attachment_attachment_id_get( local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()), cipherId = crate::apis::urlencode(cipher_id.to_string()), - attachmentId = crate::apis::urlencode(attachment_id.to_string()) + attachmentId = crate::apis::urlencode(attachment_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -337,9 +336,7 @@ pub async fn emergency_access_id_cipher_id_attachment_attachment_id_get( pub async fn emergency_access_id_confirm_post( configuration: &configuration::Configuration, id: uuid::Uuid, - organization_user_confirm_request_model: Option< - crate::models::OrganizationUserConfirmRequestModel, - >, + organization_user_confirm_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -473,10 +470,7 @@ pub async fn emergency_access_id_delete_post( pub async fn emergency_access_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result< - crate::models::EmergencyAccessGranteeDetailsResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -564,9 +558,7 @@ pub async fn emergency_access_id_initiate_post( pub async fn emergency_access_id_password_post( configuration: &configuration::Configuration, id: uuid::Uuid, - emergency_access_password_request_model: Option< - crate::models::EmergencyAccessPasswordRequestModel, - >, + emergency_access_password_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -612,10 +604,8 @@ pub async fn emergency_access_id_password_post( pub async fn emergency_access_id_policies_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result< - crate::models::PolicyResponseModelListResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -659,7 +649,7 @@ pub async fn emergency_access_id_policies_get( pub async fn emergency_access_id_post( configuration: &configuration::Configuration, id: uuid::Uuid, - emergency_access_update_request_model: Option, + emergency_access_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -705,7 +695,7 @@ pub async fn emergency_access_id_post( pub async fn emergency_access_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - emergency_access_update_request_model: Option, + emergency_access_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -839,10 +829,8 @@ pub async fn emergency_access_id_reject_post( pub async fn emergency_access_id_takeover_post( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result< - crate::models::EmergencyAccessTakeoverResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -886,8 +874,7 @@ pub async fn emergency_access_id_takeover_post( pub async fn emergency_access_id_view_post( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -930,7 +917,7 @@ pub async fn emergency_access_id_view_post( pub async fn emergency_access_invite_post( configuration: &configuration::Configuration, - emergency_access_invite_request_model: Option, + emergency_access_invite_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -975,7 +962,7 @@ pub async fn emergency_access_invite_post( pub async fn emergency_access_trusted_get( configuration: &configuration::Configuration, ) -> Result< - crate::models::EmergencyAccessGranteeDetailsResponseModelListResponseModel, + models::EmergencyAccessGranteeDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/events_api.rs b/crates/bitwarden-api-api/src/apis/events_api.rs index 2829a9053..127bc835b 100644 --- a/crates/bitwarden-api-api/src/apis/events_api.rs +++ b/crates/bitwarden-api-api/src/apis/events_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`ciphers_id_events_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -61,7 +62,7 @@ pub async fn ciphers_id_events_get( start: Option, end: Option, continuation_token: Option<&str>, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -69,7 +70,7 @@ pub async fn ciphers_id_events_get( let local_var_uri_str = format!( "{}/ciphers/{id}/events", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -118,7 +119,7 @@ pub async fn events_get( start: Option, end: Option, continuation_token: Option<&str>, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -172,8 +173,7 @@ pub async fn organizations_id_events_get( start: Option, end: Option, continuation_token: Option<&str>, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -181,7 +181,7 @@ pub async fn organizations_id_events_get( let local_var_uri_str = format!( "{}/organizations/{id}/events", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -233,7 +233,7 @@ pub async fn organizations_org_id_users_id_events_get( end: Option, continuation_token: Option<&str>, ) -> Result< - crate::models::EventResponseModelListResponseModel, + models::EventResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -243,8 +243,8 @@ pub async fn organizations_org_id_users_id_events_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/events", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -294,10 +294,7 @@ pub async fn providers_provider_id_events_get( start: Option, end: Option, continuation_token: Option<&str>, -) -> Result< - crate::models::EventResponseModelListResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -357,7 +354,7 @@ pub async fn providers_provider_id_users_id_events_get( end: Option, continuation_token: Option<&str>, ) -> Result< - crate::models::EventResponseModelListResponseModel, + models::EventResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/folders_api.rs b/crates/bitwarden-api-api/src/apis/folders_api.rs index 5461c8b80..4e5ff597a 100644 --- a/crates/bitwarden-api-api/src/apis/folders_api.rs +++ b/crates/bitwarden-api-api/src/apis/folders_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`folders_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -64,7 +65,7 @@ pub enum FoldersPostError { pub async fn folders_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -112,7 +113,7 @@ pub async fn folders_id_delete( let local_var_uri_str = format!( "{}/folders/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -156,7 +157,7 @@ pub async fn folders_id_delete_post( let local_var_uri_str = format!( "{}/folders/{id}/delete", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -192,7 +193,7 @@ pub async fn folders_id_delete_post( pub async fn folders_id_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -200,7 +201,7 @@ pub async fn folders_id_get( let local_var_uri_str = format!( "{}/folders/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -236,8 +237,8 @@ pub async fn folders_id_get( pub async fn folders_id_post( configuration: &configuration::Configuration, id: &str, - folder_request_model: Option, -) -> Result> { + folder_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -245,7 +246,7 @@ pub async fn folders_id_post( let local_var_uri_str = format!( "{}/folders/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -282,8 +283,8 @@ pub async fn folders_id_post( pub async fn folders_id_put( configuration: &configuration::Configuration, id: &str, - folder_request_model: Option, -) -> Result> { + folder_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -291,7 +292,7 @@ pub async fn folders_id_put( let local_var_uri_str = format!( "{}/folders/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -327,8 +328,8 @@ pub async fn folders_id_put( pub async fn folders_post( configuration: &configuration::Configuration, - folder_request_model: Option, -) -> Result> { + folder_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/groups_api.rs b/crates/bitwarden-api-api/src/apis/groups_api.rs index 7087ff767..be59e4b83 100644 --- a/crates/bitwarden-api-api/src/apis/groups_api.rs +++ b/crates/bitwarden-api-api/src/apis/groups_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_org_id_groups_delete`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -108,7 +109,7 @@ pub enum OrganizationsOrgIdGroupsPostError { pub async fn organizations_org_id_groups_delete( configuration: &configuration::Configuration, org_id: &str, - group_bulk_request_model: Option, + group_bulk_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -117,7 +118,7 @@ pub async fn organizations_org_id_groups_delete( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -154,7 +155,7 @@ pub async fn organizations_org_id_groups_delete( pub async fn organizations_org_id_groups_delete_post( configuration: &configuration::Configuration, org_id: &str, - group_bulk_request_model: Option, + group_bulk_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -163,7 +164,7 @@ pub async fn organizations_org_id_groups_delete_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/delete", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -201,7 +202,7 @@ pub async fn organizations_org_id_groups_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, ) -> Result< - crate::models::GroupDetailsResponseModelListResponseModel, + models::GroupDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -256,8 +257,8 @@ pub async fn organizations_org_id_groups_id_delete( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -302,8 +303,8 @@ pub async fn organizations_org_id_groups_id_delete_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}/delete", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -349,9 +350,9 @@ pub async fn organizations_org_id_groups_id_delete_user_org_user_id_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}/delete-user/{orgUserId}", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()), - orgUserId = crate::apis::urlencode(org_user_id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id), + orgUserId = crate::apis::urlencode(org_user_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -388,10 +389,7 @@ pub async fn organizations_org_id_groups_id_details_get( configuration: &configuration::Configuration, org_id: &str, id: &str, -) -> Result< - crate::models::GroupDetailsResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -399,8 +397,8 @@ pub async fn organizations_org_id_groups_id_details_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}/details", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -437,7 +435,7 @@ pub async fn organizations_org_id_groups_id_get( configuration: &configuration::Configuration, org_id: &str, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -445,8 +443,8 @@ pub async fn organizations_org_id_groups_id_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -483,8 +481,8 @@ pub async fn organizations_org_id_groups_id_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - group_request_model: Option, -) -> Result> { + group_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -531,8 +529,8 @@ pub async fn organizations_org_id_groups_id_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - group_request_model: Option, -) -> Result> { + group_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -588,9 +586,9 @@ pub async fn organizations_org_id_groups_id_user_org_user_id_delete( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}/user/{orgUserId}", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()), - orgUserId = crate::apis::urlencode(org_user_id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id), + orgUserId = crate::apis::urlencode(org_user_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -635,8 +633,8 @@ pub async fn organizations_org_id_groups_id_users_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/groups/{id}/users", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -672,8 +670,8 @@ pub async fn organizations_org_id_groups_id_users_get( pub async fn organizations_org_id_groups_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, - group_request_model: Option, -) -> Result> { + group_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/hibp_api.rs b/crates/bitwarden-api-api/src/apis/hibp_api.rs index 6a006e16a..4a20084cf 100644 --- a/crates/bitwarden-api-api/src/apis/hibp_api.rs +++ b/crates/bitwarden-api-api/src/apis/hibp_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`hibp_breach_get`] #[derive(Debug, Clone, Serialize, Deserialize)] 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 6178deb90..8044cfd17 100644 --- a/crates/bitwarden-api-api/src/apis/import_ciphers_api.rs +++ b/crates/bitwarden-api-api/src/apis/import_ciphers_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`ciphers_import_organization_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -31,7 +32,7 @@ pub async fn ciphers_import_organization_post( configuration: &configuration::Configuration, organization_id: Option<&str>, import_organization_ciphers_request_model: Option< - crate::models::ImportOrganizationCiphersRequestModel, + models::ImportOrganizationCiphersRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -80,7 +81,7 @@ pub async fn ciphers_import_organization_post( pub async fn ciphers_import_post( configuration: &configuration::Configuration, - import_ciphers_request_model: Option, + import_ciphers_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/info_api.rs b/crates/bitwarden-api-api/src/apis/info_api.rs index f3ba04676..e59a4403b 100644 --- a/crates/bitwarden-api-api/src/apis/info_api.rs +++ b/crates/bitwarden-api-api/src/apis/info_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`alive_get`] #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/crates/bitwarden-api-api/src/apis/installations_api.rs b/crates/bitwarden-api-api/src/apis/installations_api.rs index f703ee51f..9ba527a07 100644 --- a/crates/bitwarden-api-api/src/apis/installations_api.rs +++ b/crates/bitwarden-api-api/src/apis/installations_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`installations_id_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -30,7 +31,7 @@ pub enum InstallationsPostError { pub async fn installations_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -73,8 +74,8 @@ pub async fn installations_id_get( pub async fn installations_post( configuration: &configuration::Configuration, - installation_request_model: Option, -) -> Result> { + installation_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/licenses_api.rs b/crates/bitwarden-api-api/src/apis/licenses_api.rs index bb15d205c..2c4907223 100644 --- a/crates/bitwarden-api-api/src/apis/licenses_api.rs +++ b/crates/bitwarden-api-api/src/apis/licenses_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`licenses_organization_id_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -31,9 +32,9 @@ pub async fn licenses_organization_id_get( configuration: &configuration::Configuration, id: &str, self_hosted_organization_license_request_model: Option< - crate::models::SelfHostedOrganizationLicenseRequestModel, + models::SelfHostedOrganizationLicenseRequestModel, >, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -41,7 +42,7 @@ pub async fn licenses_organization_id_get( let local_var_uri_str = format!( "{}/licenses/organization/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -80,7 +81,7 @@ pub async fn licenses_user_id_get( configuration: &configuration::Configuration, id: &str, key: Option<&str>, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -88,7 +89,7 @@ pub async fn licenses_user_id_get( let local_var_uri_str = format!( "{}/licenses/user/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); diff --git a/crates/bitwarden-api-api/src/apis/misc_api.rs b/crates/bitwarden-api-api/src/apis/misc_api.rs index 013e74577..1468eb6f2 100644 --- a/crates/bitwarden-api-api/src/apis/misc_api.rs +++ b/crates/bitwarden-api-api/src/apis/misc_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`bitpay_invoice_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -29,7 +30,7 @@ pub enum SetupPaymentPostError { pub async fn bitpay_invoice_post( configuration: &configuration::Configuration, - bit_pay_invoice_request_model: Option, + bit_pay_invoice_request_model: Option, ) -> Result> { let local_var_configuration = configuration; 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 d27be50de..946b79da0 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 @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_org_id_auth_requests_deny_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -38,7 +39,7 @@ pub async fn organizations_org_id_auth_requests_deny_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, bulk_deny_admin_auth_request_request_model: Option< - crate::models::BulkDenyAdminAuthRequestRequestModel, + models::BulkDenyAdminAuthRequestRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -86,7 +87,7 @@ pub async fn organizations_org_id_auth_requests_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, ) -> Result< - crate::models::PendingOrganizationAuthRequestResponseModelListResponseModel, + models::PendingOrganizationAuthRequestResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -133,9 +134,7 @@ pub async fn organizations_org_id_auth_requests_request_id_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, request_id: uuid::Uuid, - admin_auth_request_update_request_model: Option< - crate::models::AdminAuthRequestUpdateRequestModel, - >, + admin_auth_request_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; 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 0b8eeacd3..b8c2c959d 100644 --- a/crates/bitwarden-api-api/src/apis/organization_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_billing_api.rs @@ -9,9 +9,17 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; + +/// struct for typed errors of method [`organizations_organization_id_billing_get`] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(untagged)] +pub enum OrganizationsOrganizationIdBillingGetError { + UnknownValue(serde_json::Value), +} /// struct for typed errors of method [`organizations_organization_id_billing_metadata_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -20,6 +28,50 @@ pub enum OrganizationsOrganizationIdBillingMetadataGetError { UnknownValue(serde_json::Value), } +pub async fn organizations_organization_id_billing_get( + configuration: &configuration::Configuration, + organization_id: uuid::Uuid, +) -> Result> { + let local_var_configuration = configuration; + + let local_var_client = &local_var_configuration.client; + + let local_var_uri_str = format!( + "{}/organizations/{organizationId}/billing", + local_var_configuration.base_path, + organizationId = crate::apis::urlencode(organization_id.to_string()) + ); + let mut local_var_req_builder = + local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + + if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { + local_var_req_builder = + local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + } + if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { + local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); + }; + + let local_var_req = local_var_req_builder.build()?; + let local_var_resp = local_var_client.execute(local_var_req).await?; + + let local_var_status = local_var_resp.status(); + let local_var_content = local_var_resp.text().await?; + + if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + serde_json::from_str(&local_var_content).map_err(Error::from) + } else { + let local_var_entity: Option = + serde_json::from_str(&local_var_content).ok(); + let local_var_error = ResponseContent { + status: local_var_status, + content: local_var_content, + entity: local_var_entity, + }; + Err(Error::ResponseError(local_var_error)) + } +} + pub async fn organizations_organization_id_billing_metadata_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, 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 ee75716dc..ca65dd754 100644 --- a/crates/bitwarden-api-api/src/apis/organization_connections_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_connections_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_connections_enabled_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -191,11 +192,9 @@ pub async fn organizations_connections_organization_connection_id_delete_post( pub async fn organizations_connections_organization_connection_id_put( configuration: &configuration::Configuration, organization_connection_id: uuid::Uuid, - organization_connection_request_model: Option< - crate::models::OrganizationConnectionRequestModel, - >, + organization_connection_request_model: Option, ) -> Result< - crate::models::OrganizationConnectionResponseModel, + models::OrganizationConnectionResponseModel, Error, > { let local_var_configuration = configuration; @@ -242,9 +241,9 @@ pub async fn organizations_connections_organization_connection_id_put( pub async fn organizations_connections_organization_id_type_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, - r#type: crate::models::OrganizationConnectionType, + r#type: models::OrganizationConnectionType, ) -> Result< - crate::models::OrganizationConnectionResponseModel, + models::OrganizationConnectionResponseModel, Error, > { let local_var_configuration = configuration; @@ -285,13 +284,8 @@ pub async fn organizations_connections_organization_id_type_get( pub async fn organizations_connections_post( configuration: &configuration::Configuration, - organization_connection_request_model: Option< - crate::models::OrganizationConnectionRequestModel, - >, -) -> Result< - crate::models::OrganizationConnectionResponseModel, - Error, -> { + organization_connection_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 c55e95f2a..5d3f87055 100644 --- a/crates/bitwarden-api-api/src/apis/organization_domain_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_domain_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_domain_sso_details_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -65,10 +66,10 @@ pub enum OrganizationsOrgIdDomainPostError { pub async fn organizations_domain_sso_details_post( configuration: &configuration::Configuration, organization_domain_sso_details_request_model: Option< - crate::models::OrganizationDomainSsoDetailsRequestModel, + models::OrganizationDomainSsoDetailsRequestModel, >, ) -> Result< - crate::models::OrganizationDomainSsoDetailsResponseModel, + models::OrganizationDomainSsoDetailsResponseModel, Error, > { let local_var_configuration = configuration; @@ -116,7 +117,7 @@ pub async fn organizations_org_id_domain_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, ) -> Result< - crate::models::OrganizationDomainResponseModelListResponseModel, + models::OrganizationDomainResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -209,8 +210,7 @@ pub async fn organizations_org_id_domain_id_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -302,10 +302,8 @@ pub async fn organizations_org_id_domain_id_verify_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, -) -> Result< - crate::models::OrganizationDomainResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -350,9 +348,8 @@ pub async fn organizations_org_id_domain_id_verify_post( pub async fn organizations_org_id_domain_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_domain_request_model: Option, -) -> Result> -{ + organization_domain_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 0cc593f3a..e224c7b86 100644 --- a/crates/bitwarden-api-api/src/apis/organization_export_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_export_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_organization_id_export_get`] #[derive(Debug, Clone, Serialize, Deserialize)] 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 e3f1ccf24..dbf9c0f8c 100644 --- a/crates/bitwarden-api-api/src/apis/organization_sponsorships_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_sponsorships_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organization_sponsorship_redeem_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -91,7 +92,7 @@ pub async fn organization_sponsorship_redeem_post( configuration: &configuration::Configuration, sponsorship_token: Option<&str>, organization_sponsorship_redeem_request_model: Option< - crate::models::OrganizationSponsorshipRedeemRequestModel, + models::OrganizationSponsorshipRedeemRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -232,7 +233,7 @@ pub async fn organization_sponsorship_sponsoring_org_id_families_for_enterprise_ configuration: &configuration::Configuration, sponsoring_org_id: uuid::Uuid, organization_sponsorship_create_request_model: Option< - crate::models::OrganizationSponsorshipCreateRequestModel, + models::OrganizationSponsorshipCreateRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -459,10 +460,10 @@ pub async fn organization_sponsorship_sponsoring_organization_id_delete_post( pub async fn organization_sponsorship_sync_post( configuration: &configuration::Configuration, organization_sponsorship_sync_request_model: Option< - crate::models::OrganizationSponsorshipSyncRequestModel, + models::OrganizationSponsorshipSyncRequestModel, >, ) -> Result< - crate::models::OrganizationSponsorshipSyncResponseModel, + models::OrganizationSponsorshipSyncResponseModel, Error, > { let local_var_configuration = configuration; 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 4ba27f2b1..3ede841fd 100644 --- a/crates/bitwarden-api-api/src/apis/organization_users_api.rs +++ b/crates/bitwarden-api-api/src/apis/organization_users_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_org_id_users_confirm_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -230,10 +231,10 @@ pub async fn organizations_org_id_users_confirm_post( configuration: &configuration::Configuration, org_id: &str, organization_user_bulk_confirm_request_model: Option< - crate::models::OrganizationUserBulkConfirmRequestModel, + models::OrganizationUserBulkConfirmRequestModel, >, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -243,7 +244,7 @@ pub async fn organizations_org_id_users_confirm_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/confirm", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -281,9 +282,9 @@ pub async fn organizations_org_id_users_confirm_post( pub async fn organizations_org_id_users_delete( configuration: &configuration::Configuration, org_id: &str, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -293,7 +294,7 @@ pub async fn organizations_org_id_users_delete( let local_var_uri_str = format!( "{}/organizations/{orgId}/users", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -330,9 +331,9 @@ pub async fn organizations_org_id_users_delete( pub async fn organizations_org_id_users_delete_post( configuration: &configuration::Configuration, org_id: &str, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -342,7 +343,7 @@ pub async fn organizations_org_id_users_delete_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/delete", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -379,7 +380,7 @@ pub async fn organizations_org_id_users_delete_post( pub async fn organizations_org_id_users_enable_secrets_manager_patch( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -425,7 +426,7 @@ pub async fn organizations_org_id_users_enable_secrets_manager_patch( pub async fn organizations_org_id_users_enable_secrets_manager_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -474,7 +475,7 @@ pub async fn organizations_org_id_users_get( include_groups: Option, include_collections: Option, ) -> Result< - crate::models::OrganizationUserUserDetailsResponseModelListResponseModel, + models::OrganizationUserUserDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -529,9 +530,7 @@ pub async fn organizations_org_id_users_id_confirm_post( configuration: &configuration::Configuration, org_id: &str, id: &str, - organization_user_confirm_request_model: Option< - crate::models::OrganizationUserConfirmRequestModel, - >, + organization_user_confirm_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -540,8 +539,8 @@ pub async fn organizations_org_id_users_id_confirm_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/confirm", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -587,8 +586,8 @@ pub async fn organizations_org_id_users_id_delete( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -633,8 +632,8 @@ pub async fn organizations_org_id_users_id_delete_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/delete", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -672,10 +671,8 @@ pub async fn organizations_org_id_users_id_get( id: &str, org_id: &str, include_groups: Option, -) -> Result< - crate::models::OrganizationUserDetailsResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -683,8 +680,8 @@ pub async fn organizations_org_id_users_id_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()), - orgId = crate::apis::urlencode(org_id.to_string()) + id = crate::apis::urlencode(id), + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -733,8 +730,8 @@ pub async fn organizations_org_id_users_id_groups_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/groups", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -771,9 +768,7 @@ pub async fn organizations_org_id_users_id_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - organization_user_update_request_model: Option< - crate::models::OrganizationUserUpdateRequestModel, - >, + organization_user_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -821,9 +816,7 @@ pub async fn organizations_org_id_users_id_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, id: uuid::Uuid, - organization_user_update_request_model: Option< - crate::models::OrganizationUserUpdateRequestModel, - >, + organization_user_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -879,8 +872,8 @@ pub async fn organizations_org_id_users_id_reinvite_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/reinvite", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -918,7 +911,7 @@ pub async fn organizations_org_id_users_id_reset_password_details_get( org_id: &str, id: &str, ) -> Result< - crate::models::OrganizationUserResetPasswordDetailsResponseModel, + models::OrganizationUserResetPasswordDetailsResponseModel, Error, > { let local_var_configuration = configuration; @@ -928,8 +921,8 @@ pub async fn organizations_org_id_users_id_reset_password_details_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/reset-password-details", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -967,7 +960,7 @@ pub async fn organizations_org_id_users_id_reset_password_put( org_id: &str, id: &str, organization_user_reset_password_request_model: Option< - crate::models::OrganizationUserResetPasswordRequestModel, + models::OrganizationUserResetPasswordRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -977,8 +970,8 @@ pub async fn organizations_org_id_users_id_reset_password_put( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/{id}/reset-password", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()), - id = crate::apis::urlencode(id.to_string()) + orgId = crate::apis::urlencode(org_id), + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -1200,9 +1193,7 @@ pub async fn organizations_org_id_users_id_revoke_put( pub async fn organizations_org_id_users_invite_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_invite_request_model: Option< - crate::models::OrganizationUserInviteRequestModel, - >, + organization_user_invite_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1250,7 +1241,7 @@ pub async fn organizations_org_id_users_organization_user_id_accept_init_post( org_id: uuid::Uuid, organization_user_id: uuid::Uuid, organization_user_accept_init_request_model: Option< - crate::models::OrganizationUserAcceptInitRequestModel, + models::OrganizationUserAcceptInitRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1300,9 +1291,7 @@ pub async fn organizations_org_id_users_organization_user_id_accept_post( configuration: &configuration::Configuration, org_id: uuid::Uuid, organization_user_id: uuid::Uuid, - organization_user_accept_request_model: Option< - crate::models::OrganizationUserAcceptRequestModel, - >, + organization_user_accept_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1349,9 +1338,9 @@ pub async fn organizations_org_id_users_organization_user_id_accept_post( pub async fn organizations_org_id_users_public_keys_post( configuration: &configuration::Configuration, org_id: &str, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserPublicKeyResponseModelListResponseModel, + models::OrganizationUserPublicKeyResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1361,7 +1350,7 @@ pub async fn organizations_org_id_users_public_keys_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/public-keys", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1398,9 +1387,9 @@ pub async fn organizations_org_id_users_public_keys_post( pub async fn organizations_org_id_users_reinvite_post( configuration: &configuration::Configuration, org_id: &str, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1410,7 +1399,7 @@ pub async fn organizations_org_id_users_reinvite_post( let local_var_uri_str = format!( "{}/organizations/{orgId}/users/reinvite", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1447,9 +1436,9 @@ pub async fn organizations_org_id_users_reinvite_post( pub async fn organizations_org_id_users_restore_patch( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1496,9 +1485,9 @@ pub async fn organizations_org_id_users_restore_patch( pub async fn organizations_org_id_users_restore_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1545,9 +1534,9 @@ pub async fn organizations_org_id_users_restore_put( pub async fn organizations_org_id_users_revoke_patch( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1594,9 +1583,9 @@ pub async fn organizations_org_id_users_revoke_patch( pub async fn organizations_org_id_users_revoke_put( configuration: &configuration::Configuration, org_id: uuid::Uuid, - organization_user_bulk_request_model: Option, + organization_user_bulk_request_model: Option, ) -> Result< - crate::models::OrganizationUserBulkResponseModelListResponseModel, + models::OrganizationUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -1645,7 +1634,7 @@ pub async fn organizations_org_id_users_user_id_reset_password_enrollment_put( org_id: uuid::Uuid, user_id: uuid::Uuid, organization_user_reset_password_enrollment_request_model: Option< - crate::models::OrganizationUserResetPasswordEnrollmentRequestModel, + models::OrganizationUserResetPasswordEnrollmentRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/organizations_api.rs b/crates/bitwarden-api-api/src/apis/organizations_api.rs index 0cddda72b..026d37b10 100644 --- a/crates/bitwarden-api-api/src/apis/organizations_api.rs +++ b/crates/bitwarden-api-api/src/apis/organizations_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -34,13 +35,6 @@ pub enum OrganizationsIdApiKeyPostError { UnknownValue(serde_json::Value), } -/// struct for typed errors of method [`organizations_id_billing_get`] -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(untagged)] -pub enum OrganizationsIdBillingGetError { - UnknownValue(serde_json::Value), -} - /// struct for typed errors of method [`organizations_id_billing_status_get`] #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] @@ -76,6 +70,13 @@ pub enum OrganizationsIdDeletePostError { UnknownValue(serde_json::Value), } +/// struct for typed errors of method [`organizations_id_delete_recover_token_post`] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(untagged)] +pub enum OrganizationsIdDeleteRecoverTokenPostError { + UnknownValue(serde_json::Value), +} + /// struct for typed errors of method [`organizations_id_enable_collection_enhancements_post`] #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] @@ -267,10 +268,8 @@ pub enum OrganizationsPostError { pub async fn organizations_get( configuration: &configuration::Configuration, -) -> Result< - crate::models::ProfileOrganizationResponseModelListResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -310,9 +309,9 @@ pub async fn organizations_get( pub async fn organizations_id_api_key_information_type_get( configuration: &configuration::Configuration, id: uuid::Uuid, - r#type: crate::models::OrganizationApiKeyType, + r#type: models::OrganizationApiKeyType, ) -> Result< - crate::models::OrganizationApiKeyInformationListResponseModel, + models::OrganizationApiKeyInformationListResponseModel, Error, > { let local_var_configuration = configuration; @@ -354,8 +353,8 @@ pub async fn organizations_id_api_key_information_type_get( pub async fn organizations_id_api_key_post( configuration: &configuration::Configuration, id: &str, - organization_api_key_request_model: Option, -) -> Result> { + organization_api_key_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -363,7 +362,7 @@ pub async fn organizations_id_api_key_post( let local_var_uri_str = format!( "{}/organizations/{id}/api-key", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -397,16 +396,19 @@ pub async fn organizations_id_api_key_post( } } -pub async fn organizations_id_billing_get( +pub async fn organizations_id_billing_status_get( configuration: &configuration::Configuration, - id: &str, -) -> Result> { + id: uuid::Uuid, +) -> Result< + models::OrganizationBillingStatusResponseModel, + Error, +> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!( - "{}/organizations/{id}/billing", + "{}/organizations/{id}/billing-status", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()) ); @@ -430,7 +432,7 @@ pub async fn organizations_id_billing_get( if !local_var_status.is_client_error() && !local_var_status.is_server_error() { serde_json::from_str(&local_var_content).map_err(Error::from) } else { - let local_var_entity: Option = + let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); let local_var_error = ResponseContent { status: local_var_status, @@ -441,24 +443,22 @@ pub async fn organizations_id_billing_get( } } -pub async fn organizations_id_billing_status_get( +pub async fn organizations_id_cancel_post( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result< - crate::models::OrganizationBillingStatusResponseModel, - Error, -> { + subscription_cancellation_request_model: Option, +) -> Result<(), Error> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!( - "{}/organizations/{id}/billing-status", + "{}/organizations/{id}/cancel", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()) ); let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = @@ -467,6 +467,7 @@ pub async fn organizations_id_billing_status_get( if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); }; + local_var_req_builder = local_var_req_builder.json(&subscription_cancellation_request_model); let local_var_req = local_var_req_builder.build()?; let local_var_resp = local_var_client.execute(local_var_req).await?; @@ -475,9 +476,9 @@ pub async fn organizations_id_billing_status_get( let local_var_content = local_var_resp.text().await?; if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - serde_json::from_str(&local_var_content).map_err(Error::from) + Ok(()) } else { - let local_var_entity: Option = + let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); let local_var_error = ResponseContent { status: local_var_status, @@ -488,24 +489,24 @@ pub async fn organizations_id_billing_status_get( } } -pub async fn organizations_id_cancel_post( +pub async fn organizations_id_collection_management_put( configuration: &configuration::Configuration, id: uuid::Uuid, - subscription_cancellation_request_model: Option< - crate::models::SubscriptionCancellationRequestModel, + organization_collection_management_update_request_model: Option< + models::OrganizationCollectionManagementUpdateRequestModel, >, -) -> Result<(), Error> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!( - "{}/organizations/{id}/cancel", + "{}/organizations/{id}/collection-management", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()) ); let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = @@ -514,7 +515,8 @@ pub async fn organizations_id_cancel_post( if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); }; - local_var_req_builder = local_var_req_builder.json(&subscription_cancellation_request_model); + local_var_req_builder = + local_var_req_builder.json(&organization_collection_management_update_request_model); let local_var_req = local_var_req_builder.build()?; let local_var_resp = local_var_client.execute(local_var_req).await?; @@ -523,9 +525,9 @@ pub async fn organizations_id_cancel_post( let local_var_content = local_var_resp.text().await?; if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - Ok(()) + serde_json::from_str(&local_var_content).map_err(Error::from) } else { - let local_var_entity: Option = + let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); let local_var_error = ResponseContent { status: local_var_status, @@ -536,27 +538,22 @@ pub async fn organizations_id_cancel_post( } } -pub async fn organizations_id_collection_management_put( +pub async fn organizations_id_delete( configuration: &configuration::Configuration, - id: uuid::Uuid, - organization_collection_management_update_request_model: Option< - crate::models::OrganizationCollectionManagementUpdateRequestModel, - >, -) -> Result< - crate::models::OrganizationResponseModel, - Error, -> { + id: &str, + secret_verification_request_model: Option, +) -> Result<(), Error> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!( - "{}/organizations/{id}/collection-management", + "{}/organizations/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = @@ -565,8 +562,7 @@ pub async fn organizations_id_collection_management_put( if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); }; - local_var_req_builder = - local_var_req_builder.json(&organization_collection_management_update_request_model); + local_var_req_builder = local_var_req_builder.json(&secret_verification_request_model); let local_var_req = local_var_req_builder.build()?; let local_var_resp = local_var_client.execute(local_var_req).await?; @@ -575,9 +571,9 @@ pub async fn organizations_id_collection_management_put( let local_var_content = local_var_resp.text().await?; if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - serde_json::from_str(&local_var_content).map_err(Error::from) + Ok(()) } else { - let local_var_entity: Option = + let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); let local_var_error = ResponseContent { status: local_var_status, @@ -588,22 +584,22 @@ pub async fn organizations_id_collection_management_put( } } -pub async fn organizations_id_delete( +pub async fn organizations_id_delete_post( configuration: &configuration::Configuration, id: &str, - secret_verification_request_model: Option, -) -> Result<(), Error> { + secret_verification_request_model: Option, +) -> Result<(), Error> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!( - "{}/organizations/{id}", + "{}/organizations/{id}/delete", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = - local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); + local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = @@ -623,7 +619,7 @@ pub async fn organizations_id_delete( if !local_var_status.is_client_error() && !local_var_status.is_server_error() { Ok(()) } else { - let local_var_entity: Option = + let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); let local_var_error = ResponseContent { status: local_var_status, @@ -634,17 +630,19 @@ pub async fn organizations_id_delete( } } -pub async fn organizations_id_delete_post( +pub async fn organizations_id_delete_recover_token_post( configuration: &configuration::Configuration, - id: &str, - secret_verification_request_model: Option, -) -> Result<(), Error> { + id: uuid::Uuid, + organization_verify_delete_recover_request_model: Option< + models::OrganizationVerifyDeleteRecoverRequestModel, + >, +) -> Result<(), Error> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!( - "{}/organizations/{id}/delete", + "{}/organizations/{id}/delete-recover-token", local_var_configuration.base_path, id = crate::apis::urlencode(id.to_string()) ); @@ -658,7 +656,8 @@ pub async fn organizations_id_delete_post( if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); }; - local_var_req_builder = local_var_req_builder.json(&secret_verification_request_model); + local_var_req_builder = + local_var_req_builder.json(&organization_verify_delete_recover_request_model); let local_var_req = local_var_req_builder.build()?; let local_var_resp = local_var_client.execute(local_var_req).await?; @@ -669,7 +668,7 @@ pub async fn organizations_id_delete_post( if !local_var_status.is_client_error() && !local_var_status.is_server_error() { Ok(()) } else { - let local_var_entity: Option = + let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); let local_var_error = ResponseContent { status: local_var_status, @@ -727,7 +726,7 @@ pub async fn organizations_id_enable_collection_enhancements_post( pub async fn organizations_id_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -735,7 +734,7 @@ pub async fn organizations_id_get( let local_var_uri_str = format!( "{}/organizations/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -771,9 +770,7 @@ pub async fn organizations_id_get( pub async fn organizations_id_import_post( configuration: &configuration::Configuration, id: &str, - import_organization_users_request_model: Option< - crate::models::ImportOrganizationUsersRequestModel, - >, + import_organization_users_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -782,7 +779,7 @@ pub async fn organizations_id_import_post( let local_var_uri_str = format!( "{}/organizations/{id}/import", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -819,7 +816,7 @@ pub async fn organizations_id_import_post( pub async fn organizations_id_keys_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -827,7 +824,7 @@ pub async fn organizations_id_keys_get( let local_var_uri_str = format!( "{}/organizations/{id}/keys", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -863,8 +860,8 @@ pub async fn organizations_id_keys_get( pub async fn organizations_id_keys_post( configuration: &configuration::Configuration, id: &str, - organization_keys_request_model: Option, -) -> Result> { + organization_keys_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -872,7 +869,7 @@ pub async fn organizations_id_keys_post( let local_var_uri_str = format!( "{}/organizations/{id}/keys", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -917,7 +914,7 @@ pub async fn organizations_id_leave_post( let local_var_uri_str = format!( "{}/organizations/{id}/leave", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -952,9 +949,9 @@ pub async fn organizations_id_leave_post( pub async fn organizations_id_license_get( configuration: &configuration::Configuration, - id: &str, + id: uuid::Uuid, installation_id: Option, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1001,8 +998,8 @@ pub async fn organizations_id_license_get( pub async fn organizations_id_payment_post( configuration: &configuration::Configuration, - id: &str, - payment_request_model: Option, + id: uuid::Uuid, + payment_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1048,8 +1045,8 @@ pub async fn organizations_id_payment_post( pub async fn organizations_id_post( configuration: &configuration::Configuration, id: &str, - organization_update_request_model: Option, -) -> Result> { + organization_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1057,7 +1054,7 @@ pub async fn organizations_id_post( let local_var_uri_str = format!( "{}/organizations/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1094,10 +1091,7 @@ pub async fn organizations_id_post( pub async fn organizations_id_public_key_get( configuration: &configuration::Configuration, id: &str, -) -> Result< - crate::models::OrganizationPublicKeyResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1105,7 +1099,7 @@ pub async fn organizations_id_public_key_get( let local_var_uri_str = format!( "{}/organizations/{id}/public-key", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -1141,8 +1135,8 @@ pub async fn organizations_id_public_key_get( pub async fn organizations_id_put( configuration: &configuration::Configuration, id: &str, - organization_update_request_model: Option, -) -> Result> { + organization_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1150,7 +1144,7 @@ pub async fn organizations_id_put( let local_var_uri_str = format!( "{}/organizations/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -1186,7 +1180,7 @@ pub async fn organizations_id_put( pub async fn organizations_id_reinstate_post( configuration: &configuration::Configuration, - id: &str, + id: uuid::Uuid, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1231,8 +1225,8 @@ pub async fn organizations_id_reinstate_post( pub async fn organizations_id_rotate_api_key_post( configuration: &configuration::Configuration, id: &str, - organization_api_key_request_model: Option, -) -> Result> { + organization_api_key_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1240,7 +1234,7 @@ pub async fn organizations_id_rotate_api_key_post( let local_var_uri_str = format!( "{}/organizations/{id}/rotate-api-key", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1276,9 +1270,9 @@ pub async fn organizations_id_rotate_api_key_post( pub async fn organizations_id_seat_post( configuration: &configuration::Configuration, - id: &str, - organization_seat_request_model: Option, -) -> Result> { + id: uuid::Uuid, + organization_seat_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1324,7 +1318,7 @@ pub async fn organizations_id_sm_subscription_post( configuration: &configuration::Configuration, id: uuid::Uuid, secrets_manager_subscription_update_request_model: Option< - crate::models::SecretsManagerSubscriptionUpdateRequestModel, + models::SecretsManagerSubscriptionUpdateRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1372,7 +1366,7 @@ pub async fn organizations_id_sm_subscription_post( pub async fn organizations_id_sso_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1416,8 +1410,8 @@ pub async fn organizations_id_sso_get( pub async fn organizations_id_sso_post( configuration: &configuration::Configuration, id: uuid::Uuid, - organization_sso_request_model: Option, -) -> Result> { + organization_sso_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1462,8 +1456,8 @@ pub async fn organizations_id_sso_post( pub async fn organizations_id_storage_post( configuration: &configuration::Configuration, id: &str, - storage_request_model: Option, -) -> Result> { + storage_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1471,7 +1465,7 @@ pub async fn organizations_id_storage_post( let local_var_uri_str = format!( "{}/organizations/{id}/storage", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -1508,11 +1502,9 @@ pub async fn organizations_id_storage_post( pub async fn organizations_id_subscribe_secrets_manager_post( configuration: &configuration::Configuration, id: uuid::Uuid, - secrets_manager_subscribe_request_model: Option< - crate::models::SecretsManagerSubscribeRequestModel, - >, + secrets_manager_subscribe_request_model: Option, ) -> Result< - crate::models::ProfileOrganizationResponseModel, + models::ProfileOrganizationResponseModel, Error, > { let local_var_configuration = configuration; @@ -1558,11 +1550,9 @@ pub async fn organizations_id_subscribe_secrets_manager_post( pub async fn organizations_id_subscription_get( configuration: &configuration::Configuration, - id: &str, -) -> Result< - crate::models::OrganizationSubscriptionResponseModel, - Error, -> { + id: uuid::Uuid, +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1605,9 +1595,9 @@ pub async fn organizations_id_subscription_get( pub async fn organizations_id_subscription_post( configuration: &configuration::Configuration, - id: &str, + id: uuid::Uuid, organization_subscription_update_request_model: Option< - crate::models::OrganizationSubscriptionUpdateRequestModel, + models::OrganizationSubscriptionUpdateRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1654,8 +1644,8 @@ pub async fn organizations_id_subscription_post( pub async fn organizations_id_tax_get( configuration: &configuration::Configuration, - id: &str, -) -> Result> { + id: uuid::Uuid, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1698,10 +1688,8 @@ pub async fn organizations_id_tax_get( pub async fn organizations_id_tax_put( configuration: &configuration::Configuration, - id: &str, - expanded_tax_info_update_request_model: Option< - crate::models::ExpandedTaxInfoUpdateRequestModel, - >, + id: uuid::Uuid, + expanded_tax_info_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1746,9 +1734,9 @@ pub async fn organizations_id_tax_put( pub async fn organizations_id_upgrade_post( configuration: &configuration::Configuration, - id: &str, - organization_upgrade_request_model: Option, -) -> Result> { + id: uuid::Uuid, + organization_upgrade_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1792,10 +1780,8 @@ pub async fn organizations_id_upgrade_post( pub async fn organizations_id_verify_bank_post( configuration: &configuration::Configuration, - id: &str, - organization_verify_bank_request_model: Option< - crate::models::OrganizationVerifyBankRequestModel, - >, + id: uuid::Uuid, + organization_verify_bank_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1842,7 +1828,7 @@ pub async fn organizations_identifier_auto_enroll_status_get( configuration: &configuration::Configuration, identifier: &str, ) -> Result< - crate::models::OrganizationAutoEnrollStatusResponseModel, + models::OrganizationAutoEnrollStatusResponseModel, Error, > { let local_var_configuration = configuration; @@ -1852,7 +1838,7 @@ pub async fn organizations_identifier_auto_enroll_status_get( let local_var_uri_str = format!( "{}/organizations/{identifier}/auto-enroll-status", local_var_configuration.base_path, - identifier = crate::apis::urlencode(identifier.to_string()) + identifier = crate::apis::urlencode(identifier) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -1887,8 +1873,8 @@ pub async fn organizations_identifier_auto_enroll_status_get( pub async fn organizations_post( configuration: &configuration::Configuration, - organization_create_request_model: Option, -) -> Result> { + organization_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/plans_api.rs b/crates/bitwarden-api-api/src/apis/plans_api.rs index e0430ac66..6f3b1cced 100644 --- a/crates/bitwarden-api-api/src/apis/plans_api.rs +++ b/crates/bitwarden-api-api/src/apis/plans_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`plans_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -29,7 +30,7 @@ pub enum PlansSalesTaxRatesGetError { pub async fn plans_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -67,8 +68,7 @@ pub async fn plans_get( pub async fn plans_sales_tax_rates_get( configuration: &configuration::Configuration, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/policies_api.rs b/crates/bitwarden-api-api/src/apis/policies_api.rs index 1ac26b251..131dbb127 100644 --- a/crates/bitwarden-api-api/src/apis/policies_api.rs +++ b/crates/bitwarden-api-api/src/apis/policies_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_org_id_policies_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -58,10 +59,8 @@ pub enum OrganizationsOrgIdPoliciesTypePutError { pub async fn organizations_org_id_policies_get( configuration: &configuration::Configuration, org_id: &str, -) -> Result< - crate::models::PolicyResponseModelListResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -69,7 +68,7 @@ pub async fn organizations_org_id_policies_get( let local_var_uri_str = format!( "{}/organizations/{orgId}/policies", local_var_configuration.base_path, - orgId = crate::apis::urlencode(org_id.to_string()) + orgId = crate::apis::urlencode(org_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -107,7 +106,7 @@ pub async fn organizations_org_id_policies_invited_user_get( org_id: uuid::Uuid, user_id: Option, ) -> Result< - crate::models::PolicyResponseModelListResponseModel, + models::PolicyResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -157,10 +156,7 @@ pub async fn organizations_org_id_policies_invited_user_get( pub async fn organizations_org_id_policies_master_password_get( configuration: &configuration::Configuration, org_id: uuid::Uuid, -) -> Result< - crate::models::PolicyResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -208,7 +204,7 @@ pub async fn organizations_org_id_policies_token_get( token: Option<&str>, organization_user_id: Option, ) -> Result< - crate::models::PolicyResponseModelListResponseModel, + models::PolicyResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -267,12 +263,12 @@ pub async fn organizations_org_id_policies_type_get( configuration: &configuration::Configuration, org_id: &str, r#type: i32, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; - let local_var_uri_str = format!("{}/organizations/{orgId}/policies/{type}", local_var_configuration.base_path, orgId=crate::apis::urlencode(org_id.to_string()), type=r#type.to_string()); + let local_var_uri_str = format!("{}/organizations/{orgId}/policies/{type}", local_var_configuration.base_path, orgId=crate::apis::urlencode(org_id), type=r#type); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -308,13 +304,13 @@ pub async fn organizations_org_id_policies_type_put( configuration: &configuration::Configuration, org_id: &str, r#type: i32, - policy_request_model: Option, -) -> Result> { + policy_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; - let local_var_uri_str = format!("{}/organizations/{orgId}/policies/{type}", local_var_configuration.base_path, orgId=crate::apis::urlencode(org_id.to_string()), type=r#type.to_string()); + let local_var_uri_str = format!("{}/organizations/{orgId}/policies/{type}", local_var_configuration.base_path, orgId=crate::apis::urlencode(org_id), type=r#type); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); diff --git a/crates/bitwarden-api-api/src/apis/projects_api.rs b/crates/bitwarden-api-api/src/apis/projects_api.rs index 6ae106a22..5ba76f6b9 100644 --- a/crates/bitwarden-api-api/src/apis/projects_api.rs +++ b/crates/bitwarden-api-api/src/apis/projects_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_organization_id_projects_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -52,7 +53,7 @@ pub async fn organizations_organization_id_projects_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, ) -> Result< - crate::models::ProjectResponseModelListResponseModel, + models::ProjectResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -98,9 +99,8 @@ pub async fn organizations_organization_id_projects_get( pub async fn organizations_organization_id_projects_post( configuration: &configuration::Configuration, organization_id: uuid::Uuid, - project_create_request_model: Option, -) -> Result> -{ + project_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -145,8 +145,7 @@ pub async fn organizations_organization_id_projects_post( pub async fn projects_delete_post( configuration: &configuration::Configuration, uuid_colon_colon_uuid: Option>, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -187,7 +186,7 @@ pub async fn projects_delete_post( pub async fn projects_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -231,8 +230,8 @@ pub async fn projects_id_get( pub async fn projects_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - project_update_request_model: Option, -) -> Result> { + project_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 13cb7ddb1..2c56c5759 100644 --- a/crates/bitwarden-api-api/src/apis/provider_billing_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_billing_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`providers_provider_id_billing_subscription_get`] #[derive(Debug, Clone, Serialize, Deserialize)] 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 be3959c91..2d34784e0 100644 --- a/crates/bitwarden-api-api/src/apis/provider_clients_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_clients_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`providers_provider_id_clients_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -30,9 +31,7 @@ pub enum ProvidersProviderIdClientsProviderOrganizationIdPutError { pub async fn providers_provider_id_clients_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - create_client_organization_request_body: Option< - crate::models::CreateClientOrganizationRequestBody, - >, + create_client_organization_request_body: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -79,9 +78,7 @@ pub async fn providers_provider_id_clients_provider_organization_id_put( configuration: &configuration::Configuration, provider_id: uuid::Uuid, provider_organization_id: uuid::Uuid, - update_client_organization_request_body: Option< - crate::models::UpdateClientOrganizationRequestBody, - >, + update_client_organization_request_body: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; 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 8adabce2d..4ae80b17a 100644 --- a/crates/bitwarden-api-api/src/apis/provider_organizations_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_organizations_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`providers_provider_id_organizations_add_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -51,9 +52,7 @@ pub enum ProvidersProviderIdOrganizationsPostError { pub async fn providers_provider_id_organizations_add_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_organization_add_request_model: Option< - crate::models::ProviderOrganizationAddRequestModel, - >, + provider_organization_add_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -100,7 +99,7 @@ pub async fn providers_provider_id_organizations_get( configuration: &configuration::Configuration, provider_id: uuid::Uuid, ) -> Result< - crate::models::ProviderOrganizationOrganizationDetailsResponseModelListResponseModel, + models::ProviderOrganizationOrganizationDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -239,10 +238,10 @@ pub async fn providers_provider_id_organizations_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, provider_organization_create_request_model: Option< - crate::models::ProviderOrganizationCreateRequestModel, + models::ProviderOrganizationCreateRequestModel, >, ) -> Result< - crate::models::ProviderOrganizationResponseModel, + models::ProviderOrganizationResponseModel, Error, > { let local_var_configuration = configuration; 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 caa014373..fb6a31f02 100644 --- a/crates/bitwarden-api-api/src/apis/provider_users_api.rs +++ b/crates/bitwarden-api-api/src/apis/provider_users_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`providers_provider_id_users_confirm_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -121,11 +122,9 @@ pub enum ProvidersProviderIdUsersReinvitePostError { pub async fn providers_provider_id_users_confirm_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_user_bulk_confirm_request_model: Option< - crate::models::ProviderUserBulkConfirmRequestModel, - >, + provider_user_bulk_confirm_request_model: Option, ) -> Result< - crate::models::ProviderUserBulkResponseModelListResponseModel, + models::ProviderUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -172,9 +171,9 @@ pub async fn providers_provider_id_users_confirm_post( pub async fn providers_provider_id_users_delete( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_user_bulk_request_model: Option, + provider_user_bulk_request_model: Option, ) -> Result< - crate::models::ProviderUserBulkResponseModelListResponseModel, + models::ProviderUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -221,9 +220,9 @@ pub async fn providers_provider_id_users_delete( pub async fn providers_provider_id_users_delete_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_user_bulk_request_model: Option, + provider_user_bulk_request_model: Option, ) -> Result< - crate::models::ProviderUserBulkResponseModelListResponseModel, + models::ProviderUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -271,7 +270,7 @@ pub async fn providers_provider_id_users_get( configuration: &configuration::Configuration, provider_id: uuid::Uuid, ) -> Result< - crate::models::ProviderUserUserDetailsResponseModelListResponseModel, + models::ProviderUserUserDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -318,7 +317,7 @@ pub async fn providers_provider_id_users_id_accept_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, id: uuid::Uuid, - provider_user_accept_request_model: Option, + provider_user_accept_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -366,7 +365,7 @@ pub async fn providers_provider_id_users_id_confirm_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, id: uuid::Uuid, - provider_user_confirm_request_model: Option, + provider_user_confirm_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -506,7 +505,7 @@ pub async fn providers_provider_id_users_id_get( configuration: &configuration::Configuration, provider_id: uuid::Uuid, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -552,7 +551,7 @@ pub async fn providers_provider_id_users_id_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, id: uuid::Uuid, - provider_user_update_request_model: Option, + provider_user_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -600,7 +599,7 @@ pub async fn providers_provider_id_users_id_put( configuration: &configuration::Configuration, provider_id: uuid::Uuid, id: uuid::Uuid, - provider_user_update_request_model: Option, + provider_user_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -693,7 +692,7 @@ pub async fn providers_provider_id_users_id_reinvite_post( pub async fn providers_provider_id_users_invite_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_user_invite_request_model: Option, + provider_user_invite_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -739,9 +738,9 @@ pub async fn providers_provider_id_users_invite_post( pub async fn providers_provider_id_users_public_keys_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_user_bulk_request_model: Option, + provider_user_bulk_request_model: Option, ) -> Result< - crate::models::ProviderUserPublicKeyResponseModelListResponseModel, + models::ProviderUserPublicKeyResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -788,9 +787,9 @@ pub async fn providers_provider_id_users_public_keys_post( pub async fn providers_provider_id_users_reinvite_post( configuration: &configuration::Configuration, provider_id: uuid::Uuid, - provider_user_bulk_request_model: Option, + provider_user_bulk_request_model: Option, ) -> Result< - crate::models::ProviderUserBulkResponseModelListResponseModel, + models::ProviderUserBulkResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/providers_api.rs b/crates/bitwarden-api-api/src/apis/providers_api.rs index 579ec0f93..2640b8e65 100644 --- a/crates/bitwarden-api-api/src/apis/providers_api.rs +++ b/crates/bitwarden-api-api/src/apis/providers_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`providers_id_delete`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -154,7 +155,7 @@ pub async fn providers_id_delete_recover_token_post( configuration: &configuration::Configuration, id: uuid::Uuid, provider_verify_delete_recover_request_model: Option< - crate::models::ProviderVerifyDeleteRecoverRequestModel, + models::ProviderVerifyDeleteRecoverRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -202,7 +203,7 @@ pub async fn providers_id_delete_recover_token_post( pub async fn providers_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -246,8 +247,8 @@ pub async fn providers_id_get( pub async fn providers_id_post( configuration: &configuration::Configuration, id: uuid::Uuid, - provider_update_request_model: Option, -) -> Result> { + provider_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -292,8 +293,8 @@ pub async fn providers_id_post( pub async fn providers_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - provider_update_request_model: Option, -) -> Result> { + provider_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -338,8 +339,8 @@ pub async fn providers_id_put( pub async fn providers_id_setup_post( configuration: &configuration::Configuration, id: uuid::Uuid, - provider_setup_request_model: Option, -) -> Result> { + provider_setup_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/push_api.rs b/crates/bitwarden-api-api/src/apis/push_api.rs index 570275bdc..b4ba50f03 100644 --- a/crates/bitwarden-api-api/src/apis/push_api.rs +++ b/crates/bitwarden-api-api/src/apis/push_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`push_add_organization_put`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -50,7 +51,7 @@ pub enum PushSendPostError { pub async fn push_add_organization_put( configuration: &configuration::Configuration, - push_update_request_model: Option, + push_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -94,7 +95,7 @@ pub async fn push_add_organization_put( pub async fn push_delete_organization_put( configuration: &configuration::Configuration, - push_update_request_model: Option, + push_update_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -138,7 +139,7 @@ pub async fn push_delete_organization_put( pub async fn push_delete_post( configuration: &configuration::Configuration, - push_device_request_model: Option, + push_device_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -179,7 +180,7 @@ pub async fn push_delete_post( pub async fn push_register_post( configuration: &configuration::Configuration, - push_registration_request_model: Option, + push_registration_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -220,7 +221,7 @@ pub async fn push_register_post( pub async fn push_send_post( configuration: &configuration::Configuration, - push_send_request_model: Option, + push_send_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/apis/secrets_api.rs b/crates/bitwarden-api-api/src/apis/secrets_api.rs index 02d4b8e85..2a521c688 100644 --- a/crates/bitwarden-api-api/src/apis/secrets_api.rs +++ b/crates/bitwarden-api-api/src/apis/secrets_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_organization_id_secrets_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -73,7 +74,7 @@ pub async fn organizations_organization_id_secrets_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, ) -> Result< - crate::models::SecretWithProjectsListResponseModel, + models::SecretWithProjectsListResponseModel, Error, > { let local_var_configuration = configuration; @@ -119,9 +120,8 @@ pub async fn organizations_organization_id_secrets_get( pub async fn organizations_organization_id_secrets_post( configuration: &configuration::Configuration, organization_id: uuid::Uuid, - secret_create_request_model: Option, -) -> Result> -{ + secret_create_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -167,10 +167,8 @@ pub async fn organizations_organization_id_secrets_sync_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, last_synced_date: Option, -) -> Result< - crate::models::SecretsSyncResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -218,10 +216,7 @@ pub async fn organizations_organization_id_secrets_sync_get( pub async fn projects_project_id_secrets_get( configuration: &configuration::Configuration, project_id: uuid::Uuid, -) -> Result< - crate::models::SecretWithProjectsListResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -265,8 +260,7 @@ pub async fn projects_project_id_secrets_get( pub async fn secrets_delete_post( configuration: &configuration::Configuration, uuid_colon_colon_uuid: Option>, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -306,9 +300,8 @@ pub async fn secrets_delete_post( pub async fn secrets_get_by_ids_post( configuration: &configuration::Configuration, - get_secrets_request_model: Option, -) -> Result> -{ + get_secrets_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -349,7 +342,7 @@ pub async fn secrets_get_by_ids_post( pub async fn secrets_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -393,8 +386,8 @@ pub async fn secrets_id_get( pub async fn secrets_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - secret_update_request_model: Option, -) -> Result> { + secret_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 d651ac32f..4d532fe84 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 @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`sm_events_service_accounts_service_account_id_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -27,7 +28,7 @@ pub async fn sm_events_service_accounts_service_account_id_get( end: Option, continuation_token: Option<&str>, ) -> Result< - crate::models::EventResponseModelListResponseModel, + models::EventResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; 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 5a5603da7..872f8db40 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 @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`sm_organization_id_export_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -30,7 +31,7 @@ pub enum SmOrganizationIdImportPostError { pub async fn sm_organization_id_export_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -74,7 +75,7 @@ pub async fn sm_organization_id_export_get( pub async fn sm_organization_id_import_post( configuration: &configuration::Configuration, organization_id: uuid::Uuid, - sm_import_request_model: Option, + sm_import_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; 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 175a76875..adb61b690 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 @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_licenses_self_hosted_id_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -46,7 +47,7 @@ pub async fn organizations_licenses_self_hosted_id_post( let local_var_uri_str = format!( "{}/organizations/licenses/self-hosted/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -93,7 +94,7 @@ pub async fn organizations_licenses_self_hosted_id_sync_post( let local_var_uri_str = format!( "{}/organizations/licenses/self-hosted/{id}/sync", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -133,8 +134,7 @@ pub async fn organizations_licenses_self_hosted_post( keys_period_encrypted_private_key: &str, license: std::path::PathBuf, collection_name: Option<&str>, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 60b8a6d28..89fc43b22 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 @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method /// [`organization_sponsorship_self_hosted_sponsoring_org_id_delete`] @@ -130,7 +131,7 @@ pub async fn organization_sponsorship_self_hosted_sponsoring_org_id_families_for configuration: &configuration::Configuration, sponsoring_org_id: uuid::Uuid, organization_sponsorship_create_request_model: Option< - crate::models::OrganizationSponsorshipCreateRequestModel, + models::OrganizationSponsorshipCreateRequestModel, >, ) -> Result<(), Error> { diff --git a/crates/bitwarden-api-api/src/apis/sends_api.rs b/crates/bitwarden-api-api/src/apis/sends_api.rs index 5a50e8aa3..0cc73b146 100644 --- a/crates/bitwarden-api-api/src/apis/sends_api.rs +++ b/crates/bitwarden-api-api/src/apis/sends_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`sends_access_id_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -107,7 +108,7 @@ pub enum SendsPostError { pub async fn sends_access_id_post( configuration: &configuration::Configuration, id: &str, - send_access_request_model: Option, + send_access_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -116,7 +117,7 @@ pub async fn sends_access_id_post( let local_var_uri_str = format!( "{}/sends/access/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -154,7 +155,7 @@ pub async fn sends_encoded_send_id_access_file_file_id_post( configuration: &configuration::Configuration, encoded_send_id: &str, file_id: &str, - send_access_request_model: Option, + send_access_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -163,8 +164,8 @@ pub async fn sends_encoded_send_id_access_file_file_id_post( let local_var_uri_str = format!( "{}/sends/{encodedSendId}/access/file/{fileId}", local_var_configuration.base_path, - encodedSendId = crate::apis::urlencode(encoded_send_id.to_string()), - fileId = crate::apis::urlencode(file_id.to_string()) + encodedSendId = crate::apis::urlencode(encoded_send_id), + fileId = crate::apis::urlencode(file_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -200,7 +201,7 @@ pub async fn sends_encoded_send_id_access_file_file_id_post( pub async fn sends_file_post( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -239,8 +240,8 @@ pub async fn sends_file_post( pub async fn sends_file_v2_post( configuration: &configuration::Configuration, - send_request_model: Option, -) -> Result> { + send_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -322,7 +323,7 @@ pub async fn sends_file_validate_azure_post( pub async fn sends_get( configuration: &configuration::Configuration, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -369,7 +370,7 @@ pub async fn sends_id_delete( let local_var_uri_str = format!( "{}/sends/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); @@ -406,7 +407,7 @@ pub async fn sends_id_file_file_id_get( configuration: &configuration::Configuration, id: &str, file_id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -414,8 +415,8 @@ pub async fn sends_id_file_file_id_get( let local_var_uri_str = format!( "{}/sends/{id}/file/{fileId}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()), - fileId = crate::apis::urlencode(file_id.to_string()) + id = crate::apis::urlencode(id), + fileId = crate::apis::urlencode(file_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -460,8 +461,8 @@ pub async fn sends_id_file_file_id_post( let local_var_uri_str = format!( "{}/sends/{id}/file/{fileId}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()), - fileId = crate::apis::urlencode(file_id.to_string()) + id = crate::apis::urlencode(id), + fileId = crate::apis::urlencode(file_id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -497,7 +498,7 @@ pub async fn sends_id_file_file_id_post( pub async fn sends_id_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -505,7 +506,7 @@ pub async fn sends_id_get( let local_var_uri_str = format!( "{}/sends/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -541,8 +542,8 @@ pub async fn sends_id_get( pub async fn sends_id_put( configuration: &configuration::Configuration, id: &str, - send_request_model: Option, -) -> Result> { + send_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -550,7 +551,7 @@ pub async fn sends_id_put( let local_var_uri_str = format!( "{}/sends/{id}", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -587,7 +588,7 @@ pub async fn sends_id_put( pub async fn sends_id_remove_password_put( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -595,7 +596,7 @@ pub async fn sends_id_remove_password_put( let local_var_uri_str = format!( "{}/sends/{id}/remove-password", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -630,8 +631,8 @@ pub async fn sends_id_remove_password_put( pub async fn sends_post( configuration: &configuration::Configuration, - send_request_model: Option, -) -> Result> { + send_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 47045b475..75b5f1329 100644 --- a/crates/bitwarden-api-api/src/apis/service_accounts_api.rs +++ b/crates/bitwarden-api-api/src/apis/service_accounts_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_organization_id_service_accounts_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -74,7 +75,7 @@ pub async fn organizations_organization_id_service_accounts_get( organization_id: uuid::Uuid, include_access_to_secrets: Option, ) -> Result< - crate::models::ServiceAccountSecretsDetailsResponseModelListResponseModel, + models::ServiceAccountSecretsDetailsResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -124,9 +125,9 @@ pub async fn organizations_organization_id_service_accounts_get( pub async fn organizations_organization_id_service_accounts_post( configuration: &configuration::Configuration, organization_id: uuid::Uuid, - service_account_create_request_model: Option, + service_account_create_request_model: Option, ) -> Result< - crate::models::ServiceAccountResponseModel, + models::ServiceAccountResponseModel, Error, > { let local_var_configuration = configuration; @@ -173,10 +174,8 @@ pub async fn organizations_organization_id_service_accounts_post( pub async fn service_accounts_delete_post( configuration: &configuration::Configuration, uuid_colon_colon_uuid: Option>, -) -> Result< - crate::models::BulkDeleteResponseModelListResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -221,7 +220,7 @@ pub async fn service_accounts_id_access_tokens_get( configuration: &configuration::Configuration, id: uuid::Uuid, ) -> Result< - crate::models::AccessTokenResponseModelListResponseModel, + models::AccessTokenResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -267,11 +266,9 @@ pub async fn service_accounts_id_access_tokens_get( pub async fn service_accounts_id_access_tokens_post( configuration: &configuration::Configuration, id: uuid::Uuid, - access_token_create_request_model: Option, -) -> Result< - crate::models::AccessTokenCreationResponseModel, - Error, -> { + access_token_create_request_model: Option, +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -316,7 +313,7 @@ pub async fn service_accounts_id_access_tokens_post( pub async fn service_accounts_id_access_tokens_revoke_post( configuration: &configuration::Configuration, id: uuid::Uuid, - revoke_access_tokens_request: Option, + revoke_access_tokens_request: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -362,7 +359,7 @@ pub async fn service_accounts_id_access_tokens_revoke_post( pub async fn service_accounts_id_get( configuration: &configuration::Configuration, id: uuid::Uuid, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -406,8 +403,8 @@ pub async fn service_accounts_id_get( pub async fn service_accounts_id_put( configuration: &configuration::Configuration, id: uuid::Uuid, - service_account_update_request_model: Option, -) -> Result> { + service_account_update_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/settings_api.rs b/crates/bitwarden-api-api/src/apis/settings_api.rs index 9384cd670..c4629e185 100644 --- a/crates/bitwarden-api-api/src/apis/settings_api.rs +++ b/crates/bitwarden-api-api/src/apis/settings_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`settings_domains_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -37,7 +38,7 @@ pub enum SettingsDomainsPutError { pub async fn settings_domains_get( configuration: &configuration::Configuration, excluded: Option, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -80,8 +81,8 @@ pub async fn settings_domains_get( pub async fn settings_domains_post( configuration: &configuration::Configuration, - update_domains_request_model: Option, -) -> Result> { + update_domains_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -121,8 +122,8 @@ pub async fn settings_domains_post( pub async fn settings_domains_put( configuration: &configuration::Configuration, - update_domains_request_model: Option, -) -> Result> { + update_domains_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/sync_api.rs b/crates/bitwarden-api-api/src/apis/sync_api.rs index 7d4ba1dce..796c0076d 100644 --- a/crates/bitwarden-api-api/src/apis/sync_api.rs +++ b/crates/bitwarden-api-api/src/apis/sync_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`sync_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -23,7 +24,7 @@ pub enum SyncGetError { pub async fn sync_get( configuration: &configuration::Configuration, exclude_domains: Option, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/trash_api.rs b/crates/bitwarden-api-api/src/apis/trash_api.rs index 5b8d7664e..744a97d3a 100644 --- a/crates/bitwarden-api-api/src/apis/trash_api.rs +++ b/crates/bitwarden-api-api/src/apis/trash_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`secrets_organization_id_trash_empty_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -83,10 +84,8 @@ pub async fn secrets_organization_id_trash_empty_post( pub async fn secrets_organization_id_trash_get( configuration: &configuration::Configuration, organization_id: uuid::Uuid, -) -> Result< - crate::models::SecretWithProjectsListResponseModel, - Error, -> { +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; 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 b1bb95037..298dcb486 100644 --- a/crates/bitwarden-api-api/src/apis/two_factor_api.rs +++ b/crates/bitwarden-api-api/src/apis/two_factor_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`organizations_id_two_factor_disable_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -233,11 +234,9 @@ pub enum TwoFactorYubikeyPutError { pub async fn organizations_id_two_factor_disable_post( configuration: &configuration::Configuration, id: &str, - two_factor_provider_request_model: Option, -) -> Result< - crate::models::TwoFactorProviderResponseModel, - Error, -> { + two_factor_provider_request_model: Option, +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -245,7 +244,7 @@ pub async fn organizations_id_two_factor_disable_post( let local_var_uri_str = format!( "{}/organizations/{id}/two-factor/disable", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -282,11 +281,9 @@ pub async fn organizations_id_two_factor_disable_post( pub async fn organizations_id_two_factor_disable_put( configuration: &configuration::Configuration, id: &str, - two_factor_provider_request_model: Option, -) -> Result< - crate::models::TwoFactorProviderResponseModel, - Error, -> { + two_factor_provider_request_model: Option, +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -294,7 +291,7 @@ pub async fn organizations_id_two_factor_disable_put( let local_var_uri_str = format!( "{}/organizations/{id}/two-factor/disable", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -331,8 +328,8 @@ pub async fn organizations_id_two_factor_disable_put( pub async fn organizations_id_two_factor_duo_post( configuration: &configuration::Configuration, id: &str, - update_two_factor_duo_request_model: Option, -) -> Result> { + update_two_factor_duo_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -340,7 +337,7 @@ pub async fn organizations_id_two_factor_duo_post( let local_var_uri_str = format!( "{}/organizations/{id}/two-factor/duo", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -377,8 +374,8 @@ pub async fn organizations_id_two_factor_duo_post( pub async fn organizations_id_two_factor_duo_put( configuration: &configuration::Configuration, id: &str, - update_two_factor_duo_request_model: Option, -) -> Result> { + update_two_factor_duo_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -386,7 +383,7 @@ pub async fn organizations_id_two_factor_duo_put( let local_var_uri_str = format!( "{}/organizations/{id}/two-factor/duo", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); @@ -424,7 +421,7 @@ pub async fn organizations_id_two_factor_get( configuration: &configuration::Configuration, id: &str, ) -> Result< - crate::models::TwoFactorProviderResponseModelListResponseModel, + models::TwoFactorProviderResponseModelListResponseModel, Error, > { let local_var_configuration = configuration; @@ -434,7 +431,7 @@ pub async fn organizations_id_two_factor_get( let local_var_uri_str = format!( "{}/organizations/{id}/two-factor", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); @@ -470,9 +467,8 @@ pub async fn organizations_id_two_factor_get( pub async fn organizations_id_two_factor_get_duo_post( configuration: &configuration::Configuration, id: &str, - secret_verification_request_model: Option, -) -> Result> -{ + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -480,7 +476,7 @@ pub async fn organizations_id_two_factor_get_duo_post( let local_var_uri_str = format!( "{}/organizations/{id}/two-factor/get-duo", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); @@ -517,12 +513,9 @@ pub async fn organizations_id_two_factor_get_duo_post( pub async fn two_factor_authenticator_post( configuration: &configuration::Configuration, update_two_factor_authenticator_request_model: Option< - crate::models::UpdateTwoFactorAuthenticatorRequestModel, + models::UpdateTwoFactorAuthenticatorRequestModel, >, -) -> Result< - crate::models::TwoFactorAuthenticatorResponseModel, - Error, -> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -567,10 +560,9 @@ pub async fn two_factor_authenticator_post( pub async fn two_factor_authenticator_put( configuration: &configuration::Configuration, update_two_factor_authenticator_request_model: Option< - crate::models::UpdateTwoFactorAuthenticatorRequestModel, + models::UpdateTwoFactorAuthenticatorRequestModel, >, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -614,9 +606,9 @@ pub async fn two_factor_authenticator_put( pub async fn two_factor_device_verification_settings_put( configuration: &configuration::Configuration, - device_verification_request_model: Option, + device_verification_request_model: Option, ) -> Result< - crate::models::DeviceVerificationResponseModel, + models::DeviceVerificationResponseModel, Error, > { let local_var_configuration = configuration; @@ -661,8 +653,8 @@ pub async fn two_factor_device_verification_settings_put( pub async fn two_factor_disable_post( configuration: &configuration::Configuration, - two_factor_provider_request_model: Option, -) -> Result> { + two_factor_provider_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -702,8 +694,8 @@ pub async fn two_factor_disable_post( pub async fn two_factor_disable_put( configuration: &configuration::Configuration, - two_factor_provider_request_model: Option, -) -> Result> { + two_factor_provider_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -743,8 +735,8 @@ pub async fn two_factor_disable_put( pub async fn two_factor_duo_post( configuration: &configuration::Configuration, - update_two_factor_duo_request_model: Option, -) -> Result> { + update_two_factor_duo_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -784,8 +776,8 @@ pub async fn two_factor_duo_post( pub async fn two_factor_duo_put( configuration: &configuration::Configuration, - update_two_factor_duo_request_model: Option, -) -> Result> { + update_two_factor_duo_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -825,8 +817,8 @@ pub async fn two_factor_duo_put( pub async fn two_factor_email_post( configuration: &configuration::Configuration, - update_two_factor_email_request_model: Option, -) -> Result> { + update_two_factor_email_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -866,8 +858,8 @@ pub async fn two_factor_email_post( pub async fn two_factor_email_put( configuration: &configuration::Configuration, - update_two_factor_email_request_model: Option, -) -> Result> { + update_two_factor_email_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -907,8 +899,7 @@ pub async fn two_factor_email_put( pub async fn two_factor_get( configuration: &configuration::Configuration, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -947,11 +938,9 @@ pub async fn two_factor_get( pub async fn two_factor_get_authenticator_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result< - crate::models::TwoFactorAuthenticatorResponseModel, - Error, -> { + secret_verification_request_model: Option, +) -> Result> +{ let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -995,7 +984,7 @@ pub async fn two_factor_get_authenticator_post( pub async fn two_factor_get_device_verification_settings_get( configuration: &configuration::Configuration, ) -> Result< - crate::models::DeviceVerificationResponseModel, + models::DeviceVerificationResponseModel, Error, > { let local_var_configuration = configuration; @@ -1039,8 +1028,8 @@ pub async fn two_factor_get_device_verification_settings_get( pub async fn two_factor_get_duo_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1080,8 +1069,8 @@ pub async fn two_factor_get_duo_post( pub async fn two_factor_get_email_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1121,8 +1110,8 @@ pub async fn two_factor_get_email_post( pub async fn two_factor_get_recover_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1165,8 +1154,8 @@ pub async fn two_factor_get_recover_post( pub async fn two_factor_get_webauthn_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1209,8 +1198,8 @@ pub async fn two_factor_get_webauthn_post( pub async fn two_factor_get_yubikey_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, -) -> Result> { + secret_verification_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1253,7 +1242,7 @@ pub async fn two_factor_get_yubikey_post( pub async fn two_factor_recover_post( configuration: &configuration::Configuration, - two_factor_recovery_request_model: Option, + two_factor_recovery_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1294,7 +1283,7 @@ pub async fn two_factor_recover_post( pub async fn two_factor_send_email_login_post( configuration: &configuration::Configuration, - two_factor_email_request_model: Option, + two_factor_email_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1338,7 +1327,7 @@ pub async fn two_factor_send_email_login_post( pub async fn two_factor_send_email_post( configuration: &configuration::Configuration, - two_factor_email_request_model: Option, + two_factor_email_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -1382,10 +1371,8 @@ pub async fn two_factor_send_email_post( pub async fn two_factor_webauthn_delete( configuration: &configuration::Configuration, - two_factor_web_authn_delete_request_model: Option< - crate::models::TwoFactorWebAuthnDeleteRequestModel, - >, -) -> Result> { + two_factor_web_authn_delete_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1425,8 +1412,8 @@ pub async fn two_factor_webauthn_delete( pub async fn two_factor_webauthn_post( configuration: &configuration::Configuration, - two_factor_web_authn_request_model: Option, -) -> Result> { + two_factor_web_authn_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1466,8 +1453,8 @@ pub async fn two_factor_webauthn_post( pub async fn two_factor_webauthn_put( configuration: &configuration::Configuration, - two_factor_web_authn_request_model: Option, -) -> Result> { + two_factor_web_authn_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1508,9 +1495,9 @@ pub async fn two_factor_webauthn_put( pub async fn two_factor_yubikey_post( configuration: &configuration::Configuration, update_two_factor_yubico_otp_request_model: Option< - crate::models::UpdateTwoFactorYubicoOtpRequestModel, + models::UpdateTwoFactorYubicoOtpRequestModel, >, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -1551,9 +1538,9 @@ pub async fn two_factor_yubikey_post( pub async fn two_factor_yubikey_put( configuration: &configuration::Configuration, update_two_factor_yubico_otp_request_model: Option< - crate::models::UpdateTwoFactorYubicoOtpRequestModel, + models::UpdateTwoFactorYubicoOtpRequestModel, >, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/crates/bitwarden-api-api/src/apis/users_api.rs b/crates/bitwarden-api-api/src/apis/users_api.rs index fd1803925..5297c1f76 100644 --- a/crates/bitwarden-api-api/src/apis/users_api.rs +++ b/crates/bitwarden-api-api/src/apis/users_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`users_id_public_key_get`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -23,7 +24,7 @@ pub enum UsersIdPublicKeyGetError { pub async fn users_id_public_key_get( configuration: &configuration::Configuration, id: &str, -) -> Result> { +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -31,7 +32,7 @@ pub async fn users_id_public_key_get( let local_var_uri_str = format!( "{}/users/{id}/public-key", local_var_configuration.base_path, - id = crate::apis::urlencode(id.to_string()) + id = crate::apis::urlencode(id) ); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); 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 8c269d783..b6b41b551 100644 --- a/crates/bitwarden-api-api/src/apis/web_authn_api.rs +++ b/crates/bitwarden-api-api/src/apis/web_authn_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`webauthn_assertion_options_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -57,9 +58,9 @@ pub enum WebauthnPutError { pub async fn webauthn_assertion_options_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result< - crate::models::WebAuthnLoginAssertionOptionsResponseModel, + models::WebAuthnLoginAssertionOptionsResponseModel, Error, > { let local_var_configuration = configuration; @@ -104,9 +105,9 @@ pub async fn webauthn_assertion_options_post( pub async fn webauthn_attestation_options_post( configuration: &configuration::Configuration, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result< - crate::models::WebAuthnCredentialCreateOptionsResponseModel, + models::WebAuthnCredentialCreateOptionsResponseModel, Error, > { let local_var_configuration = configuration; @@ -151,8 +152,7 @@ pub async fn webauthn_attestation_options_post( pub async fn webauthn_get( configuration: &configuration::Configuration, -) -> Result> -{ +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -192,7 +192,7 @@ pub async fn webauthn_get( pub async fn webauthn_id_delete_post( configuration: &configuration::Configuration, id: uuid::Uuid, - secret_verification_request_model: Option, + secret_verification_request_model: Option, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -238,7 +238,7 @@ pub async fn webauthn_id_delete_post( pub async fn webauthn_post( configuration: &configuration::Configuration, web_authn_login_credential_create_request_model: Option< - crate::models::WebAuthnLoginCredentialCreateRequestModel, + models::WebAuthnLoginCredentialCreateRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; @@ -282,7 +282,7 @@ pub async fn webauthn_post( pub async fn webauthn_put( configuration: &configuration::Configuration, web_authn_login_credential_update_request_model: Option< - crate::models::WebAuthnLoginCredentialUpdateRequestModel, + models::WebAuthnLoginCredentialUpdateRequestModel, >, ) -> Result<(), Error> { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-api/src/lib.rs b/crates/bitwarden-api-api/src/lib.rs index 73fa05abe..3cf407d12 100644 --- a/crates/bitwarden-api-api/src/lib.rs +++ b/crates/bitwarden-api-api/src/lib.rs @@ -1,10 +1,9 @@ -#![allow(warnings)] -#![allow(clippy::all)] - -#[macro_use] -extern crate serde_derive; -#[macro_use] -extern crate serde_repr; +#![allow(unused_imports, unused_variables, unused_mut, non_camel_case_types)] +#![allow( + clippy::too_many_arguments, + clippy::empty_docs, + clippy::to_string_in_format_args +)] extern crate reqwest; extern crate serde; diff --git a/crates/bitwarden-api-api/src/models/access_policy_request.rs b/crates/bitwarden-api-api/src/models/access_policy_request.rs index 81065c5b5..03ad36a40 100644 --- a/crates/bitwarden-api-api/src/models/access_policy_request.rs +++ b/crates/bitwarden-api-api/src/models/access_policy_request.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AccessPolicyRequest { #[serde(rename = "granteeId")] pub grantee_id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/access_token_create_request_model.rs b/crates/bitwarden-api-api/src/models/access_token_create_request_model.rs index 00a3dfa15..e04add642 100644 --- a/crates/bitwarden-api-api/src/models/access_token_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/access_token_create_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AccessTokenCreateRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/access_token_creation_response_model.rs b/crates/bitwarden-api-api/src/models/access_token_creation_response_model.rs index e5b91a94a..7cfb537d4 100644 --- a/crates/bitwarden-api-api/src/models/access_token_creation_response_model.rs +++ b/crates/bitwarden-api-api/src/models/access_token_creation_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AccessTokenCreationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/access_token_response_model.rs b/crates/bitwarden-api-api/src/models/access_token_response_model.rs index eb06b0108..24e3b9757 100644 --- a/crates/bitwarden-api-api/src/models/access_token_response_model.rs +++ b/crates/bitwarden-api-api/src/models/access_token_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AccessTokenResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/access_token_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/access_token_response_model_list_response_model.rs index 2b6fa6d82..7445aad20 100644 --- a/crates/bitwarden-api-api/src/models/access_token_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/access_token_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AccessTokenResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/admin_auth_request_update_request_model.rs b/crates/bitwarden-api-api/src/models/admin_auth_request_update_request_model.rs index b3629d3a5..91e28d30a 100644 --- a/crates/bitwarden-api-api/src/models/admin_auth_request_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/admin_auth_request_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AdminAuthRequestUpdateRequestModel { #[serde(rename = "encryptedUserKey", skip_serializing_if = "Option::is_none")] pub encrypted_user_key: Option, diff --git a/crates/bitwarden-api-api/src/models/algorithm.rs b/crates/bitwarden-api-api/src/models/algorithm.rs index 2c302de0a..6b1c4fb1c 100644 --- a/crates/bitwarden-api-api/src/models/algorithm.rs +++ b/crates/bitwarden-api-api/src/models/algorithm.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum Algorithm { RS1 = -65535, @@ -28,21 +41,21 @@ pub enum Algorithm { ES256 = -7, } -impl ToString for Algorithm { - fn to_string(&self) -> String { +impl std::fmt::Display for Algorithm { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::RS1 => String::from("-65535"), - Self::RS512 => String::from("-259"), - Self::RS384 => String::from("-258"), - Self::RS256 => String::from("-257"), - Self::ES256K => String::from("-47"), - Self::PS512 => String::from("-39"), - Self::PS384 => String::from("-38"), - Self::PS256 => String::from("-37"), - Self::ES512 => String::from("-36"), - Self::ES384 => String::from("-35"), - Self::EdDSA => String::from("-8"), - Self::ES256 => String::from("-7"), + Self::RS1 => write!(f, "-65535"), + Self::RS512 => write!(f, "-259"), + Self::RS384 => write!(f, "-258"), + Self::RS256 => write!(f, "-257"), + Self::ES256K => write!(f, "-47"), + Self::PS512 => write!(f, "-39"), + Self::PS384 => write!(f, "-38"), + Self::PS256 => write!(f, "-37"), + Self::ES512 => write!(f, "-36"), + Self::ES384 => write!(f, "-35"), + Self::EdDSA => write!(f, "-8"), + Self::ES256 => write!(f, "-7"), } } } diff --git a/crates/bitwarden-api-api/src/models/api_key_response_model.rs b/crates/bitwarden-api-api/src/models/api_key_response_model.rs index 6c7cde826..b7c862a63 100644 --- a/crates/bitwarden-api-api/src/models/api_key_response_model.rs +++ b/crates/bitwarden-api-api/src/models/api_key_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ApiKeyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/assertion_options.rs b/crates/bitwarden-api-api/src/models/assertion_options.rs index a7772e88d..067e48055 100644 --- a/crates/bitwarden-api-api/src/models/assertion_options.rs +++ b/crates/bitwarden-api-api/src/models/assertion_options.rs @@ -8,24 +8,31 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AssertionOptions { #[serde(rename = "status", skip_serializing_if = "Option::is_none")] pub status: Option, #[serde(rename = "errorMessage", skip_serializing_if = "Option::is_none")] pub error_message: Option, + #[serde_as(as = "Option")] #[serde(rename = "challenge", skip_serializing_if = "Option::is_none")] - pub challenge: Option, + pub challenge: Option>, #[serde(rename = "timeout", skip_serializing_if = "Option::is_none")] pub timeout: Option, #[serde(rename = "rpId", skip_serializing_if = "Option::is_none")] pub rp_id: Option, #[serde(rename = "allowCredentials", skip_serializing_if = "Option::is_none")] - pub allow_credentials: Option>, + pub allow_credentials: Option>, #[serde(rename = "userVerification", skip_serializing_if = "Option::is_none")] - pub user_verification: Option, + pub user_verification: Option, #[serde(rename = "extensions", skip_serializing_if = "Option::is_none")] - pub extensions: Option>, + pub extensions: Option>, } impl AssertionOptions { diff --git a/crates/bitwarden-api-api/src/models/assertion_response.rs b/crates/bitwarden-api-api/src/models/assertion_response.rs index bf5f1e792..ccd33fc1c 100644 --- a/crates/bitwarden-api-api/src/models/assertion_response.rs +++ b/crates/bitwarden-api-api/src/models/assertion_response.rs @@ -8,16 +8,26 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AssertionResponse { + #[serde_as(as = "Option")] #[serde(rename = "authenticatorData", skip_serializing_if = "Option::is_none")] - pub authenticator_data: Option, + pub authenticator_data: Option>, + #[serde_as(as = "Option")] #[serde(rename = "signature", skip_serializing_if = "Option::is_none")] - pub signature: Option, + pub signature: Option>, + #[serde_as(as = "Option")] #[serde(rename = "clientDataJSON", skip_serializing_if = "Option::is_none")] - pub client_data_json: Option, + pub client_data_json: Option>, + #[serde_as(as = "Option")] #[serde(rename = "userHandle", skip_serializing_if = "Option::is_none")] - pub user_handle: Option, + pub user_handle: Option>, } impl AssertionResponse { diff --git a/crates/bitwarden-api-api/src/models/attachment_request_model.rs b/crates/bitwarden-api-api/src/models/attachment_request_model.rs index 8eeedb507..550ff1027 100644 --- a/crates/bitwarden-api-api/src/models/attachment_request_model.rs +++ b/crates/bitwarden-api-api/src/models/attachment_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AttachmentRequestModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, diff --git a/crates/bitwarden-api-api/src/models/attachment_response_model.rs b/crates/bitwarden-api-api/src/models/attachment_response_model.rs index e0616818f..818663095 100644 --- a/crates/bitwarden-api-api/src/models/attachment_response_model.rs +++ b/crates/bitwarden-api-api/src/models/attachment_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AttachmentResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/attachment_upload_data_response_model.rs b/crates/bitwarden-api-api/src/models/attachment_upload_data_response_model.rs index 9a78e5807..e82684628 100644 --- a/crates/bitwarden-api-api/src/models/attachment_upload_data_response_model.rs +++ b/crates/bitwarden-api-api/src/models/attachment_upload_data_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AttachmentUploadDataResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,11 +21,11 @@ pub struct AttachmentUploadDataResponseModel { #[serde(rename = "url", skip_serializing_if = "Option::is_none")] pub url: Option, #[serde(rename = "fileUploadType", skip_serializing_if = "Option::is_none")] - pub file_upload_type: Option, + pub file_upload_type: Option, #[serde(rename = "cipherResponse", skip_serializing_if = "Option::is_none")] - pub cipher_response: Option>, + pub cipher_response: Option>, #[serde(rename = "cipherMiniResponse", skip_serializing_if = "Option::is_none")] - pub cipher_mini_response: Option>, + pub cipher_mini_response: Option>, } impl AttachmentUploadDataResponseModel { diff --git a/crates/bitwarden-api-api/src/models/attestation_conveyance_preference.rs b/crates/bitwarden-api-api/src/models/attestation_conveyance_preference.rs index 0b8a76151..8cb2fd202 100644 --- a/crates/bitwarden-api-api/src/models/attestation_conveyance_preference.rs +++ b/crates/bitwarden-api-api/src/models/attestation_conveyance_preference.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum AttestationConveyancePreference { @@ -19,12 +23,12 @@ pub enum AttestationConveyancePreference { Direct, } -impl ToString for AttestationConveyancePreference { - fn to_string(&self) -> String { +impl std::fmt::Display for AttestationConveyancePreference { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::None => String::from("none"), - Self::Indirect => String::from("indirect"), - Self::Direct => String::from("direct"), + Self::None => write!(f, "none"), + Self::Indirect => write!(f, "indirect"), + Self::Direct => write!(f, "direct"), } } } diff --git a/crates/bitwarden-api-api/src/models/auth_request_create_request_model.rs b/crates/bitwarden-api-api/src/models/auth_request_create_request_model.rs index c092ae47d..aba6b7cb2 100644 --- a/crates/bitwarden-api-api/src/models/auth_request_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/auth_request_create_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthRequestCreateRequestModel { #[serde(rename = "email")] pub email: String, @@ -19,7 +23,7 @@ pub struct AuthRequestCreateRequestModel { #[serde(rename = "accessCode")] pub access_code: String, #[serde(rename = "type")] - pub r#type: crate::models::AuthRequestType, + pub r#type: models::AuthRequestType, } impl AuthRequestCreateRequestModel { @@ -28,7 +32,7 @@ impl AuthRequestCreateRequestModel { public_key: String, device_identifier: String, access_code: String, - r#type: crate::models::AuthRequestType, + r#type: models::AuthRequestType, ) -> AuthRequestCreateRequestModel { AuthRequestCreateRequestModel { email, diff --git a/crates/bitwarden-api-api/src/models/auth_request_response_model.rs b/crates/bitwarden-api-api/src/models/auth_request_response_model.rs index b6a7438b7..fcab1eabc 100644 --- a/crates/bitwarden-api-api/src/models/auth_request_response_model.rs +++ b/crates/bitwarden-api-api/src/models/auth_request_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthRequestResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/auth_request_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/auth_request_response_model_list_response_model.rs index 32e953d28..d53c915bd 100644 --- a/crates/bitwarden-api-api/src/models/auth_request_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/auth_request_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthRequestResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/auth_request_type.rs b/crates/bitwarden-api-api/src/models/auth_request_type.rs index 1ca3f7790..c14ce889b 100644 --- a/crates/bitwarden-api-api/src/models/auth_request_type.rs +++ b/crates/bitwarden-api-api/src/models/auth_request_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum AuthRequestType { AuthenticateAndUnlock = 0, @@ -19,12 +32,12 @@ pub enum AuthRequestType { AdminApproval = 2, } -impl ToString for AuthRequestType { - fn to_string(&self) -> String { +impl std::fmt::Display for AuthRequestType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::AuthenticateAndUnlock => String::from("0"), - Self::Unlock => String::from("1"), - Self::AdminApproval => String::from("2"), + Self::AuthenticateAndUnlock => write!(f, "0"), + Self::Unlock => write!(f, "1"), + Self::AdminApproval => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/auth_request_update_request_model.rs b/crates/bitwarden-api-api/src/models/auth_request_update_request_model.rs index 9799a5fc7..0d1c5ac29 100644 --- a/crates/bitwarden-api-api/src/models/auth_request_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/auth_request_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthRequestUpdateRequestModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, diff --git a/crates/bitwarden-api-api/src/models/authentication_extensions_client_inputs.rs b/crates/bitwarden-api-api/src/models/authentication_extensions_client_inputs.rs index cd98f01d1..91a3d4d02 100644 --- a/crates/bitwarden-api-api/src/models/authentication_extensions_client_inputs.rs +++ b/crates/bitwarden-api-api/src/models/authentication_extensions_client_inputs.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthenticationExtensionsClientInputs { #[serde(rename = "example.extension", skip_serializing_if = "Option::is_none")] pub example_period_extension: Option, diff --git a/crates/bitwarden-api-api/src/models/authentication_extensions_client_outputs.rs b/crates/bitwarden-api-api/src/models/authentication_extensions_client_outputs.rs index 2af5ed7c5..083f2220d 100644 --- a/crates/bitwarden-api-api/src/models/authentication_extensions_client_outputs.rs +++ b/crates/bitwarden-api-api/src/models/authentication_extensions_client_outputs.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthenticationExtensionsClientOutputs { #[serde(rename = "example.extension", skip_serializing_if = "Option::is_none")] pub example_period_extension: Option, diff --git a/crates/bitwarden-api-api/src/models/authenticator_assertion_raw_response.rs b/crates/bitwarden-api-api/src/models/authenticator_assertion_raw_response.rs index ea39efeab..8a6ffaa62 100644 --- a/crates/bitwarden-api-api/src/models/authenticator_assertion_raw_response.rs +++ b/crates/bitwarden-api-api/src/models/authenticator_assertion_raw_response.rs @@ -8,18 +8,26 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthenticatorAssertionRawResponse { + #[serde_as(as = "Option")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")] - pub id: Option, + pub id: Option>, + #[serde_as(as = "Option")] #[serde(rename = "rawId", skip_serializing_if = "Option::is_none")] - pub raw_id: Option, + pub raw_id: Option>, #[serde(rename = "response", skip_serializing_if = "Option::is_none")] - pub response: Option>, + pub response: Option>, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "extensions", skip_serializing_if = "Option::is_none")] - pub extensions: Option>, + pub extensions: Option>, } impl AuthenticatorAssertionRawResponse { diff --git a/crates/bitwarden-api-api/src/models/authenticator_attachment.rs b/crates/bitwarden-api-api/src/models/authenticator_attachment.rs index 8e2d2df19..2dfef06c8 100644 --- a/crates/bitwarden-api-api/src/models/authenticator_attachment.rs +++ b/crates/bitwarden-api-api/src/models/authenticator_attachment.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum AuthenticatorAttachment { @@ -17,11 +21,11 @@ pub enum AuthenticatorAttachment { CrossPlatform, } -impl ToString for AuthenticatorAttachment { - fn to_string(&self) -> String { +impl std::fmt::Display for AuthenticatorAttachment { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Platform => String::from("platform"), - Self::CrossPlatform => String::from("cross-platform"), + Self::Platform => write!(f, "platform"), + Self::CrossPlatform => write!(f, "cross-platform"), } } } diff --git a/crates/bitwarden-api-api/src/models/authenticator_attestation_raw_response.rs b/crates/bitwarden-api-api/src/models/authenticator_attestation_raw_response.rs index 8763ab261..61f804bb2 100644 --- a/crates/bitwarden-api-api/src/models/authenticator_attestation_raw_response.rs +++ b/crates/bitwarden-api-api/src/models/authenticator_attestation_raw_response.rs @@ -8,18 +8,26 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthenticatorAttestationRawResponse { + #[serde_as(as = "Option")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")] - pub id: Option, + pub id: Option>, + #[serde_as(as = "Option")] #[serde(rename = "rawId", skip_serializing_if = "Option::is_none")] - pub raw_id: Option, + pub raw_id: Option>, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "response", skip_serializing_if = "Option::is_none")] - pub response: Option>, + pub response: Option>, #[serde(rename = "extensions", skip_serializing_if = "Option::is_none")] - pub extensions: Option>, + pub extensions: Option>, } impl AuthenticatorAttestationRawResponse { diff --git a/crates/bitwarden-api-api/src/models/authenticator_selection.rs b/crates/bitwarden-api-api/src/models/authenticator_selection.rs index 4159eddde..e5b19345b 100644 --- a/crates/bitwarden-api-api/src/models/authenticator_selection.rs +++ b/crates/bitwarden-api-api/src/models/authenticator_selection.rs @@ -8,17 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthenticatorSelection { #[serde( rename = "authenticatorAttachment", skip_serializing_if = "Option::is_none" )] - pub authenticator_attachment: Option, + pub authenticator_attachment: Option, #[serde(rename = "requireResidentKey", skip_serializing_if = "Option::is_none")] pub require_resident_key: Option, #[serde(rename = "userVerification", skip_serializing_if = "Option::is_none")] - pub user_verification: Option, + pub user_verification: Option, } impl AuthenticatorSelection { diff --git a/crates/bitwarden-api-api/src/models/authenticator_transport.rs b/crates/bitwarden-api-api/src/models/authenticator_transport.rs index 0773f8138..764d3cb52 100644 --- a/crates/bitwarden-api-api/src/models/authenticator_transport.rs +++ b/crates/bitwarden-api-api/src/models/authenticator_transport.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum AuthenticatorTransport { @@ -21,13 +25,13 @@ pub enum AuthenticatorTransport { Internal, } -impl ToString for AuthenticatorTransport { - fn to_string(&self) -> String { +impl std::fmt::Display for AuthenticatorTransport { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Usb => String::from("usb"), - Self::Nfc => String::from("nfc"), - Self::Ble => String::from("ble"), - Self::Internal => String::from("internal"), + Self::Usb => write!(f, "usb"), + Self::Nfc => write!(f, "nfc"), + Self::Ble => write!(f, "ble"), + Self::Internal => write!(f, "internal"), } } } diff --git a/crates/bitwarden-api-api/src/models/base_secret_response_model.rs b/crates/bitwarden-api-api/src/models/base_secret_response_model.rs index 2b486020f..7a0d350b4 100644 --- a/crates/bitwarden-api-api/src/models/base_secret_response_model.rs +++ b/crates/bitwarden-api-api/src/models/base_secret_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BaseSecretResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -27,7 +31,7 @@ pub struct BaseSecretResponseModel { #[serde(rename = "revisionDate", skip_serializing_if = "Option::is_none")] pub revision_date: Option, #[serde(rename = "projects", skip_serializing_if = "Option::is_none")] - pub projects: Option>, + pub projects: Option>, } impl BaseSecretResponseModel { diff --git a/crates/bitwarden-api-api/src/models/base_secret_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/base_secret_response_model_list_response_model.rs index 650333a80..cd1cbc61d 100644 --- a/crates/bitwarden-api-api/src/models/base_secret_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/base_secret_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BaseSecretResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/billing_customer_discount.rs b/crates/bitwarden-api-api/src/models/billing_customer_discount.rs index 71fc4f46d..f38de2711 100644 --- a/crates/bitwarden-api-api/src/models/billing_customer_discount.rs +++ b/crates/bitwarden-api-api/src/models/billing_customer_discount.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingCustomerDiscount { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/billing_history_response_model.rs b/crates/bitwarden-api-api/src/models/billing_history_response_model.rs index f1550bcae..f3e847c0f 100644 --- a/crates/bitwarden-api-api/src/models/billing_history_response_model.rs +++ b/crates/bitwarden-api-api/src/models/billing_history_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingHistoryResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "invoices", skip_serializing_if = "Option::is_none")] - pub invoices: Option>, + pub invoices: Option>, #[serde(rename = "transactions", skip_serializing_if = "Option::is_none")] - pub transactions: Option>, + pub transactions: Option>, } impl BillingHistoryResponseModel { diff --git a/crates/bitwarden-api-api/src/models/billing_invoice.rs b/crates/bitwarden-api-api/src/models/billing_invoice.rs index 23dcb17d2..ee488ea0e 100644 --- a/crates/bitwarden-api-api/src/models/billing_invoice.rs +++ b/crates/bitwarden-api-api/src/models/billing_invoice.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingInvoice { #[serde(rename = "amount", skip_serializing_if = "Option::is_none")] pub amount: Option, diff --git a/crates/bitwarden-api-api/src/models/billing_payment_response_model.rs b/crates/bitwarden-api-api/src/models/billing_payment_response_model.rs index 2b1f929a7..a614ee1f9 100644 --- a/crates/bitwarden-api-api/src/models/billing_payment_response_model.rs +++ b/crates/bitwarden-api-api/src/models/billing_payment_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingPaymentResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "balance", skip_serializing_if = "Option::is_none")] pub balance: Option, #[serde(rename = "paymentSource", skip_serializing_if = "Option::is_none")] - pub payment_source: Option>, + pub payment_source: Option>, } impl BillingPaymentResponseModel { diff --git a/crates/bitwarden-api-api/src/models/billing_response_model.rs b/crates/bitwarden-api-api/src/models/billing_response_model.rs index 4a3cbea6e..0adc96a5c 100644 --- a/crates/bitwarden-api-api/src/models/billing_response_model.rs +++ b/crates/bitwarden-api-api/src/models/billing_response_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "balance", skip_serializing_if = "Option::is_none")] pub balance: Option, #[serde(rename = "paymentSource", skip_serializing_if = "Option::is_none")] - pub payment_source: Option>, + pub payment_source: Option>, #[serde(rename = "invoices", skip_serializing_if = "Option::is_none")] - pub invoices: Option>, + pub invoices: Option>, #[serde(rename = "transactions", skip_serializing_if = "Option::is_none")] - pub transactions: Option>, + pub transactions: Option>, } impl BillingResponseModel { diff --git a/crates/bitwarden-api-api/src/models/billing_source.rs b/crates/bitwarden-api-api/src/models/billing_source.rs index cff096377..4d710d069 100644 --- a/crates/bitwarden-api-api/src/models/billing_source.rs +++ b/crates/bitwarden-api-api/src/models/billing_source.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingSource { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "cardBrand", skip_serializing_if = "Option::is_none")] pub card_brand: Option, #[serde(rename = "description", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/billing_subscription.rs b/crates/bitwarden-api-api/src/models/billing_subscription.rs index 0135b1798..214949597 100644 --- a/crates/bitwarden-api-api/src/models/billing_subscription.rs +++ b/crates/bitwarden-api-api/src/models/billing_subscription.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingSubscription { #[serde(rename = "trialStartDate", skip_serializing_if = "Option::is_none")] pub trial_start_date: Option, @@ -27,7 +31,7 @@ pub struct BillingSubscription { #[serde(rename = "cancelled", skip_serializing_if = "Option::is_none")] pub cancelled: Option, #[serde(rename = "items", skip_serializing_if = "Option::is_none")] - pub items: Option>, + pub items: Option>, #[serde(rename = "collectionMethod", skip_serializing_if = "Option::is_none")] pub collection_method: Option, #[serde(rename = "suspensionDate", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/billing_subscription_item.rs b/crates/bitwarden-api-api/src/models/billing_subscription_item.rs index 0e40278c5..d21b20e63 100644 --- a/crates/bitwarden-api-api/src/models/billing_subscription_item.rs +++ b/crates/bitwarden-api-api/src/models/billing_subscription_item.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingSubscriptionItem { #[serde(rename = "productId", skip_serializing_if = "Option::is_none")] pub product_id: Option, diff --git a/crates/bitwarden-api-api/src/models/billing_subscription_upcoming_invoice.rs b/crates/bitwarden-api-api/src/models/billing_subscription_upcoming_invoice.rs index a2e183a94..0607b1483 100644 --- a/crates/bitwarden-api-api/src/models/billing_subscription_upcoming_invoice.rs +++ b/crates/bitwarden-api-api/src/models/billing_subscription_upcoming_invoice.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingSubscriptionUpcomingInvoice { #[serde(rename = "amount", skip_serializing_if = "Option::is_none")] pub amount: Option, diff --git a/crates/bitwarden-api-api/src/models/billing_transaction.rs b/crates/bitwarden-api-api/src/models/billing_transaction.rs index 666d13919..d3204d510 100644 --- a/crates/bitwarden-api-api/src/models/billing_transaction.rs +++ b/crates/bitwarden-api-api/src/models/billing_transaction.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BillingTransaction { #[serde(rename = "createdDate", skip_serializing_if = "Option::is_none")] pub created_date: Option, @@ -21,9 +25,9 @@ pub struct BillingTransaction { #[serde(rename = "refundedAmount", skip_serializing_if = "Option::is_none")] pub refunded_amount: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "paymentMethodType", skip_serializing_if = "Option::is_none")] - pub payment_method_type: Option, + pub payment_method_type: Option, #[serde(rename = "details", skip_serializing_if = "Option::is_none")] pub details: Option, } diff --git a/crates/bitwarden-api-api/src/models/bit_pay_invoice_request_model.rs b/crates/bitwarden-api-api/src/models/bit_pay_invoice_request_model.rs index 9491aabb0..6e761baf9 100644 --- a/crates/bitwarden-api-api/src/models/bit_pay_invoice_request_model.rs +++ b/crates/bitwarden-api-api/src/models/bit_pay_invoice_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BitPayInvoiceRequestModel { #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, diff --git a/crates/bitwarden-api-api/src/models/bulk_collection_access_request_model.rs b/crates/bitwarden-api-api/src/models/bulk_collection_access_request_model.rs index a7fd75d85..78f32c3cf 100644 --- a/crates/bitwarden-api-api/src/models/bulk_collection_access_request_model.rs +++ b/crates/bitwarden-api-api/src/models/bulk_collection_access_request_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BulkCollectionAccessRequestModel { #[serde(rename = "collectionIds", skip_serializing_if = "Option::is_none")] pub collection_ids: Option>, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] - pub groups: Option>, + pub groups: Option>, #[serde(rename = "users", skip_serializing_if = "Option::is_none")] - pub users: Option>, + pub users: Option>, } impl BulkCollectionAccessRequestModel { diff --git a/crates/bitwarden-api-api/src/models/bulk_delete_response_model.rs b/crates/bitwarden-api-api/src/models/bulk_delete_response_model.rs index 0d9b9e074..43b1d6b8f 100644 --- a/crates/bitwarden-api-api/src/models/bulk_delete_response_model.rs +++ b/crates/bitwarden-api-api/src/models/bulk_delete_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BulkDeleteResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/bulk_delete_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/bulk_delete_response_model_list_response_model.rs index 800ffeb32..b93a7a0db 100644 --- a/crates/bitwarden-api-api/src/models/bulk_delete_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/bulk_delete_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BulkDeleteResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/bulk_deny_admin_auth_request_request_model.rs b/crates/bitwarden-api-api/src/models/bulk_deny_admin_auth_request_request_model.rs index b870cc77b..258d913f2 100644 --- a/crates/bitwarden-api-api/src/models/bulk_deny_admin_auth_request_request_model.rs +++ b/crates/bitwarden-api-api/src/models/bulk_deny_admin_auth_request_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BulkDenyAdminAuthRequestRequestModel { #[serde(rename = "ids", skip_serializing_if = "Option::is_none")] pub ids: Option>, diff --git a/crates/bitwarden-api-api/src/models/cipher_attachment_model.rs b/crates/bitwarden-api-api/src/models/cipher_attachment_model.rs index 93beabc99..645d1f81d 100644 --- a/crates/bitwarden-api-api/src/models/cipher_attachment_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_attachment_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherAttachmentModel { #[serde(rename = "fileName", skip_serializing_if = "Option::is_none")] pub file_name: Option, diff --git a/crates/bitwarden-api-api/src/models/cipher_bulk_delete_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_bulk_delete_request_model.rs index b709c5622..ca1365c9c 100644 --- a/crates/bitwarden-api-api/src/models/cipher_bulk_delete_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_bulk_delete_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherBulkDeleteRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/cipher_bulk_move_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_bulk_move_request_model.rs index b9e2b61f5..58ad9f99d 100644 --- a/crates/bitwarden-api-api/src/models/cipher_bulk_move_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_bulk_move_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherBulkMoveRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/cipher_bulk_restore_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_bulk_restore_request_model.rs index 3d6ad9338..0cc1845ab 100644 --- a/crates/bitwarden-api-api/src/models/cipher_bulk_restore_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_bulk_restore_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherBulkRestoreRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/cipher_bulk_share_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_bulk_share_request_model.rs index 92dff066c..23e8004da 100644 --- a/crates/bitwarden-api-api/src/models/cipher_bulk_share_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_bulk_share_request_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherBulkShareRequestModel { #[serde(rename = "collectionIds")] pub collection_ids: Vec, #[serde(rename = "ciphers")] - pub ciphers: Vec, + pub ciphers: Vec, } impl CipherBulkShareRequestModel { pub fn new( collection_ids: Vec, - ciphers: Vec, + ciphers: Vec, ) -> CipherBulkShareRequestModel { CipherBulkShareRequestModel { collection_ids, diff --git a/crates/bitwarden-api-api/src/models/cipher_bulk_update_collections_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_bulk_update_collections_request_model.rs index 76ab55cea..383824d6d 100644 --- a/crates/bitwarden-api-api/src/models/cipher_bulk_update_collections_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_bulk_update_collections_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherBulkUpdateCollectionsRequestModel { #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, diff --git a/crates/bitwarden-api-api/src/models/cipher_card_model.rs b/crates/bitwarden-api-api/src/models/cipher_card_model.rs index eae29bc84..0143cf70f 100644 --- a/crates/bitwarden-api-api/src/models/cipher_card_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_card_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherCardModel { #[serde(rename = "cardholderName", skip_serializing_if = "Option::is_none")] pub cardholder_name: Option, diff --git a/crates/bitwarden-api-api/src/models/cipher_collections_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_collections_request_model.rs index 8bdf4be41..d43bc11dd 100644 --- a/crates/bitwarden-api-api/src/models/cipher_collections_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_collections_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherCollectionsRequestModel { #[serde(rename = "collectionIds")] pub collection_ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/cipher_create_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_create_request_model.rs index bbfdf3c03..f8a7cbcb6 100644 --- a/crates/bitwarden-api-api/src/models/cipher_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_create_request_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherCreateRequestModel { #[serde(rename = "collectionIds", skip_serializing_if = "Option::is_none")] pub collection_ids: Option>, #[serde(rename = "cipher")] - pub cipher: Box, + pub cipher: Box, } impl CipherCreateRequestModel { - pub fn new(cipher: crate::models::CipherRequestModel) -> CipherCreateRequestModel { + pub fn new(cipher: models::CipherRequestModel) -> CipherCreateRequestModel { CipherCreateRequestModel { collection_ids: None, cipher: Box::new(cipher), diff --git a/crates/bitwarden-api-api/src/models/cipher_details_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_details_response_model.rs index 1dd69ecd9..e37afbf2d 100644 --- a/crates/bitwarden-api-api/src/models/cipher_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct CipherDetailsResponseModel { #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] pub data: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] @@ -25,19 +29,19 @@ pub struct CipherDetailsResponseModel { #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "login", skip_serializing_if = "Option::is_none")] - pub login: Option>, + pub login: Option>, #[serde(rename = "card", skip_serializing_if = "Option::is_none")] - pub card: Option>, + pub card: Option>, #[serde(rename = "identity", skip_serializing_if = "Option::is_none")] - pub identity: Option>, + pub identity: Option>, #[serde(rename = "secureNote", skip_serializing_if = "Option::is_none")] - pub secure_note: Option>, + pub secure_note: Option>, #[serde(rename = "fields", skip_serializing_if = "Option::is_none")] - pub fields: Option>, + pub fields: Option>, #[serde(rename = "passwordHistory", skip_serializing_if = "Option::is_none")] - pub password_history: Option>, + pub password_history: Option>, #[serde(rename = "attachments", skip_serializing_if = "Option::is_none")] - pub attachments: Option>, + pub attachments: Option>, #[serde( rename = "organizationUseTotp", skip_serializing_if = "Option::is_none" @@ -50,7 +54,7 @@ pub struct CipherDetailsResponseModel { #[serde(rename = "deletedDate", skip_serializing_if = "Option::is_none")] pub deleted_date: Option, #[serde(rename = "reprompt", skip_serializing_if = "Option::is_none")] - pub reprompt: Option, + pub reprompt: Option, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "folderId", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/cipher_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_details_response_model_list_response_model.rs index 8da076327..ce8b588d5 100644 --- a/crates/bitwarden-api-api/src/models/cipher_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/cipher_fido2_credential_model.rs b/crates/bitwarden-api-api/src/models/cipher_fido2_credential_model.rs index 95de4bc28..09e761b41 100644 --- a/crates/bitwarden-api-api/src/models/cipher_fido2_credential_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_fido2_credential_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherFido2CredentialModel { #[serde(rename = "credentialId", skip_serializing_if = "Option::is_none")] pub credential_id: Option, diff --git a/crates/bitwarden-api-api/src/models/cipher_field_model.rs b/crates/bitwarden-api-api/src/models/cipher_field_model.rs index 3b1700dd6..872fb2c0e 100644 --- a/crates/bitwarden-api-api/src/models/cipher_field_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_field_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherFieldModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "value", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/cipher_identity_model.rs b/crates/bitwarden-api-api/src/models/cipher_identity_model.rs index e2e629398..2d2c6923e 100644 --- a/crates/bitwarden-api-api/src/models/cipher_identity_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_identity_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherIdentityModel { #[serde(rename = "title", skip_serializing_if = "Option::is_none")] pub title: Option, diff --git a/crates/bitwarden-api-api/src/models/cipher_login_model.rs b/crates/bitwarden-api-api/src/models/cipher_login_model.rs index 159bee7cd..7b3bd1897 100644 --- a/crates/bitwarden-api-api/src/models/cipher_login_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_login_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherLoginModel { #[serde(rename = "uri", skip_serializing_if = "Option::is_none")] pub uri: Option, #[serde(rename = "uris", skip_serializing_if = "Option::is_none")] - pub uris: Option>, + pub uris: Option>, #[serde(rename = "username", skip_serializing_if = "Option::is_none")] pub username: Option, #[serde(rename = "password", skip_serializing_if = "Option::is_none")] @@ -28,7 +32,7 @@ pub struct CipherLoginModel { #[serde(rename = "autofillOnPageLoad", skip_serializing_if = "Option::is_none")] pub autofill_on_page_load: Option, #[serde(rename = "fido2Credentials", skip_serializing_if = "Option::is_none")] - pub fido2_credentials: Option>, + pub fido2_credentials: Option>, } impl CipherLoginModel { diff --git a/crates/bitwarden-api-api/src/models/cipher_login_uri_model.rs b/crates/bitwarden-api-api/src/models/cipher_login_uri_model.rs index 39b6139c7..cbb0dec55 100644 --- a/crates/bitwarden-api-api/src/models/cipher_login_uri_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_login_uri_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherLoginUriModel { #[serde(rename = "uri", skip_serializing_if = "Option::is_none")] pub uri: Option, #[serde(rename = "uriChecksum", skip_serializing_if = "Option::is_none")] pub uri_checksum: Option, #[serde(rename = "match", skip_serializing_if = "Option::is_none")] - pub r#match: Option, + pub r#match: Option, } impl CipherLoginUriModel { diff --git a/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model.rs index bf8e29707..011116ae0 100644 --- a/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherMiniDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct CipherMiniDetailsResponseModel { #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] pub data: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] @@ -25,19 +29,19 @@ pub struct CipherMiniDetailsResponseModel { #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "login", skip_serializing_if = "Option::is_none")] - pub login: Option>, + pub login: Option>, #[serde(rename = "card", skip_serializing_if = "Option::is_none")] - pub card: Option>, + pub card: Option>, #[serde(rename = "identity", skip_serializing_if = "Option::is_none")] - pub identity: Option>, + pub identity: Option>, #[serde(rename = "secureNote", skip_serializing_if = "Option::is_none")] - pub secure_note: Option>, + pub secure_note: Option>, #[serde(rename = "fields", skip_serializing_if = "Option::is_none")] - pub fields: Option>, + pub fields: Option>, #[serde(rename = "passwordHistory", skip_serializing_if = "Option::is_none")] - pub password_history: Option>, + pub password_history: Option>, #[serde(rename = "attachments", skip_serializing_if = "Option::is_none")] - pub attachments: Option>, + pub attachments: Option>, #[serde( rename = "organizationUseTotp", skip_serializing_if = "Option::is_none" @@ -50,7 +54,7 @@ pub struct CipherMiniDetailsResponseModel { #[serde(rename = "deletedDate", skip_serializing_if = "Option::is_none")] pub deleted_date: Option, #[serde(rename = "reprompt", skip_serializing_if = "Option::is_none")] - pub reprompt: Option, + pub reprompt: Option, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "collectionIds", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model_list_response_model.rs index 8fbdaa67c..8acd2a4b9 100644 --- a/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_mini_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherMiniDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/cipher_mini_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_mini_response_model.rs index b6e77e2a2..8a27f70bd 100644 --- a/crates/bitwarden-api-api/src/models/cipher_mini_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_mini_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherMiniResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct CipherMiniResponseModel { #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] pub data: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] @@ -25,19 +29,19 @@ pub struct CipherMiniResponseModel { #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "login", skip_serializing_if = "Option::is_none")] - pub login: Option>, + pub login: Option>, #[serde(rename = "card", skip_serializing_if = "Option::is_none")] - pub card: Option>, + pub card: Option>, #[serde(rename = "identity", skip_serializing_if = "Option::is_none")] - pub identity: Option>, + pub identity: Option>, #[serde(rename = "secureNote", skip_serializing_if = "Option::is_none")] - pub secure_note: Option>, + pub secure_note: Option>, #[serde(rename = "fields", skip_serializing_if = "Option::is_none")] - pub fields: Option>, + pub fields: Option>, #[serde(rename = "passwordHistory", skip_serializing_if = "Option::is_none")] - pub password_history: Option>, + pub password_history: Option>, #[serde(rename = "attachments", skip_serializing_if = "Option::is_none")] - pub attachments: Option>, + pub attachments: Option>, #[serde( rename = "organizationUseTotp", skip_serializing_if = "Option::is_none" @@ -50,7 +54,7 @@ pub struct CipherMiniResponseModel { #[serde(rename = "deletedDate", skip_serializing_if = "Option::is_none")] pub deleted_date: Option, #[serde(rename = "reprompt", skip_serializing_if = "Option::is_none")] - pub reprompt: Option, + pub reprompt: Option, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, } diff --git a/crates/bitwarden-api-api/src/models/cipher_mini_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_mini_response_model_list_response_model.rs index ccae92e9e..6509df390 100644 --- a/crates/bitwarden-api-api/src/models/cipher_mini_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_mini_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherMiniResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/cipher_partial_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_partial_request_model.rs index f911ef5cb..390429d69 100644 --- a/crates/bitwarden-api-api/src/models/cipher_partial_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_partial_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherPartialRequestModel { #[serde(rename = "folderId", skip_serializing_if = "Option::is_none")] pub folder_id: Option, diff --git a/crates/bitwarden-api-api/src/models/cipher_password_history_model.rs b/crates/bitwarden-api-api/src/models/cipher_password_history_model.rs index 4ab05138a..be5e69ee2 100644 --- a/crates/bitwarden-api-api/src/models/cipher_password_history_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_password_history_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherPasswordHistoryModel { #[serde(rename = "password")] pub password: String, diff --git a/crates/bitwarden-api-api/src/models/cipher_reprompt_type.rs b/crates/bitwarden-api-api/src/models/cipher_reprompt_type.rs index 4443b8c03..e8c0c0352 100644 --- a/crates/bitwarden-api-api/src/models/cipher_reprompt_type.rs +++ b/crates/bitwarden-api-api/src/models/cipher_reprompt_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum CipherRepromptType { None = 0, Password = 1, } -impl ToString for CipherRepromptType { - fn to_string(&self) -> String { +impl std::fmt::Display for CipherRepromptType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::None => String::from("0"), - Self::Password => String::from("1"), + Self::None => write!(f, "0"), + Self::Password => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/cipher_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_request_model.rs index 8f8d17312..d4222455c 100644 --- a/crates/bitwarden-api-api/src/models/cipher_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherRequestModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "folderId", skip_serializing_if = "Option::is_none")] @@ -19,7 +23,7 @@ pub struct CipherRequestModel { #[serde(rename = "favorite", skip_serializing_if = "Option::is_none")] pub favorite: Option, #[serde(rename = "reprompt", skip_serializing_if = "Option::is_none")] - pub reprompt: Option, + pub reprompt: Option, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "name")] @@ -27,22 +31,21 @@ pub struct CipherRequestModel { #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "fields", skip_serializing_if = "Option::is_none")] - pub fields: Option>, + pub fields: Option>, #[serde(rename = "passwordHistory", skip_serializing_if = "Option::is_none")] - pub password_history: Option>, + pub password_history: Option>, #[serde(rename = "attachments", skip_serializing_if = "Option::is_none")] - pub attachments: Option<::std::collections::HashMap>, + pub attachments: Option>, #[serde(rename = "attachments2", skip_serializing_if = "Option::is_none")] - pub attachments2: - Option<::std::collections::HashMap>, + pub attachments2: Option>, #[serde(rename = "login", skip_serializing_if = "Option::is_none")] - pub login: Option>, + pub login: Option>, #[serde(rename = "card", skip_serializing_if = "Option::is_none")] - pub card: Option>, + pub card: Option>, #[serde(rename = "identity", skip_serializing_if = "Option::is_none")] - pub identity: Option>, + pub identity: Option>, #[serde(rename = "secureNote", skip_serializing_if = "Option::is_none")] - pub secure_note: Option>, + pub secure_note: Option>, #[serde( rename = "lastKnownRevisionDate", skip_serializing_if = "Option::is_none" diff --git a/crates/bitwarden-api-api/src/models/cipher_response_model.rs b/crates/bitwarden-api-api/src/models/cipher_response_model.rs index bd9c360b3..4520b3534 100644 --- a/crates/bitwarden-api-api/src/models/cipher_response_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct CipherResponseModel { #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] pub data: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] @@ -25,19 +29,19 @@ pub struct CipherResponseModel { #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "login", skip_serializing_if = "Option::is_none")] - pub login: Option>, + pub login: Option>, #[serde(rename = "card", skip_serializing_if = "Option::is_none")] - pub card: Option>, + pub card: Option>, #[serde(rename = "identity", skip_serializing_if = "Option::is_none")] - pub identity: Option>, + pub identity: Option>, #[serde(rename = "secureNote", skip_serializing_if = "Option::is_none")] - pub secure_note: Option>, + pub secure_note: Option>, #[serde(rename = "fields", skip_serializing_if = "Option::is_none")] - pub fields: Option>, + pub fields: Option>, #[serde(rename = "passwordHistory", skip_serializing_if = "Option::is_none")] - pub password_history: Option>, + pub password_history: Option>, #[serde(rename = "attachments", skip_serializing_if = "Option::is_none")] - pub attachments: Option>, + pub attachments: Option>, #[serde( rename = "organizationUseTotp", skip_serializing_if = "Option::is_none" @@ -50,7 +54,7 @@ pub struct CipherResponseModel { #[serde(rename = "deletedDate", skip_serializing_if = "Option::is_none")] pub deleted_date: Option, #[serde(rename = "reprompt", skip_serializing_if = "Option::is_none")] - pub reprompt: Option, + pub reprompt: Option, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "folderId", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/cipher_secure_note_model.rs b/crates/bitwarden-api-api/src/models/cipher_secure_note_model.rs index a1cb38421..14d8b9837 100644 --- a/crates/bitwarden-api-api/src/models/cipher_secure_note_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_secure_note_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherSecureNoteModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, } impl CipherSecureNoteModel { diff --git a/crates/bitwarden-api-api/src/models/cipher_share_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_share_request_model.rs index 86dcb3454..dfecc2630 100644 --- a/crates/bitwarden-api-api/src/models/cipher_share_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_share_request_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherShareRequestModel { #[serde(rename = "collectionIds")] pub collection_ids: Vec, #[serde(rename = "cipher")] - pub cipher: Box, + pub cipher: Box, } impl CipherShareRequestModel { pub fn new( collection_ids: Vec, - cipher: crate::models::CipherRequestModel, + cipher: models::CipherRequestModel, ) -> CipherShareRequestModel { CipherShareRequestModel { collection_ids, diff --git a/crates/bitwarden-api-api/src/models/cipher_type.rs b/crates/bitwarden-api-api/src/models/cipher_type.rs index 044349ef8..4a76d5a1d 100644 --- a/crates/bitwarden-api-api/src/models/cipher_type.rs +++ b/crates/bitwarden-api-api/src/models/cipher_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum CipherType { Login = 1, @@ -20,13 +33,13 @@ pub enum CipherType { Identity = 4, } -impl ToString for CipherType { - fn to_string(&self) -> String { +impl std::fmt::Display for CipherType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Login => String::from("1"), - Self::SecureNote => String::from("2"), - Self::Card => String::from("3"), - Self::Identity => String::from("4"), + Self::Login => write!(f, "1"), + Self::SecureNote => write!(f, "2"), + Self::Card => write!(f, "3"), + Self::Identity => write!(f, "4"), } } } diff --git a/crates/bitwarden-api-api/src/models/cipher_with_id_request_model.rs b/crates/bitwarden-api-api/src/models/cipher_with_id_request_model.rs index 665bd4b4d..c18ac4ecd 100644 --- a/crates/bitwarden-api-api/src/models/cipher_with_id_request_model.rs +++ b/crates/bitwarden-api-api/src/models/cipher_with_id_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CipherWithIdRequestModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "folderId", skip_serializing_if = "Option::is_none")] @@ -19,7 +23,7 @@ pub struct CipherWithIdRequestModel { #[serde(rename = "favorite", skip_serializing_if = "Option::is_none")] pub favorite: Option, #[serde(rename = "reprompt", skip_serializing_if = "Option::is_none")] - pub reprompt: Option, + pub reprompt: Option, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "name")] @@ -27,22 +31,21 @@ pub struct CipherWithIdRequestModel { #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "fields", skip_serializing_if = "Option::is_none")] - pub fields: Option>, + pub fields: Option>, #[serde(rename = "passwordHistory", skip_serializing_if = "Option::is_none")] - pub password_history: Option>, + pub password_history: Option>, #[serde(rename = "attachments", skip_serializing_if = "Option::is_none")] - pub attachments: Option<::std::collections::HashMap>, + pub attachments: Option>, #[serde(rename = "attachments2", skip_serializing_if = "Option::is_none")] - pub attachments2: - Option<::std::collections::HashMap>, + pub attachments2: Option>, #[serde(rename = "login", skip_serializing_if = "Option::is_none")] - pub login: Option>, + pub login: Option>, #[serde(rename = "card", skip_serializing_if = "Option::is_none")] - pub card: Option>, + pub card: Option>, #[serde(rename = "identity", skip_serializing_if = "Option::is_none")] - pub identity: Option>, + pub identity: Option>, #[serde(rename = "secureNote", skip_serializing_if = "Option::is_none")] - pub secure_note: Option>, + pub secure_note: Option>, #[serde( rename = "lastKnownRevisionDate", skip_serializing_if = "Option::is_none" diff --git a/crates/bitwarden-api-api/src/models/collection_access_details_response_model.rs b/crates/bitwarden-api-api/src/models/collection_access_details_response_model.rs index bca30da3f..0d6f53b9e 100644 --- a/crates/bitwarden-api-api/src/models/collection_access_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_access_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionAccessDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -21,9 +25,9 @@ pub struct CollectionAccessDetailsResponseModel { #[serde(rename = "externalId", skip_serializing_if = "Option::is_none")] pub external_id: Option, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] - pub groups: Option>, + pub groups: Option>, #[serde(rename = "users", skip_serializing_if = "Option::is_none")] - pub users: Option>, + pub users: Option>, /// True if the acting user is explicitly assigned to the collection #[serde(rename = "assigned", skip_serializing_if = "Option::is_none")] pub assigned: Option, @@ -33,6 +37,8 @@ pub struct CollectionAccessDetailsResponseModel { pub hide_passwords: Option, #[serde(rename = "manage", skip_serializing_if = "Option::is_none")] pub manage: Option, + #[serde(rename = "unmanaged", skip_serializing_if = "Option::is_none")] + pub unmanaged: Option, } impl CollectionAccessDetailsResponseModel { @@ -49,6 +55,7 @@ impl CollectionAccessDetailsResponseModel { read_only: None, hide_passwords: None, manage: None, + unmanaged: None, } } } diff --git a/crates/bitwarden-api-api/src/models/collection_access_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/collection_access_details_response_model_list_response_model.rs index 89b0cb89a..fb925d416 100644 --- a/crates/bitwarden-api-api/src/models/collection_access_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_access_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionAccessDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/collection_bulk_delete_request_model.rs b/crates/bitwarden-api-api/src/models/collection_bulk_delete_request_model.rs index d919294b9..efda36f4a 100644 --- a/crates/bitwarden-api-api/src/models/collection_bulk_delete_request_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_bulk_delete_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionBulkDeleteRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/collection_details_response_model.rs b/crates/bitwarden-api-api/src/models/collection_details_response_model.rs index 10a653665..3a3f0892a 100644 --- a/crates/bitwarden-api-api/src/models/collection_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_details_response_model.rs @@ -8,10 +8,13 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// CollectionDetailsResponseModel : Response model for a collection that is always assigned to the /// requesting user, including permissions. - -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/collection_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/collection_details_response_model_list_response_model.rs index e505be1dd..113a0ff5d 100644 --- a/crates/bitwarden-api-api/src/models/collection_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/collection_request_model.rs b/crates/bitwarden-api-api/src/models/collection_request_model.rs index 6a67c959c..7217fd160 100644 --- a/crates/bitwarden-api-api/src/models/collection_request_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_request_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionRequestModel { #[serde(rename = "name")] pub name: String, #[serde(rename = "externalId", skip_serializing_if = "Option::is_none")] pub external_id: Option, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] - pub groups: Option>, + pub groups: Option>, #[serde(rename = "users", skip_serializing_if = "Option::is_none")] - pub users: Option>, + pub users: Option>, } impl CollectionRequestModel { diff --git a/crates/bitwarden-api-api/src/models/collection_response_model.rs b/crates/bitwarden-api-api/src/models/collection_response_model.rs index 091a88fea..a8b0efb9f 100644 --- a/crates/bitwarden-api-api/src/models/collection_response_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/collection_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/collection_response_model_list_response_model.rs index 943be4ca5..219c3c6db 100644 --- a/crates/bitwarden-api-api/src/models/collection_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/collection_with_id_request_model.rs b/crates/bitwarden-api-api/src/models/collection_with_id_request_model.rs index ae621c621..61eafe0b9 100644 --- a/crates/bitwarden-api-api/src/models/collection_with_id_request_model.rs +++ b/crates/bitwarden-api-api/src/models/collection_with_id_request_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CollectionWithIdRequestModel { #[serde(rename = "name")] pub name: String, #[serde(rename = "externalId", skip_serializing_if = "Option::is_none")] pub external_id: Option, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] - pub groups: Option>, + pub groups: Option>, #[serde(rename = "users", skip_serializing_if = "Option::is_none")] - pub users: Option>, + pub users: Option>, #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, } diff --git a/crates/bitwarden-api-api/src/models/config_response_model.rs b/crates/bitwarden-api-api/src/models/config_response_model.rs index 3d087338f..5ac9b3084 100644 --- a/crates/bitwarden-api-api/src/models/config_response_model.rs +++ b/crates/bitwarden-api-api/src/models/config_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ConfigResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,11 +21,11 @@ pub struct ConfigResponseModel { #[serde(rename = "gitHash", skip_serializing_if = "Option::is_none")] pub git_hash: Option, #[serde(rename = "server", skip_serializing_if = "Option::is_none")] - pub server: Option>, + pub server: Option>, #[serde(rename = "environment", skip_serializing_if = "Option::is_none")] - pub environment: Option>, + pub environment: Option>, #[serde(rename = "featureStates", skip_serializing_if = "Option::is_none")] - pub feature_states: Option<::std::collections::HashMap>, + pub feature_states: Option>, } impl ConfigResponseModel { diff --git a/crates/bitwarden-api-api/src/models/create_client_organization_request_body.rs b/crates/bitwarden-api-api/src/models/create_client_organization_request_body.rs index 3a8189840..c3f2ad13a 100644 --- a/crates/bitwarden-api-api/src/models/create_client_organization_request_body.rs +++ b/crates/bitwarden-api-api/src/models/create_client_organization_request_body.rs @@ -8,20 +8,24 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CreateClientOrganizationRequestBody { #[serde(rename = "name")] pub name: String, #[serde(rename = "ownerEmail")] pub owner_email: String, #[serde(rename = "planType", skip_serializing_if = "Option::is_none")] - pub plan_type: Option, + pub plan_type: Option, #[serde(rename = "seats", skip_serializing_if = "Option::is_none")] pub seats: Option, #[serde(rename = "key")] pub key: String, #[serde(rename = "keyPair")] - pub key_pair: Box, + pub key_pair: Box, #[serde(rename = "collectionName")] pub collection_name: String, } @@ -31,7 +35,7 @@ impl CreateClientOrganizationRequestBody { name: String, owner_email: String, key: String, - key_pair: crate::models::KeyPairRequestBody, + key_pair: models::KeyPairRequestBody, collection_name: String, ) -> CreateClientOrganizationRequestBody { CreateClientOrganizationRequestBody { diff --git a/crates/bitwarden-api-api/src/models/credential_create_options.rs b/crates/bitwarden-api-api/src/models/credential_create_options.rs index 57d6799f9..4674f8a18 100644 --- a/crates/bitwarden-api-api/src/models/credential_create_options.rs +++ b/crates/bitwarden-api-api/src/models/credential_create_options.rs @@ -8,33 +8,40 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CredentialCreateOptions { #[serde(rename = "status", skip_serializing_if = "Option::is_none")] pub status: Option, #[serde(rename = "errorMessage", skip_serializing_if = "Option::is_none")] pub error_message: Option, #[serde(rename = "rp", skip_serializing_if = "Option::is_none")] - pub rp: Option>, + pub rp: Option>, #[serde(rename = "user", skip_serializing_if = "Option::is_none")] - pub user: Option>, + pub user: Option>, + #[serde_as(as = "Option")] #[serde(rename = "challenge", skip_serializing_if = "Option::is_none")] - pub challenge: Option, + pub challenge: Option>, #[serde(rename = "pubKeyCredParams", skip_serializing_if = "Option::is_none")] - pub pub_key_cred_params: Option>, + pub pub_key_cred_params: Option>, #[serde(rename = "timeout", skip_serializing_if = "Option::is_none")] pub timeout: Option, #[serde(rename = "attestation", skip_serializing_if = "Option::is_none")] - pub attestation: Option, + pub attestation: Option, #[serde( rename = "authenticatorSelection", skip_serializing_if = "Option::is_none" )] - pub authenticator_selection: Option>, + pub authenticator_selection: Option>, #[serde(rename = "excludeCredentials", skip_serializing_if = "Option::is_none")] - pub exclude_credentials: Option>, + pub exclude_credentials: Option>, #[serde(rename = "extensions", skip_serializing_if = "Option::is_none")] - pub extensions: Option>, + pub extensions: Option>, } impl CredentialCreateOptions { diff --git a/crates/bitwarden-api-api/src/models/delete_recover_request_model.rs b/crates/bitwarden-api-api/src/models/delete_recover_request_model.rs index a065a1724..e053dcc6e 100644 --- a/crates/bitwarden-api-api/src/models/delete_recover_request_model.rs +++ b/crates/bitwarden-api-api/src/models/delete_recover_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeleteRecoverRequestModel { #[serde(rename = "email")] pub email: String, diff --git a/crates/bitwarden-api-api/src/models/device_keys_request_model.rs b/crates/bitwarden-api-api/src/models/device_keys_request_model.rs index 4864103b8..ea4adfeda 100644 --- a/crates/bitwarden-api-api/src/models/device_keys_request_model.rs +++ b/crates/bitwarden-api-api/src/models/device_keys_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceKeysRequestModel { #[serde(rename = "encryptedUserKey")] pub encrypted_user_key: String, diff --git a/crates/bitwarden-api-api/src/models/device_keys_update_request_model.rs b/crates/bitwarden-api-api/src/models/device_keys_update_request_model.rs index 8000d96fe..e32b1fada 100644 --- a/crates/bitwarden-api-api/src/models/device_keys_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/device_keys_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceKeysUpdateRequestModel { #[serde(rename = "encryptedPublicKey")] pub encrypted_public_key: String, diff --git a/crates/bitwarden-api-api/src/models/device_request_model.rs b/crates/bitwarden-api-api/src/models/device_request_model.rs index 856801792..fd69dead6 100644 --- a/crates/bitwarden-api-api/src/models/device_request_model.rs +++ b/crates/bitwarden-api-api/src/models/device_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceRequestModel { #[serde(rename = "type")] - pub r#type: crate::models::DeviceType, + pub r#type: models::DeviceType, #[serde(rename = "name")] pub name: String, #[serde(rename = "identifier")] @@ -21,11 +25,7 @@ pub struct DeviceRequestModel { } impl DeviceRequestModel { - pub fn new( - r#type: crate::models::DeviceType, - name: String, - identifier: String, - ) -> DeviceRequestModel { + pub fn new(r#type: models::DeviceType, name: String, identifier: String) -> DeviceRequestModel { DeviceRequestModel { r#type, name, diff --git a/crates/bitwarden-api-api/src/models/device_response_model.rs b/crates/bitwarden-api-api/src/models/device_response_model.rs index 08a7bfe2f..c9bc8f53a 100644 --- a/crates/bitwarden-api-api/src/models/device_response_model.rs +++ b/crates/bitwarden-api-api/src/models/device_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct DeviceResponseModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "creationDate", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/device_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/device_response_model_list_response_model.rs index 6db95f61f..ee01e7fd2 100644 --- a/crates/bitwarden-api-api/src/models/device_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/device_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/device_token_request_model.rs b/crates/bitwarden-api-api/src/models/device_token_request_model.rs index 295d8545d..1ec6f85dc 100644 --- a/crates/bitwarden-api-api/src/models/device_token_request_model.rs +++ b/crates/bitwarden-api-api/src/models/device_token_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceTokenRequestModel { #[serde(rename = "pushToken", skip_serializing_if = "Option::is_none")] pub push_token: Option, diff --git a/crates/bitwarden-api-api/src/models/device_type.rs b/crates/bitwarden-api-api/src/models/device_type.rs index 12e162ce6..eeac7b34b 100644 --- a/crates/bitwarden-api-api/src/models/device_type.rs +++ b/crates/bitwarden-api-api/src/models/device_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum DeviceType { Android = 0, @@ -42,35 +55,35 @@ pub enum DeviceType { LinuxCLI = 25, } -impl ToString for DeviceType { - fn to_string(&self) -> String { +impl std::fmt::Display for DeviceType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Android => String::from("0"), - Self::iOS => String::from("1"), - Self::ChromeExtension => String::from("2"), - Self::FirefoxExtension => String::from("3"), - Self::OperaExtension => String::from("4"), - Self::EdgeExtension => String::from("5"), - Self::WindowsDesktop => String::from("6"), - Self::MacOsDesktop => String::from("7"), - Self::LinuxDesktop => String::from("8"), - Self::ChromeBrowser => String::from("9"), - Self::FirefoxBrowser => String::from("10"), - Self::OperaBrowser => String::from("11"), - Self::EdgeBrowser => String::from("12"), - Self::IEBrowser => String::from("13"), - Self::UnknownBrowser => String::from("14"), - Self::AndroidAmazon => String::from("15"), - Self::UWP => String::from("16"), - Self::SafariBrowser => String::from("17"), - Self::VivaldiBrowser => String::from("18"), - Self::VivaldiExtension => String::from("19"), - Self::SafariExtension => String::from("20"), - Self::SDK => String::from("21"), - Self::Server => String::from("22"), - Self::WindowsCLI => String::from("23"), - Self::MacOsCLI => String::from("24"), - Self::LinuxCLI => String::from("25"), + Self::Android => write!(f, "0"), + Self::iOS => write!(f, "1"), + Self::ChromeExtension => write!(f, "2"), + Self::FirefoxExtension => write!(f, "3"), + Self::OperaExtension => write!(f, "4"), + Self::EdgeExtension => write!(f, "5"), + Self::WindowsDesktop => write!(f, "6"), + Self::MacOsDesktop => write!(f, "7"), + Self::LinuxDesktop => write!(f, "8"), + Self::ChromeBrowser => write!(f, "9"), + Self::FirefoxBrowser => write!(f, "10"), + Self::OperaBrowser => write!(f, "11"), + Self::EdgeBrowser => write!(f, "12"), + Self::IEBrowser => write!(f, "13"), + Self::UnknownBrowser => write!(f, "14"), + Self::AndroidAmazon => write!(f, "15"), + Self::UWP => write!(f, "16"), + Self::SafariBrowser => write!(f, "17"), + Self::VivaldiBrowser => write!(f, "18"), + Self::VivaldiExtension => write!(f, "19"), + Self::SafariExtension => write!(f, "20"), + Self::SDK => write!(f, "21"), + Self::Server => write!(f, "22"), + Self::WindowsCLI => write!(f, "23"), + Self::MacOsCLI => write!(f, "24"), + Self::LinuxCLI => write!(f, "25"), } } } diff --git a/crates/bitwarden-api-api/src/models/device_verification_request_model.rs b/crates/bitwarden-api-api/src/models/device_verification_request_model.rs index e6a6907f5..facc28ece 100644 --- a/crates/bitwarden-api-api/src/models/device_verification_request_model.rs +++ b/crates/bitwarden-api-api/src/models/device_verification_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceVerificationRequestModel { #[serde(rename = "unknownDeviceVerificationEnabled")] pub unknown_device_verification_enabled: bool, diff --git a/crates/bitwarden-api-api/src/models/device_verification_response_model.rs b/crates/bitwarden-api-api/src/models/device_verification_response_model.rs index e9077828b..cd46a1402 100644 --- a/crates/bitwarden-api-api/src/models/device_verification_response_model.rs +++ b/crates/bitwarden-api-api/src/models/device_verification_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DeviceVerificationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/domains_response_model.rs b/crates/bitwarden-api-api/src/models/domains_response_model.rs index 8ccab95c1..30a9374a8 100644 --- a/crates/bitwarden-api-api/src/models/domains_response_model.rs +++ b/crates/bitwarden-api-api/src/models/domains_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct DomainsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -18,7 +22,7 @@ pub struct DomainsResponseModel { rename = "globalEquivalentDomains", skip_serializing_if = "Option::is_none" )] - pub global_equivalent_domains: Option>, + pub global_equivalent_domains: Option>, } impl DomainsResponseModel { diff --git a/crates/bitwarden-api-api/src/models/email_request_model.rs b/crates/bitwarden-api-api/src/models/email_request_model.rs index e8db8de94..67b5c5b0f 100644 --- a/crates/bitwarden-api-api/src/models/email_request_model.rs +++ b/crates/bitwarden-api-api/src/models/email_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmailRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/email_token_request_model.rs b/crates/bitwarden-api-api/src/models/email_token_request_model.rs index 09ea36974..903913c52 100644 --- a/crates/bitwarden-api-api/src/models/email_token_request_model.rs +++ b/crates/bitwarden-api-api/src/models/email_token_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmailTokenRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model.rs index 6869f6709..4176c9248 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessGranteeDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "waitTimeDays", skip_serializing_if = "Option::is_none")] pub wait_time_days: Option, #[serde(rename = "granteeId", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model_list_response_model.rs index 9d76aaea9..978007da0 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_grantee_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessGranteeDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model.rs index 902cd938c..d5b65b493 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessGrantorDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "waitTimeDays", skip_serializing_if = "Option::is_none")] pub wait_time_days: Option, #[serde(rename = "grantorId", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model_list_response_model.rs index 414f5037f..e0fc31f69 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_grantor_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessGrantorDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/emergency_access_invite_request_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_invite_request_model.rs index 2d85903aa..76dfb6346 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_invite_request_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_invite_request_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessInviteRequestModel { #[serde(rename = "email")] pub email: String, #[serde(rename = "type")] - pub r#type: crate::models::EmergencyAccessType, + pub r#type: models::EmergencyAccessType, #[serde(rename = "waitTimeDays")] pub wait_time_days: i32, } @@ -21,7 +25,7 @@ pub struct EmergencyAccessInviteRequestModel { impl EmergencyAccessInviteRequestModel { pub fn new( email: String, - r#type: crate::models::EmergencyAccessType, + r#type: models::EmergencyAccessType, wait_time_days: i32, ) -> EmergencyAccessInviteRequestModel { EmergencyAccessInviteRequestModel { diff --git a/crates/bitwarden-api-api/src/models/emergency_access_password_request_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_password_request_model.rs index 091a31495..dbb6c493d 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_password_request_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_password_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessPasswordRequestModel { #[serde(rename = "newMasterPasswordHash")] pub new_master_password_hash: String, diff --git a/crates/bitwarden-api-api/src/models/emergency_access_status_type.rs b/crates/bitwarden-api-api/src/models/emergency_access_status_type.rs index 9b046f3eb..6491a52cd 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_status_type.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_status_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum EmergencyAccessStatusType { Invited = 0, @@ -21,14 +34,14 @@ pub enum EmergencyAccessStatusType { RecoveryApproved = 4, } -impl ToString for EmergencyAccessStatusType { - fn to_string(&self) -> String { +impl std::fmt::Display for EmergencyAccessStatusType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Invited => String::from("0"), - Self::Accepted => String::from("1"), - Self::Confirmed => String::from("2"), - Self::RecoveryInitiated => String::from("3"), - Self::RecoveryApproved => String::from("4"), + Self::Invited => write!(f, "0"), + Self::Accepted => write!(f, "1"), + Self::Confirmed => write!(f, "2"), + Self::RecoveryInitiated => write!(f, "3"), + Self::RecoveryApproved => write!(f, "4"), } } } diff --git a/crates/bitwarden-api-api/src/models/emergency_access_takeover_response_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_takeover_response_model.rs index c4bd0786a..659b2c36d 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_takeover_response_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_takeover_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessTakeoverResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -19,7 +23,7 @@ pub struct EmergencyAccessTakeoverResponseModel { #[serde(rename = "kdfParallelism", skip_serializing_if = "Option::is_none")] pub kdf_parallelism: Option, #[serde(rename = "kdf", skip_serializing_if = "Option::is_none")] - pub kdf: Option, + pub kdf: Option, #[serde(rename = "keyEncrypted", skip_serializing_if = "Option::is_none")] pub key_encrypted: Option, } diff --git a/crates/bitwarden-api-api/src/models/emergency_access_type.rs b/crates/bitwarden-api-api/src/models/emergency_access_type.rs index 317c42f94..ad6dc5a84 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_type.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum EmergencyAccessType { View = 0, Takeover = 1, } -impl ToString for EmergencyAccessType { - fn to_string(&self) -> String { +impl std::fmt::Display for EmergencyAccessType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::View => String::from("0"), - Self::Takeover => String::from("1"), + Self::View => write!(f, "0"), + Self::Takeover => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/emergency_access_update_request_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_update_request_model.rs index 433041c35..0f37a655a 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_update_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessUpdateRequestModel { #[serde(rename = "type")] - pub r#type: crate::models::EmergencyAccessType, + pub r#type: models::EmergencyAccessType, #[serde(rename = "waitTimeDays")] pub wait_time_days: i32, #[serde(rename = "keyEncrypted", skip_serializing_if = "Option::is_none")] @@ -20,7 +24,7 @@ pub struct EmergencyAccessUpdateRequestModel { impl EmergencyAccessUpdateRequestModel { pub fn new( - r#type: crate::models::EmergencyAccessType, + r#type: models::EmergencyAccessType, wait_time_days: i32, ) -> EmergencyAccessUpdateRequestModel { EmergencyAccessUpdateRequestModel { diff --git a/crates/bitwarden-api-api/src/models/emergency_access_view_response_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_view_response_model.rs index 4e58cda5e..8103e8687 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_view_response_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_view_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessViewResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "keyEncrypted", skip_serializing_if = "Option::is_none")] pub key_encrypted: Option, #[serde(rename = "ciphers", skip_serializing_if = "Option::is_none")] - pub ciphers: Option>, + pub ciphers: Option>, } impl EmergencyAccessViewResponseModel { diff --git a/crates/bitwarden-api-api/src/models/emergency_access_with_id_request_model.rs b/crates/bitwarden-api-api/src/models/emergency_access_with_id_request_model.rs index 45d16e39b..50512b871 100644 --- a/crates/bitwarden-api-api/src/models/emergency_access_with_id_request_model.rs +++ b/crates/bitwarden-api-api/src/models/emergency_access_with_id_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmergencyAccessWithIdRequestModel { #[serde(rename = "type")] - pub r#type: crate::models::EmergencyAccessType, + pub r#type: models::EmergencyAccessType, #[serde(rename = "waitTimeDays")] pub wait_time_days: i32, #[serde(rename = "keyEncrypted", skip_serializing_if = "Option::is_none")] @@ -22,7 +26,7 @@ pub struct EmergencyAccessWithIdRequestModel { impl EmergencyAccessWithIdRequestModel { pub fn new( - r#type: crate::models::EmergencyAccessType, + r#type: models::EmergencyAccessType, wait_time_days: i32, id: uuid::Uuid, ) -> EmergencyAccessWithIdRequestModel { diff --git a/crates/bitwarden-api-api/src/models/environment_config_response_model.rs b/crates/bitwarden-api-api/src/models/environment_config_response_model.rs index 9bb550571..d32de4dd1 100644 --- a/crates/bitwarden-api-api/src/models/environment_config_response_model.rs +++ b/crates/bitwarden-api-api/src/models/environment_config_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EnvironmentConfigResponseModel { #[serde(rename = "cloudRegion", skip_serializing_if = "Option::is_none")] pub cloud_region: Option, diff --git a/crates/bitwarden-api-api/src/models/event_response_model.rs b/crates/bitwarden-api-api/src/models/event_response_model.rs index b634ef7dc..487e0f30f 100644 --- a/crates/bitwarden-api-api/src/models/event_response_model.rs +++ b/crates/bitwarden-api-api/src/models/event_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EventResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] @@ -44,11 +48,11 @@ pub struct EventResponseModel { #[serde(rename = "date", skip_serializing_if = "Option::is_none")] pub date: Option, #[serde(rename = "deviceType", skip_serializing_if = "Option::is_none")] - pub device_type: Option, + pub device_type: Option, #[serde(rename = "ipAddress", skip_serializing_if = "Option::is_none")] pub ip_address: Option, #[serde(rename = "systemUser", skip_serializing_if = "Option::is_none")] - pub system_user: Option, + pub system_user: Option, #[serde(rename = "domainName", skip_serializing_if = "Option::is_none")] pub domain_name: Option, #[serde(rename = "secretId", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/event_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/event_response_model_list_response_model.rs index 40f1d9e8e..c573980e8 100644 --- a/crates/bitwarden-api-api/src/models/event_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/event_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EventResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/event_system_user.rs b/crates/bitwarden-api-api/src/models/event_system_user.rs index afb1333e8..b7a70d769 100644 --- a/crates/bitwarden-api-api/src/models/event_system_user.rs +++ b/crates/bitwarden-api-api/src/models/event_system_user.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum EventSystemUser { SCIM = 1, DomainVerification = 2, } -impl ToString for EventSystemUser { - fn to_string(&self) -> String { +impl std::fmt::Display for EventSystemUser { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::SCIM => String::from("1"), - Self::DomainVerification => String::from("2"), + Self::SCIM => write!(f, "1"), + Self::DomainVerification => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/event_type.rs b/crates/bitwarden-api-api/src/models/event_type.rs index 2826c1fb4..366ed6c18 100644 --- a/crates/bitwarden-api-api/src/models/event_type.rs +++ b/crates/bitwarden-api-api/src/models/event_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum EventType { User_LoggedIn = 1000, @@ -90,83 +103,83 @@ pub enum EventType { Secret_Retrieved = 2100, } -impl ToString for EventType { - fn to_string(&self) -> String { +impl std::fmt::Display for EventType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::User_LoggedIn => String::from("1000"), - Self::User_ChangedPassword => String::from("1001"), - Self::User_Updated2fa => String::from("1002"), - Self::User_Disabled2fa => String::from("1003"), - Self::User_Recovered2fa => String::from("1004"), - Self::User_FailedLogIn => String::from("1005"), - Self::User_FailedLogIn2fa => String::from("1006"), - Self::User_ClientExportedVault => String::from("1007"), - Self::User_UpdatedTempPassword => String::from("1008"), - Self::User_MigratedKeyToKeyConnector => String::from("1009"), - Self::User_RequestedDeviceApproval => String::from("1010"), - Self::Cipher_Created => String::from("1100"), - Self::Cipher_Updated => String::from("1101"), - Self::Cipher_Deleted => String::from("1102"), - Self::Cipher_AttachmentCreated => String::from("1103"), - Self::Cipher_AttachmentDeleted => String::from("1104"), - Self::Cipher_Shared => String::from("1105"), - Self::Cipher_UpdatedCollections => String::from("1106"), - Self::Cipher_ClientViewed => String::from("1107"), - Self::Cipher_ClientToggledPasswordVisible => String::from("1108"), - Self::Cipher_ClientToggledHiddenFieldVisible => String::from("1109"), - Self::Cipher_ClientToggledCardCodeVisible => String::from("1110"), - Self::Cipher_ClientCopiedPassword => String::from("1111"), - Self::Cipher_ClientCopiedHiddenField => String::from("1112"), - Self::Cipher_ClientCopiedCardCode => String::from("1113"), - Self::Cipher_ClientAutofilled => String::from("1114"), - Self::Cipher_SoftDeleted => String::from("1115"), - Self::Cipher_Restored => String::from("1116"), - Self::Cipher_ClientToggledCardNumberVisible => String::from("1117"), - Self::Collection_Created => String::from("1300"), - Self::Collection_Updated => String::from("1301"), - Self::Collection_Deleted => String::from("1302"), - Self::Group_Created => String::from("1400"), - Self::Group_Updated => String::from("1401"), - Self::Group_Deleted => String::from("1402"), - Self::OrganizationUser_Invited => String::from("1500"), - Self::OrganizationUser_Confirmed => String::from("1501"), - Self::OrganizationUser_Updated => String::from("1502"), - Self::OrganizationUser_Removed => String::from("1503"), - Self::OrganizationUser_UpdatedGroups => String::from("1504"), - Self::OrganizationUser_UnlinkedSso => String::from("1505"), - Self::OrganizationUser_ResetPassword_Enroll => String::from("1506"), - Self::OrganizationUser_ResetPassword_Withdraw => String::from("1507"), - Self::OrganizationUser_AdminResetPassword => String::from("1508"), - Self::OrganizationUser_ResetSsoLink => String::from("1509"), - Self::OrganizationUser_FirstSsoLogin => String::from("1510"), - Self::OrganizationUser_Revoked => String::from("1511"), - Self::OrganizationUser_Restored => String::from("1512"), - Self::OrganizationUser_ApprovedAuthRequest => String::from("1513"), - Self::OrganizationUser_RejectedAuthRequest => String::from("1514"), - Self::Organization_Updated => String::from("1600"), - Self::Organization_PurgedVault => String::from("1601"), - Self::Organization_ClientExportedVault => String::from("1602"), - Self::Organization_VaultAccessed => String::from("1603"), - Self::Organization_EnabledSso => String::from("1604"), - Self::Organization_DisabledSso => String::from("1605"), - Self::Organization_EnabledKeyConnector => String::from("1606"), - Self::Organization_DisabledKeyConnector => String::from("1607"), - Self::Organization_SponsorshipsSynced => String::from("1608"), - Self::Organization_CollectionManagement_Updated => String::from("1609"), - Self::Policy_Updated => String::from("1700"), - Self::ProviderUser_Invited => String::from("1800"), - Self::ProviderUser_Confirmed => String::from("1801"), - Self::ProviderUser_Updated => String::from("1802"), - Self::ProviderUser_Removed => String::from("1803"), - Self::ProviderOrganization_Created => String::from("1900"), - Self::ProviderOrganization_Added => String::from("1901"), - Self::ProviderOrganization_Removed => String::from("1902"), - Self::ProviderOrganization_VaultAccessed => String::from("1903"), - Self::OrganizationDomain_Added => String::from("2000"), - Self::OrganizationDomain_Removed => String::from("2001"), - Self::OrganizationDomain_Verified => String::from("2002"), - Self::OrganizationDomain_NotVerified => String::from("2003"), - Self::Secret_Retrieved => String::from("2100"), + Self::User_LoggedIn => write!(f, "1000"), + Self::User_ChangedPassword => write!(f, "1001"), + Self::User_Updated2fa => write!(f, "1002"), + Self::User_Disabled2fa => write!(f, "1003"), + Self::User_Recovered2fa => write!(f, "1004"), + Self::User_FailedLogIn => write!(f, "1005"), + Self::User_FailedLogIn2fa => write!(f, "1006"), + Self::User_ClientExportedVault => write!(f, "1007"), + Self::User_UpdatedTempPassword => write!(f, "1008"), + Self::User_MigratedKeyToKeyConnector => write!(f, "1009"), + Self::User_RequestedDeviceApproval => write!(f, "1010"), + Self::Cipher_Created => write!(f, "1100"), + Self::Cipher_Updated => write!(f, "1101"), + Self::Cipher_Deleted => write!(f, "1102"), + Self::Cipher_AttachmentCreated => write!(f, "1103"), + Self::Cipher_AttachmentDeleted => write!(f, "1104"), + Self::Cipher_Shared => write!(f, "1105"), + Self::Cipher_UpdatedCollections => write!(f, "1106"), + Self::Cipher_ClientViewed => write!(f, "1107"), + Self::Cipher_ClientToggledPasswordVisible => write!(f, "1108"), + Self::Cipher_ClientToggledHiddenFieldVisible => write!(f, "1109"), + Self::Cipher_ClientToggledCardCodeVisible => write!(f, "1110"), + Self::Cipher_ClientCopiedPassword => write!(f, "1111"), + Self::Cipher_ClientCopiedHiddenField => write!(f, "1112"), + Self::Cipher_ClientCopiedCardCode => write!(f, "1113"), + Self::Cipher_ClientAutofilled => write!(f, "1114"), + Self::Cipher_SoftDeleted => write!(f, "1115"), + Self::Cipher_Restored => write!(f, "1116"), + Self::Cipher_ClientToggledCardNumberVisible => write!(f, "1117"), + Self::Collection_Created => write!(f, "1300"), + Self::Collection_Updated => write!(f, "1301"), + Self::Collection_Deleted => write!(f, "1302"), + Self::Group_Created => write!(f, "1400"), + Self::Group_Updated => write!(f, "1401"), + Self::Group_Deleted => write!(f, "1402"), + Self::OrganizationUser_Invited => write!(f, "1500"), + Self::OrganizationUser_Confirmed => write!(f, "1501"), + Self::OrganizationUser_Updated => write!(f, "1502"), + Self::OrganizationUser_Removed => write!(f, "1503"), + Self::OrganizationUser_UpdatedGroups => write!(f, "1504"), + Self::OrganizationUser_UnlinkedSso => write!(f, "1505"), + Self::OrganizationUser_ResetPassword_Enroll => write!(f, "1506"), + Self::OrganizationUser_ResetPassword_Withdraw => write!(f, "1507"), + Self::OrganizationUser_AdminResetPassword => write!(f, "1508"), + Self::OrganizationUser_ResetSsoLink => write!(f, "1509"), + Self::OrganizationUser_FirstSsoLogin => write!(f, "1510"), + Self::OrganizationUser_Revoked => write!(f, "1511"), + Self::OrganizationUser_Restored => write!(f, "1512"), + Self::OrganizationUser_ApprovedAuthRequest => write!(f, "1513"), + Self::OrganizationUser_RejectedAuthRequest => write!(f, "1514"), + Self::Organization_Updated => write!(f, "1600"), + Self::Organization_PurgedVault => write!(f, "1601"), + Self::Organization_ClientExportedVault => write!(f, "1602"), + Self::Organization_VaultAccessed => write!(f, "1603"), + Self::Organization_EnabledSso => write!(f, "1604"), + Self::Organization_DisabledSso => write!(f, "1605"), + Self::Organization_EnabledKeyConnector => write!(f, "1606"), + Self::Organization_DisabledKeyConnector => write!(f, "1607"), + Self::Organization_SponsorshipsSynced => write!(f, "1608"), + Self::Organization_CollectionManagement_Updated => write!(f, "1609"), + Self::Policy_Updated => write!(f, "1700"), + Self::ProviderUser_Invited => write!(f, "1800"), + Self::ProviderUser_Confirmed => write!(f, "1801"), + Self::ProviderUser_Updated => write!(f, "1802"), + Self::ProviderUser_Removed => write!(f, "1803"), + Self::ProviderOrganization_Created => write!(f, "1900"), + Self::ProviderOrganization_Added => write!(f, "1901"), + Self::ProviderOrganization_Removed => write!(f, "1902"), + Self::ProviderOrganization_VaultAccessed => write!(f, "1903"), + Self::OrganizationDomain_Added => write!(f, "2000"), + Self::OrganizationDomain_Removed => write!(f, "2001"), + Self::OrganizationDomain_Verified => write!(f, "2002"), + Self::OrganizationDomain_NotVerified => write!(f, "2003"), + Self::Secret_Retrieved => write!(f, "2100"), } } } diff --git a/crates/bitwarden-api-api/src/models/expanded_tax_info_update_request_model.rs b/crates/bitwarden-api-api/src/models/expanded_tax_info_update_request_model.rs index a8b676402..f30f4c474 100644 --- a/crates/bitwarden-api-api/src/models/expanded_tax_info_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/expanded_tax_info_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ExpandedTaxInfoUpdateRequestModel { #[serde(rename = "country")] pub country: String, diff --git a/crates/bitwarden-api-api/src/models/fido2_user.rs b/crates/bitwarden-api-api/src/models/fido2_user.rs index 542019d39..8f2eb1712 100644 --- a/crates/bitwarden-api-api/src/models/fido2_user.rs +++ b/crates/bitwarden-api-api/src/models/fido2_user.rs @@ -8,12 +8,19 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Fido2User { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, + #[serde_as(as = "Option")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")] - pub id: Option, + pub id: Option>, #[serde(rename = "displayName", skip_serializing_if = "Option::is_none")] pub display_name: Option, } diff --git a/crates/bitwarden-api-api/src/models/field_type.rs b/crates/bitwarden-api-api/src/models/field_type.rs index 3a6209399..f02b261d7 100644 --- a/crates/bitwarden-api-api/src/models/field_type.rs +++ b/crates/bitwarden-api-api/src/models/field_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum FieldType { Text = 0, @@ -20,13 +33,13 @@ pub enum FieldType { Linked = 3, } -impl ToString for FieldType { - fn to_string(&self) -> String { +impl std::fmt::Display for FieldType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Text => String::from("0"), - Self::Hidden => String::from("1"), - Self::Boolean => String::from("2"), - Self::Linked => String::from("3"), + Self::Text => write!(f, "0"), + Self::Hidden => write!(f, "1"), + Self::Boolean => write!(f, "2"), + Self::Linked => write!(f, "3"), } } } diff --git a/crates/bitwarden-api-api/src/models/file_upload_type.rs b/crates/bitwarden-api-api/src/models/file_upload_type.rs index 79327b3cb..7b831cd7c 100644 --- a/crates/bitwarden-api-api/src/models/file_upload_type.rs +++ b/crates/bitwarden-api-api/src/models/file_upload_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum FileUploadType { Direct = 0, Azure = 1, } -impl ToString for FileUploadType { - fn to_string(&self) -> String { +impl std::fmt::Display for FileUploadType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Direct => String::from("0"), - Self::Azure => String::from("1"), + Self::Direct => write!(f, "0"), + Self::Azure => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/folder_request_model.rs b/crates/bitwarden-api-api/src/models/folder_request_model.rs index cb73d7693..74831b75a 100644 --- a/crates/bitwarden-api-api/src/models/folder_request_model.rs +++ b/crates/bitwarden-api-api/src/models/folder_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct FolderRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/folder_response_model.rs b/crates/bitwarden-api-api/src/models/folder_response_model.rs index 705c45f04..c478e5469 100644 --- a/crates/bitwarden-api-api/src/models/folder_response_model.rs +++ b/crates/bitwarden-api-api/src/models/folder_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct FolderResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/folder_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/folder_response_model_list_response_model.rs index 3a12dfd31..473c6affd 100644 --- a/crates/bitwarden-api-api/src/models/folder_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/folder_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct FolderResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/folder_with_id_request_model.rs b/crates/bitwarden-api-api/src/models/folder_with_id_request_model.rs index a69b5ef8c..b89ceec3f 100644 --- a/crates/bitwarden-api-api/src/models/folder_with_id_request_model.rs +++ b/crates/bitwarden-api-api/src/models/folder_with_id_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct FolderWithIdRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/get_secrets_request_model.rs b/crates/bitwarden-api-api/src/models/get_secrets_request_model.rs index 93ca67bde..931e37fc0 100644 --- a/crates/bitwarden-api-api/src/models/get_secrets_request_model.rs +++ b/crates/bitwarden-api-api/src/models/get_secrets_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GetSecretsRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/global_domains.rs b/crates/bitwarden-api-api/src/models/global_domains.rs index b86399762..db487f09d 100644 --- a/crates/bitwarden-api-api/src/models/global_domains.rs +++ b/crates/bitwarden-api-api/src/models/global_domains.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GlobalDomains { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] pub r#type: Option, diff --git a/crates/bitwarden-api-api/src/models/global_equivalent_domains_type.rs b/crates/bitwarden-api-api/src/models/global_equivalent_domains_type.rs index f30b2d5e7..edb7c5e21 100644 --- a/crates/bitwarden-api-api/src/models/global_equivalent_domains_type.rs +++ b/crates/bitwarden-api-api/src/models/global_equivalent_domains_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum GlobalEquivalentDomainsType { Google = 0, @@ -107,100 +120,100 @@ pub enum GlobalEquivalentDomainsType { Pinterest = 90, } -impl ToString for GlobalEquivalentDomainsType { - fn to_string(&self) -> String { +impl std::fmt::Display for GlobalEquivalentDomainsType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Google => String::from("0"), - Self::Apple => String::from("1"), - Self::Ameritrade => String::from("2"), - Self::BoA => String::from("3"), - Self::Sprint => String::from("4"), - Self::WellsFargo => String::from("5"), - Self::Merrill => String::from("6"), - Self::Citi => String::from("7"), - Self::Cnet => String::from("8"), - Self::Gap => String::from("9"), - Self::Microsoft => String::from("10"), - Self::United => String::from("11"), - Self::Yahoo => String::from("12"), - Self::Zonelabs => String::from("13"), - Self::PayPal => String::from("14"), - Self::Avon => String::from("15"), - Self::Diapers => String::from("16"), - Self::Contacts => String::from("17"), - Self::Amazon => String::from("18"), - Self::Cox => String::from("19"), - Self::Norton => String::from("20"), - Self::Verizon => String::from("21"), - Self::Buy => String::from("22"), - Self::Sirius => String::from("23"), - Self::Ea => String::from("24"), - Self::Basecamp => String::from("25"), - Self::Steam => String::from("26"), - Self::Chart => String::from("27"), - Self::Gotomeeting => String::from("28"), - Self::Gogo => String::from("29"), - Self::Oracle => String::from("30"), - Self::Discover => String::from("31"), - Self::Dcu => String::from("32"), - Self::Healthcare => String::from("33"), - Self::Pepco => String::from("34"), - Self::Century21 => String::from("35"), - Self::Comcast => String::from("36"), - Self::Cricket => String::from("37"), - Self::Mtb => String::from("38"), - Self::Dropbox => String::from("39"), - Self::Snapfish => String::from("40"), - Self::Alibaba => String::from("41"), - Self::Playstation => String::from("42"), - Self::Mercado => String::from("43"), - Self::Zendesk => String::from("44"), - Self::Autodesk => String::from("45"), - Self::RailNation => String::from("46"), - Self::Wpcu => String::from("47"), - Self::Mathletics => String::from("48"), - Self::Discountbank => String::from("49"), - Self::Mi => String::from("50"), - Self::Facebook => String::from("51"), - Self::Postepay => String::from("52"), - Self::Skysports => String::from("53"), - Self::Disney => String::from("54"), - Self::Pokemon => String::from("55"), - Self::Uv => String::from("56"), - Self::Yahavo => String::from("57"), - Self::Mdsol => String::from("58"), - Self::Sears => String::from("59"), - Self::Xiami => String::from("60"), - Self::Belkin => String::from("61"), - Self::Turbotax => String::from("62"), - Self::Shopify => String::from("63"), - Self::Ebay => String::from("64"), - Self::Techdata => String::from("65"), - Self::Schwab => String::from("66"), - Self::Mozilla => String::from("67"), - Self::Tesla => String::from("68"), - Self::MorganStanley => String::from("69"), - Self::TaxAct => String::from("70"), - Self::Wikimedia => String::from("71"), - Self::Airbnb => String::from("72"), - Self::Eventbrite => String::from("73"), - Self::StackExchange => String::from("74"), - Self::Docusign => String::from("75"), - Self::Envato => String::from("76"), - Self::X10Hosting => String::from("77"), - Self::Cisco => String::from("78"), - Self::CedarFair => String::from("79"), - Self::Ubiquiti => String::from("80"), - Self::Discord => String::from("81"), - Self::Netcup => String::from("82"), - Self::Yandex => String::from("83"), - Self::Sony => String::from("84"), - Self::Proton => String::from("85"), - Self::Ubisoft => String::from("86"), - Self::TransferWise => String::from("87"), - Self::TakeawayEU => String::from("88"), - Self::Atlassian => String::from("89"), - Self::Pinterest => String::from("90"), + Self::Google => write!(f, "0"), + Self::Apple => write!(f, "1"), + Self::Ameritrade => write!(f, "2"), + Self::BoA => write!(f, "3"), + Self::Sprint => write!(f, "4"), + Self::WellsFargo => write!(f, "5"), + Self::Merrill => write!(f, "6"), + Self::Citi => write!(f, "7"), + Self::Cnet => write!(f, "8"), + Self::Gap => write!(f, "9"), + Self::Microsoft => write!(f, "10"), + Self::United => write!(f, "11"), + Self::Yahoo => write!(f, "12"), + Self::Zonelabs => write!(f, "13"), + Self::PayPal => write!(f, "14"), + Self::Avon => write!(f, "15"), + Self::Diapers => write!(f, "16"), + Self::Contacts => write!(f, "17"), + Self::Amazon => write!(f, "18"), + Self::Cox => write!(f, "19"), + Self::Norton => write!(f, "20"), + Self::Verizon => write!(f, "21"), + Self::Buy => write!(f, "22"), + Self::Sirius => write!(f, "23"), + Self::Ea => write!(f, "24"), + Self::Basecamp => write!(f, "25"), + Self::Steam => write!(f, "26"), + Self::Chart => write!(f, "27"), + Self::Gotomeeting => write!(f, "28"), + Self::Gogo => write!(f, "29"), + Self::Oracle => write!(f, "30"), + Self::Discover => write!(f, "31"), + Self::Dcu => write!(f, "32"), + Self::Healthcare => write!(f, "33"), + Self::Pepco => write!(f, "34"), + Self::Century21 => write!(f, "35"), + Self::Comcast => write!(f, "36"), + Self::Cricket => write!(f, "37"), + Self::Mtb => write!(f, "38"), + Self::Dropbox => write!(f, "39"), + Self::Snapfish => write!(f, "40"), + Self::Alibaba => write!(f, "41"), + Self::Playstation => write!(f, "42"), + Self::Mercado => write!(f, "43"), + Self::Zendesk => write!(f, "44"), + Self::Autodesk => write!(f, "45"), + Self::RailNation => write!(f, "46"), + Self::Wpcu => write!(f, "47"), + Self::Mathletics => write!(f, "48"), + Self::Discountbank => write!(f, "49"), + Self::Mi => write!(f, "50"), + Self::Facebook => write!(f, "51"), + Self::Postepay => write!(f, "52"), + Self::Skysports => write!(f, "53"), + Self::Disney => write!(f, "54"), + Self::Pokemon => write!(f, "55"), + Self::Uv => write!(f, "56"), + Self::Yahavo => write!(f, "57"), + Self::Mdsol => write!(f, "58"), + Self::Sears => write!(f, "59"), + Self::Xiami => write!(f, "60"), + Self::Belkin => write!(f, "61"), + Self::Turbotax => write!(f, "62"), + Self::Shopify => write!(f, "63"), + Self::Ebay => write!(f, "64"), + Self::Techdata => write!(f, "65"), + Self::Schwab => write!(f, "66"), + Self::Mozilla => write!(f, "67"), + Self::Tesla => write!(f, "68"), + Self::MorganStanley => write!(f, "69"), + Self::TaxAct => write!(f, "70"), + Self::Wikimedia => write!(f, "71"), + Self::Airbnb => write!(f, "72"), + Self::Eventbrite => write!(f, "73"), + Self::StackExchange => write!(f, "74"), + Self::Docusign => write!(f, "75"), + Self::Envato => write!(f, "76"), + Self::X10Hosting => write!(f, "77"), + Self::Cisco => write!(f, "78"), + Self::CedarFair => write!(f, "79"), + Self::Ubiquiti => write!(f, "80"), + Self::Discord => write!(f, "81"), + Self::Netcup => write!(f, "82"), + Self::Yandex => write!(f, "83"), + Self::Sony => write!(f, "84"), + Self::Proton => write!(f, "85"), + Self::Ubisoft => write!(f, "86"), + Self::TransferWise => write!(f, "87"), + Self::TakeawayEU => write!(f, "88"), + Self::Atlassian => write!(f, "89"), + Self::Pinterest => write!(f, "90"), } } } diff --git a/crates/bitwarden-api-api/src/models/granted_access_policy_request.rs b/crates/bitwarden-api-api/src/models/granted_access_policy_request.rs index 3d35274a0..c9b67f855 100644 --- a/crates/bitwarden-api-api/src/models/granted_access_policy_request.rs +++ b/crates/bitwarden-api-api/src/models/granted_access_policy_request.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GrantedAccessPolicyRequest { #[serde(rename = "grantedId")] pub granted_id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/group.rs b/crates/bitwarden-api-api/src/models/group.rs index 7133029b5..6d9feb83c 100644 --- a/crates/bitwarden-api-api/src/models/group.rs +++ b/crates/bitwarden-api-api/src/models/group.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Group { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/group_bulk_request_model.rs b/crates/bitwarden-api-api/src/models/group_bulk_request_model.rs index 432f9f6d8..75c0bff6d 100644 --- a/crates/bitwarden-api-api/src/models/group_bulk_request_model.rs +++ b/crates/bitwarden-api-api/src/models/group_bulk_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupBulkRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/group_details_response_model.rs b/crates/bitwarden-api-api/src/models/group_details_response_model.rs index d6ee7239a..7fc890d14 100644 --- a/crates/bitwarden-api-api/src/models/group_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/group_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -23,7 +27,7 @@ pub struct GroupDetailsResponseModel { #[serde(rename = "externalId", skip_serializing_if = "Option::is_none")] pub external_id: Option, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, } impl GroupDetailsResponseModel { diff --git a/crates/bitwarden-api-api/src/models/group_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/group_details_response_model_list_response_model.rs index c1c19d332..202c026f2 100644 --- a/crates/bitwarden-api-api/src/models/group_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/group_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/group_project_access_policy_response_model.rs b/crates/bitwarden-api-api/src/models/group_project_access_policy_response_model.rs index 2b6f5c9c0..bfd7aec3e 100644 --- a/crates/bitwarden-api-api/src/models/group_project_access_policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/group_project_access_policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupProjectAccessPolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/group_request_model.rs b/crates/bitwarden-api-api/src/models/group_request_model.rs index 0284a04d9..d986ebe13 100644 --- a/crates/bitwarden-api-api/src/models/group_request_model.rs +++ b/crates/bitwarden-api-api/src/models/group_request_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupRequestModel { #[serde(rename = "name")] pub name: String, #[serde(rename = "accessAll")] pub access_all: bool, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "users", skip_serializing_if = "Option::is_none")] pub users: Option>, } diff --git a/crates/bitwarden-api-api/src/models/group_response_model.rs b/crates/bitwarden-api-api/src/models/group_response_model.rs index 388fe68f5..4e9da78ee 100644 --- a/crates/bitwarden-api-api/src/models/group_response_model.rs +++ b/crates/bitwarden-api-api/src/models/group_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/group_service_account_access_policy_response_model.rs b/crates/bitwarden-api-api/src/models/group_service_account_access_policy_response_model.rs index af04b2cfe..9fcc03bea 100644 --- a/crates/bitwarden-api-api/src/models/group_service_account_access_policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/group_service_account_access_policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GroupServiceAccountAccessPolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/import_ciphers_request_model.rs b/crates/bitwarden-api-api/src/models/import_ciphers_request_model.rs index 371f2fa5c..b7db0f430 100644 --- a/crates/bitwarden-api-api/src/models/import_ciphers_request_model.rs +++ b/crates/bitwarden-api-api/src/models/import_ciphers_request_model.rs @@ -8,17 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ImportCiphersRequestModel { #[serde(rename = "folders", skip_serializing_if = "Option::is_none")] - pub folders: Option>, + pub folders: Option>, #[serde(rename = "ciphers", skip_serializing_if = "Option::is_none")] - pub ciphers: Option>, + pub ciphers: Option>, #[serde( rename = "folderRelationships", skip_serializing_if = "Option::is_none" )] - pub folder_relationships: Option>, + pub folder_relationships: Option>, } impl ImportCiphersRequestModel { diff --git a/crates/bitwarden-api-api/src/models/import_organization_ciphers_request_model.rs b/crates/bitwarden-api-api/src/models/import_organization_ciphers_request_model.rs index 894fb7131..fb893ebf7 100644 --- a/crates/bitwarden-api-api/src/models/import_organization_ciphers_request_model.rs +++ b/crates/bitwarden-api-api/src/models/import_organization_ciphers_request_model.rs @@ -8,17 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ImportOrganizationCiphersRequestModel { #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "ciphers", skip_serializing_if = "Option::is_none")] - pub ciphers: Option>, + pub ciphers: Option>, #[serde( rename = "collectionRelationships", skip_serializing_if = "Option::is_none" )] - pub collection_relationships: Option>, + pub collection_relationships: Option>, } impl ImportOrganizationCiphersRequestModel { diff --git a/crates/bitwarden-api-api/src/models/import_organization_users_request_model.rs b/crates/bitwarden-api-api/src/models/import_organization_users_request_model.rs index ff5be1b6f..f4f811193 100644 --- a/crates/bitwarden-api-api/src/models/import_organization_users_request_model.rs +++ b/crates/bitwarden-api-api/src/models/import_organization_users_request_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ImportOrganizationUsersRequestModel { #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] - pub groups: Option>, + pub groups: Option>, #[serde(rename = "users", skip_serializing_if = "Option::is_none")] - pub users: Option>, + pub users: Option>, #[serde(rename = "overwriteExisting", skip_serializing_if = "Option::is_none")] pub overwrite_existing: Option, #[serde(rename = "largeImport", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/inner_project_export_response_model.rs b/crates/bitwarden-api-api/src/models/inner_project_export_response_model.rs index a34dab3a6..1544b415b 100644 --- a/crates/bitwarden-api-api/src/models/inner_project_export_response_model.rs +++ b/crates/bitwarden-api-api/src/models/inner_project_export_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct InnerProjectExportResponseModel { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/inner_project_import_request_model.rs b/crates/bitwarden-api-api/src/models/inner_project_import_request_model.rs index 808504d83..469bba56f 100644 --- a/crates/bitwarden-api-api/src/models/inner_project_import_request_model.rs +++ b/crates/bitwarden-api-api/src/models/inner_project_import_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct InnerProjectImportRequestModel { #[serde(rename = "id")] pub id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/inner_secret_export_response_model.rs b/crates/bitwarden-api-api/src/models/inner_secret_export_response_model.rs index 7a55ad679..54db0fd03 100644 --- a/crates/bitwarden-api-api/src/models/inner_secret_export_response_model.rs +++ b/crates/bitwarden-api-api/src/models/inner_secret_export_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct InnerSecretExportResponseModel { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/inner_secret_import_request_model.rs b/crates/bitwarden-api-api/src/models/inner_secret_import_request_model.rs index bfe164eff..18531ba63 100644 --- a/crates/bitwarden-api-api/src/models/inner_secret_import_request_model.rs +++ b/crates/bitwarden-api-api/src/models/inner_secret_import_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct InnerSecretImportRequestModel { #[serde(rename = "id")] pub id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/installation_request_model.rs b/crates/bitwarden-api-api/src/models/installation_request_model.rs index 58b8924ef..b1e54d9aa 100644 --- a/crates/bitwarden-api-api/src/models/installation_request_model.rs +++ b/crates/bitwarden-api-api/src/models/installation_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct InstallationRequestModel { #[serde(rename = "email")] pub email: String, diff --git a/crates/bitwarden-api-api/src/models/installation_response_model.rs b/crates/bitwarden-api-api/src/models/installation_response_model.rs index 0d7009ff1..d78616cea 100644 --- a/crates/bitwarden-api-api/src/models/installation_response_model.rs +++ b/crates/bitwarden-api-api/src/models/installation_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct InstallationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/int32_int32_key_value_pair.rs b/crates/bitwarden-api-api/src/models/int32_int32_key_value_pair.rs index 831f0e03a..aa0ae7615 100644 --- a/crates/bitwarden-api-api/src/models/int32_int32_key_value_pair.rs +++ b/crates/bitwarden-api-api/src/models/int32_int32_key_value_pair.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Int32Int32KeyValuePair { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, diff --git a/crates/bitwarden-api-api/src/models/kdf_request_model.rs b/crates/bitwarden-api-api/src/models/kdf_request_model.rs index 2f43e2f45..948a3e89e 100644 --- a/crates/bitwarden-api-api/src/models/kdf_request_model.rs +++ b/crates/bitwarden-api-api/src/models/kdf_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct KdfRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, @@ -28,7 +32,7 @@ pub struct KdfRequestModel { #[serde(rename = "key")] pub key: String, #[serde(rename = "kdf")] - pub kdf: crate::models::KdfType, + pub kdf: models::KdfType, #[serde(rename = "kdfIterations")] pub kdf_iterations: i32, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] @@ -41,7 +45,7 @@ impl KdfRequestModel { pub fn new( new_master_password_hash: String, key: String, - kdf: crate::models::KdfType, + kdf: models::KdfType, kdf_iterations: i32, ) -> KdfRequestModel { KdfRequestModel { diff --git a/crates/bitwarden-api-api/src/models/kdf_type.rs b/crates/bitwarden-api-api/src/models/kdf_type.rs index e371ee156..f2ee26664 100644 --- a/crates/bitwarden-api-api/src/models/kdf_type.rs +++ b/crates/bitwarden-api-api/src/models/kdf_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum KdfType { PBKDF2_SHA256 = 0, Argon2id = 1, } -impl ToString for KdfType { - fn to_string(&self) -> String { +impl std::fmt::Display for KdfType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::PBKDF2_SHA256 => String::from("0"), - Self::Argon2id => String::from("1"), + Self::PBKDF2_SHA256 => write!(f, "0"), + Self::Argon2id => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/key_model.rs b/crates/bitwarden-api-api/src/models/key_model.rs index 78231697b..619f328a6 100644 --- a/crates/bitwarden-api-api/src/models/key_model.rs +++ b/crates/bitwarden-api-api/src/models/key_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct KeyModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, diff --git a/crates/bitwarden-api-api/src/models/key_pair_request_body.rs b/crates/bitwarden-api-api/src/models/key_pair_request_body.rs index da934b08a..49b7167a6 100644 --- a/crates/bitwarden-api-api/src/models/key_pair_request_body.rs +++ b/crates/bitwarden-api-api/src/models/key_pair_request_body.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct KeyPairRequestBody { #[serde(rename = "publicKey")] pub public_key: String, diff --git a/crates/bitwarden-api-api/src/models/keys_request_model.rs b/crates/bitwarden-api-api/src/models/keys_request_model.rs index d87329136..e59fb31f3 100644 --- a/crates/bitwarden-api-api/src/models/keys_request_model.rs +++ b/crates/bitwarden-api-api/src/models/keys_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct KeysRequestModel { #[serde(rename = "publicKey", skip_serializing_if = "Option::is_none")] pub public_key: Option, diff --git a/crates/bitwarden-api-api/src/models/keys_response_model.rs b/crates/bitwarden-api-api/src/models/keys_response_model.rs index 21b998384..bdef8adfb 100644 --- a/crates/bitwarden-api-api/src/models/keys_response_model.rs +++ b/crates/bitwarden-api-api/src/models/keys_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct KeysResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/license_type.rs b/crates/bitwarden-api-api/src/models/license_type.rs index 178b3433f..d3e278629 100644 --- a/crates/bitwarden-api-api/src/models/license_type.rs +++ b/crates/bitwarden-api-api/src/models/license_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum LicenseType { User = 0, Organization = 1, } -impl ToString for LicenseType { - fn to_string(&self) -> String { +impl std::fmt::Display for LicenseType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::User => String::from("0"), - Self::Organization => String::from("1"), + Self::User => write!(f, "0"), + Self::Organization => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/master_password_policy_response_model.rs b/crates/bitwarden-api-api/src/models/master_password_policy_response_model.rs index b1a53bdea..7ffe3900a 100644 --- a/crates/bitwarden-api-api/src/models/master_password_policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/master_password_policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct MasterPasswordPolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/member_decryption_type.rs b/crates/bitwarden-api-api/src/models/member_decryption_type.rs index dba1b793b..6aff7d383 100644 --- a/crates/bitwarden-api-api/src/models/member_decryption_type.rs +++ b/crates/bitwarden-api-api/src/models/member_decryption_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum MemberDecryptionType { MasterPassword = 0, @@ -19,12 +32,12 @@ pub enum MemberDecryptionType { TrustedDeviceEncryption = 2, } -impl ToString for MemberDecryptionType { - fn to_string(&self) -> String { +impl std::fmt::Display for MemberDecryptionType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::MasterPassword => String::from("0"), - Self::KeyConnector => String::from("1"), - Self::TrustedDeviceEncryption => String::from("2"), + Self::MasterPassword => write!(f, "0"), + Self::KeyConnector => write!(f, "1"), + Self::TrustedDeviceEncryption => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/mod.rs b/crates/bitwarden-api-api/src/models/mod.rs index cfc6e1665..86365cd28 100644 --- a/crates/bitwarden-api-api/src/models/mod.rs +++ b/crates/bitwarden-api-api/src/models/mod.rs @@ -306,6 +306,8 @@ pub mod member_decryption_type; pub use self::member_decryption_type::MemberDecryptionType; pub mod open_id_connect_redirect_behavior; pub use self::open_id_connect_redirect_behavior::OpenIdConnectRedirectBehavior; +pub mod optional_cipher_details_response_model; +pub use self::optional_cipher_details_response_model::OptionalCipherDetailsResponseModel; pub mod organization_api_key_information; pub use self::organization_api_key_information::OrganizationApiKeyInformation; pub mod organization_api_key_information_list_response_model; @@ -416,6 +418,8 @@ pub mod organization_user_user_details_response_model_list_response_model; pub use self::organization_user_user_details_response_model_list_response_model::OrganizationUserUserDetailsResponseModelListResponseModel; pub mod organization_verify_bank_request_model; pub use self::organization_verify_bank_request_model::OrganizationVerifyBankRequestModel; +pub mod organization_verify_delete_recover_request_model; +pub use self::organization_verify_delete_recover_request_model::OrganizationVerifyDeleteRecoverRequestModel; pub mod other_device_keys_update_request_model; pub use self::other_device_keys_update_request_model::OtherDeviceKeysUpdateRequestModel; pub mod password_hint_request_model; diff --git a/crates/bitwarden-api-api/src/models/open_id_connect_redirect_behavior.rs b/crates/bitwarden-api-api/src/models/open_id_connect_redirect_behavior.rs index 792a2dd9e..5296427ff 100644 --- a/crates/bitwarden-api-api/src/models/open_id_connect_redirect_behavior.rs +++ b/crates/bitwarden-api-api/src/models/open_id_connect_redirect_behavior.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum OpenIdConnectRedirectBehavior { RedirectGet = 0, FormPost = 1, } -impl ToString for OpenIdConnectRedirectBehavior { - fn to_string(&self) -> String { +impl std::fmt::Display for OpenIdConnectRedirectBehavior { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::RedirectGet => String::from("0"), - Self::FormPost => String::from("1"), + Self::RedirectGet => write!(f, "0"), + Self::FormPost => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/optional_cipher_details_response_model.rs b/crates/bitwarden-api-api/src/models/optional_cipher_details_response_model.rs new file mode 100644 index 000000000..c99428c87 --- /dev/null +++ b/crates/bitwarden-api-api/src/models/optional_cipher_details_response_model.rs @@ -0,0 +1,33 @@ +/* + * Bitwarden Internal API + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: latest + * + * Generated by: https://openapi-generator.tech + */ + +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] +pub struct OptionalCipherDetailsResponseModel { + #[serde(rename = "object", skip_serializing_if = "Option::is_none")] + pub object: Option, + #[serde(rename = "unavailable", skip_serializing_if = "Option::is_none")] + pub unavailable: Option, + #[serde(rename = "cipher", skip_serializing_if = "Option::is_none")] + pub cipher: Option>, +} + +impl OptionalCipherDetailsResponseModel { + pub fn new() -> OptionalCipherDetailsResponseModel { + OptionalCipherDetailsResponseModel { + object: None, + unavailable: None, + cipher: None, + } + } +} diff --git a/crates/bitwarden-api-api/src/models/organization_api_key_information.rs b/crates/bitwarden-api-api/src/models/organization_api_key_information.rs index 94c56de5f..0916798d8 100644 --- a/crates/bitwarden-api-api/src/models/organization_api_key_information.rs +++ b/crates/bitwarden-api-api/src/models/organization_api_key_information.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationApiKeyInformation { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "keyType", skip_serializing_if = "Option::is_none")] - pub key_type: Option, + pub key_type: Option, #[serde(rename = "revisionDate", skip_serializing_if = "Option::is_none")] pub revision_date: Option, } diff --git a/crates/bitwarden-api-api/src/models/organization_api_key_information_list_response_model.rs b/crates/bitwarden-api-api/src/models/organization_api_key_information_list_response_model.rs index 63b65454c..20850a34e 100644 --- a/crates/bitwarden-api-api/src/models/organization_api_key_information_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_api_key_information_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationApiKeyInformationListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/organization_api_key_request_model.rs b/crates/bitwarden-api-api/src/models/organization_api_key_request_model.rs index 3af42cef6..955336ec6 100644 --- a/crates/bitwarden-api-api/src/models/organization_api_key_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_api_key_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationApiKeyRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, @@ -22,7 +26,7 @@ pub struct OrganizationApiKeyRequestModel { #[serde(rename = "secret", skip_serializing_if = "Option::is_none")] pub secret: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, } impl OrganizationApiKeyRequestModel { diff --git a/crates/bitwarden-api-api/src/models/organization_api_key_type.rs b/crates/bitwarden-api-api/src/models/organization_api_key_type.rs index 83f76baaa..471f8ff39 100644 --- a/crates/bitwarden-api-api/src/models/organization_api_key_type.rs +++ b/crates/bitwarden-api-api/src/models/organization_api_key_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum OrganizationApiKeyType { Default = 0, @@ -19,12 +32,12 @@ pub enum OrganizationApiKeyType { Scim = 2, } -impl ToString for OrganizationApiKeyType { - fn to_string(&self) -> String { +impl std::fmt::Display for OrganizationApiKeyType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Default => String::from("0"), - Self::BillingSync => String::from("1"), - Self::Scim => String::from("2"), + Self::Default => write!(f, "0"), + Self::BillingSync => write!(f, "1"), + Self::Scim => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/organization_auto_enroll_status_response_model.rs b/crates/bitwarden-api-api/src/models/organization_auto_enroll_status_response_model.rs index e068219ee..ed89d457f 100644 --- a/crates/bitwarden-api-api/src/models/organization_auto_enroll_status_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_auto_enroll_status_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationAutoEnrollStatusResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_billing_status_response_model.rs b/crates/bitwarden-api-api/src/models/organization_billing_status_response_model.rs index 173c14510..d01af8694 100644 --- a/crates/bitwarden-api-api/src/models/organization_billing_status_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_billing_status_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationBillingStatusResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_collection_management_update_request_model.rs b/crates/bitwarden-api-api/src/models/organization_collection_management_update_request_model.rs index ce5d52f6d..06f57e430 100644 --- a/crates/bitwarden-api-api/src/models/organization_collection_management_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_collection_management_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationCollectionManagementUpdateRequestModel { #[serde( rename = "limitCreateDeleteOwnerAdmin", diff --git a/crates/bitwarden-api-api/src/models/organization_connection_request_model.rs b/crates/bitwarden-api-api/src/models/organization_connection_request_model.rs index d201c54b2..4901a3280 100644 --- a/crates/bitwarden-api-api/src/models/organization_connection_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_connection_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationConnectionRequestModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_connection_response_model.rs b/crates/bitwarden-api-api/src/models/organization_connection_response_model.rs index 88ccf278c..ec7654ca5 100644 --- a/crates/bitwarden-api-api/src/models/organization_connection_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_connection_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationConnectionResponseModel { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_connection_type.rs b/crates/bitwarden-api-api/src/models/organization_connection_type.rs index 201c03ed2..4f2a152e8 100644 --- a/crates/bitwarden-api-api/src/models/organization_connection_type.rs +++ b/crates/bitwarden-api-api/src/models/organization_connection_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum OrganizationConnectionType { CloudBillingSync = 1, Scim = 2, } -impl ToString for OrganizationConnectionType { - fn to_string(&self) -> String { +impl std::fmt::Display for OrganizationConnectionType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::CloudBillingSync => String::from("1"), - Self::Scim => String::from("2"), + Self::CloudBillingSync => write!(f, "1"), + Self::Scim => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/organization_create_request_model.rs b/crates/bitwarden-api-api/src/models/organization_create_request_model.rs index f69b7a09b..a419e36db 100644 --- a/crates/bitwarden-api-api/src/models/organization_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_create_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationCreateRequestModel { #[serde(rename = "name")] pub name: String, @@ -17,13 +21,13 @@ pub struct OrganizationCreateRequestModel { #[serde(rename = "billingEmail")] pub billing_email: String, #[serde(rename = "planType", skip_serializing_if = "Option::is_none")] - pub plan_type: Option, + pub plan_type: Option, #[serde(rename = "key")] pub key: String, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, #[serde(rename = "paymentMethodType", skip_serializing_if = "Option::is_none")] - pub payment_method_type: Option, + pub payment_method_type: Option, #[serde(rename = "paymentToken", skip_serializing_if = "Option::is_none")] pub payment_token: Option, #[serde(rename = "additionalSeats", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_domain_request_model.rs b/crates/bitwarden-api-api/src/models/organization_domain_request_model.rs index bb9f39b60..a467fe90b 100644 --- a/crates/bitwarden-api-api/src/models/organization_domain_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_domain_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationDomainRequestModel { #[serde(rename = "domainName")] pub domain_name: String, diff --git a/crates/bitwarden-api-api/src/models/organization_domain_response_model.rs b/crates/bitwarden-api-api/src/models/organization_domain_response_model.rs index 524a00f93..c57ae13f8 100644 --- a/crates/bitwarden-api-api/src/models/organization_domain_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_domain_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationDomainResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_domain_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/organization_domain_response_model_list_response_model.rs index 49224feb3..72256a83a 100644 --- a/crates/bitwarden-api-api/src/models/organization_domain_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_domain_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationDomainResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/organization_domain_sso_details_request_model.rs b/crates/bitwarden-api-api/src/models/organization_domain_sso_details_request_model.rs index a731af833..211d8cda5 100644 --- a/crates/bitwarden-api-api/src/models/organization_domain_sso_details_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_domain_sso_details_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationDomainSsoDetailsRequestModel { #[serde(rename = "email")] pub email: String, diff --git a/crates/bitwarden-api-api/src/models/organization_domain_sso_details_response_model.rs b/crates/bitwarden-api-api/src/models/organization_domain_sso_details_response_model.rs index c409df706..9e179faaa 100644 --- a/crates/bitwarden-api-api/src/models/organization_domain_sso_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_domain_sso_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationDomainSsoDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_keys_request_model.rs b/crates/bitwarden-api-api/src/models/organization_keys_request_model.rs index eccd5f5b3..b281941f4 100644 --- a/crates/bitwarden-api-api/src/models/organization_keys_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_keys_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationKeysRequestModel { #[serde(rename = "publicKey")] pub public_key: String, diff --git a/crates/bitwarden-api-api/src/models/organization_keys_response_model.rs b/crates/bitwarden-api-api/src/models/organization_keys_response_model.rs index 6992abccb..c68fe507a 100644 --- a/crates/bitwarden-api-api/src/models/organization_keys_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_keys_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationKeysResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_license.rs b/crates/bitwarden-api-api/src/models/organization_license.rs index 2497f073e..c6b3dd2a1 100644 --- a/crates/bitwarden-api-api/src/models/organization_license.rs +++ b/crates/bitwarden-api-api/src/models/organization_license.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationLicense { #[serde(rename = "licenseKey", skip_serializing_if = "Option::is_none")] pub license_key: Option, @@ -27,7 +31,7 @@ pub struct OrganizationLicense { #[serde(rename = "plan", skip_serializing_if = "Option::is_none")] pub plan: Option, #[serde(rename = "planType", skip_serializing_if = "Option::is_none")] - pub plan_type: Option, + pub plan_type: Option, #[serde(rename = "seats", skip_serializing_if = "Option::is_none")] pub seats: Option, #[serde(rename = "maxCollections", skip_serializing_if = "Option::is_none")] @@ -99,7 +103,7 @@ pub struct OrganizationLicense { #[serde(rename = "trial", skip_serializing_if = "Option::is_none")] pub trial: Option, #[serde(rename = "licenseType", skip_serializing_if = "Option::is_none")] - pub license_type: Option, + pub license_type: Option, #[serde(rename = "hash", skip_serializing_if = "Option::is_none")] pub hash: Option, #[serde(rename = "signature", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_public_key_response_model.rs b/crates/bitwarden-api-api/src/models/organization_public_key_response_model.rs index aca53523a..bdf397126 100644 --- a/crates/bitwarden-api-api/src/models/organization_public_key_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_public_key_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationPublicKeyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_response_model.rs b/crates/bitwarden-api-api/src/models/organization_response_model.rs index e5c877fb0..b696cce7e 100644 --- a/crates/bitwarden-api-api/src/models/organization_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -31,11 +35,11 @@ pub struct OrganizationResponseModel { #[serde(rename = "billingEmail", skip_serializing_if = "Option::is_none")] pub billing_email: Option, #[serde(rename = "plan", skip_serializing_if = "Option::is_none")] - pub plan: Option>, + pub plan: Option>, #[serde(rename = "secretsManagerPlan", skip_serializing_if = "Option::is_none")] - pub secrets_manager_plan: Option>, + pub secrets_manager_plan: Option>, #[serde(rename = "planType", skip_serializing_if = "Option::is_none")] - pub plan_type: Option, + pub plan_type: Option, #[serde(rename = "seats", skip_serializing_if = "Option::is_none")] pub seats: Option, #[serde(rename = "maxAutoscaleSeats", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_seat_request_model.rs b/crates/bitwarden-api-api/src/models/organization_seat_request_model.rs index 58f815f4b..79ff1721e 100644 --- a/crates/bitwarden-api-api/src/models/organization_seat_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_seat_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSeatRequestModel { #[serde(rename = "seatAdjustment")] pub seat_adjustment: i32, diff --git a/crates/bitwarden-api-api/src/models/organization_sponsorship_create_request_model.rs b/crates/bitwarden-api-api/src/models/organization_sponsorship_create_request_model.rs index dbd33d616..e71186969 100644 --- a/crates/bitwarden-api-api/src/models/organization_sponsorship_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sponsorship_create_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSponsorshipCreateRequestModel { #[serde(rename = "planSponsorshipType")] - pub plan_sponsorship_type: crate::models::PlanSponsorshipType, + pub plan_sponsorship_type: models::PlanSponsorshipType, #[serde(rename = "sponsoredEmail")] pub sponsored_email: String, #[serde(rename = "friendlyName", skip_serializing_if = "Option::is_none")] @@ -20,7 +24,7 @@ pub struct OrganizationSponsorshipCreateRequestModel { impl OrganizationSponsorshipCreateRequestModel { pub fn new( - plan_sponsorship_type: crate::models::PlanSponsorshipType, + plan_sponsorship_type: models::PlanSponsorshipType, sponsored_email: String, ) -> OrganizationSponsorshipCreateRequestModel { OrganizationSponsorshipCreateRequestModel { diff --git a/crates/bitwarden-api-api/src/models/organization_sponsorship_redeem_request_model.rs b/crates/bitwarden-api-api/src/models/organization_sponsorship_redeem_request_model.rs index 08a3f3741..9e559177d 100644 --- a/crates/bitwarden-api-api/src/models/organization_sponsorship_redeem_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sponsorship_redeem_request_model.rs @@ -8,17 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSponsorshipRedeemRequestModel { #[serde(rename = "planSponsorshipType")] - pub plan_sponsorship_type: crate::models::PlanSponsorshipType, + pub plan_sponsorship_type: models::PlanSponsorshipType, #[serde(rename = "sponsoredOrganizationId")] pub sponsored_organization_id: uuid::Uuid, } impl OrganizationSponsorshipRedeemRequestModel { pub fn new( - plan_sponsorship_type: crate::models::PlanSponsorshipType, + plan_sponsorship_type: models::PlanSponsorshipType, sponsored_organization_id: uuid::Uuid, ) -> OrganizationSponsorshipRedeemRequestModel { OrganizationSponsorshipRedeemRequestModel { diff --git a/crates/bitwarden-api-api/src/models/organization_sponsorship_request_model.rs b/crates/bitwarden-api-api/src/models/organization_sponsorship_request_model.rs index 247e8f3ea..cc8117fd3 100644 --- a/crates/bitwarden-api-api/src/models/organization_sponsorship_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sponsorship_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSponsorshipRequestModel { #[serde( rename = "sponsoringOrganizationUserId", @@ -23,7 +27,7 @@ pub struct OrganizationSponsorshipRequestModel { rename = "planSponsorshipType", skip_serializing_if = "Option::is_none" )] - pub plan_sponsorship_type: Option, + pub plan_sponsorship_type: Option, #[serde(rename = "lastSyncDate", skip_serializing_if = "Option::is_none")] pub last_sync_date: Option, #[serde(rename = "validUntil", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_sponsorship_response_model.rs b/crates/bitwarden-api-api/src/models/organization_sponsorship_response_model.rs index 21f90016a..bfc44e52e 100644 --- a/crates/bitwarden-api-api/src/models/organization_sponsorship_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sponsorship_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSponsorshipResponseModel { #[serde( rename = "sponsoringOrganizationUserId", @@ -23,7 +27,7 @@ pub struct OrganizationSponsorshipResponseModel { rename = "planSponsorshipType", skip_serializing_if = "Option::is_none" )] - pub plan_sponsorship_type: Option, + pub plan_sponsorship_type: Option, #[serde(rename = "lastSyncDate", skip_serializing_if = "Option::is_none")] pub last_sync_date: Option, #[serde(rename = "validUntil", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_request_model.rs b/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_request_model.rs index 3aca9f7fc..f1480a8d5 100644 --- a/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSponsorshipSyncRequestModel { #[serde(rename = "billingSyncKey", skip_serializing_if = "Option::is_none")] pub billing_sync_key: Option, @@ -18,7 +22,7 @@ pub struct OrganizationSponsorshipSyncRequestModel { )] pub sponsoring_organization_cloud_id: Option, #[serde(rename = "sponsorshipsBatch", skip_serializing_if = "Option::is_none")] - pub sponsorships_batch: Option>, + pub sponsorships_batch: Option>, } impl OrganizationSponsorshipSyncRequestModel { diff --git a/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_response_model.rs b/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_response_model.rs index e3630d1ee..f4af518a3 100644 --- a/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sponsorship_sync_response_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSponsorshipSyncResponseModel { #[serde(rename = "sponsorshipsBatch", skip_serializing_if = "Option::is_none")] - pub sponsorships_batch: Option>, + pub sponsorships_batch: Option>, } impl OrganizationSponsorshipSyncResponseModel { diff --git a/crates/bitwarden-api-api/src/models/organization_sso_request_model.rs b/crates/bitwarden-api-api/src/models/organization_sso_request_model.rs index 4818e8e5d..249bb6a33 100644 --- a/crates/bitwarden-api-api/src/models/organization_sso_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sso_request_model.rs @@ -8,20 +8,24 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSsoRequestModel { #[serde(rename = "enabled")] pub enabled: bool, #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "data")] - pub data: Box, + pub data: Box, } impl OrganizationSsoRequestModel { pub fn new( enabled: bool, - data: crate::models::SsoConfigurationDataRequest, + data: models::SsoConfigurationDataRequest, ) -> OrganizationSsoRequestModel { OrganizationSsoRequestModel { enabled, diff --git a/crates/bitwarden-api-api/src/models/organization_sso_response_model.rs b/crates/bitwarden-api-api/src/models/organization_sso_response_model.rs index d0d73e4b0..73eca734d 100644 --- a/crates/bitwarden-api-api/src/models/organization_sso_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_sso_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSsoResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,9 +21,9 @@ pub struct OrganizationSsoResponseModel { #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "urls", skip_serializing_if = "Option::is_none")] - pub urls: Option>, + pub urls: Option>, } impl OrganizationSsoResponseModel { diff --git a/crates/bitwarden-api-api/src/models/organization_subscription_response_model.rs b/crates/bitwarden-api-api/src/models/organization_subscription_response_model.rs index 1bbfc630f..4eb316ba0 100644 --- a/crates/bitwarden-api-api/src/models/organization_subscription_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_subscription_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSubscriptionResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -31,11 +35,11 @@ pub struct OrganizationSubscriptionResponseModel { #[serde(rename = "billingEmail", skip_serializing_if = "Option::is_none")] pub billing_email: Option, #[serde(rename = "plan", skip_serializing_if = "Option::is_none")] - pub plan: Option>, + pub plan: Option>, #[serde(rename = "secretsManagerPlan", skip_serializing_if = "Option::is_none")] - pub secrets_manager_plan: Option>, + pub secrets_manager_plan: Option>, #[serde(rename = "planType", skip_serializing_if = "Option::is_none")] - pub plan_type: Option, + pub plan_type: Option, #[serde(rename = "seats", skip_serializing_if = "Option::is_none")] pub seats: Option, #[serde(rename = "maxAutoscaleSeats", skip_serializing_if = "Option::is_none")] @@ -118,11 +122,11 @@ pub struct OrganizationSubscriptionResponseModel { #[serde(rename = "storageGb", skip_serializing_if = "Option::is_none")] pub storage_gb: Option, #[serde(rename = "customerDiscount", skip_serializing_if = "Option::is_none")] - pub customer_discount: Option>, + pub customer_discount: Option>, #[serde(rename = "subscription", skip_serializing_if = "Option::is_none")] - pub subscription: Option>, + pub subscription: Option>, #[serde(rename = "upcomingInvoice", skip_serializing_if = "Option::is_none")] - pub upcoming_invoice: Option>, + pub upcoming_invoice: Option>, /// Date when a self-hosted organization's subscription expires, without any grace period. #[serde( rename = "expirationWithoutGracePeriod", diff --git a/crates/bitwarden-api-api/src/models/organization_subscription_update_request_model.rs b/crates/bitwarden-api-api/src/models/organization_subscription_update_request_model.rs index d85f8d56a..59dcbd31a 100644 --- a/crates/bitwarden-api-api/src/models/organization_subscription_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_subscription_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationSubscriptionUpdateRequestModel { #[serde(rename = "seatAdjustment")] pub seat_adjustment: i32, diff --git a/crates/bitwarden-api-api/src/models/organization_update_request_model.rs b/crates/bitwarden-api-api/src/models/organization_update_request_model.rs index ede9d668a..f70b44669 100644 --- a/crates/bitwarden-api-api/src/models/organization_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUpdateRequestModel { #[serde(rename = "name")] pub name: String, @@ -17,9 +21,9 @@ pub struct OrganizationUpdateRequestModel { #[serde(rename = "billingEmail")] pub billing_email: String, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, } impl OrganizationUpdateRequestModel { diff --git a/crates/bitwarden-api-api/src/models/organization_upgrade_request_model.rs b/crates/bitwarden-api-api/src/models/organization_upgrade_request_model.rs index 45bc99dd7..7a9375d7e 100644 --- a/crates/bitwarden-api-api/src/models/organization_upgrade_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_upgrade_request_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUpgradeRequestModel { #[serde(rename = "businessName", skip_serializing_if = "Option::is_none")] pub business_name: Option, #[serde(rename = "planType", skip_serializing_if = "Option::is_none")] - pub plan_type: Option, + pub plan_type: Option, #[serde(rename = "additionalSeats", skip_serializing_if = "Option::is_none")] pub additional_seats: Option, #[serde( @@ -43,7 +47,7 @@ pub struct OrganizationUpgradeRequestModel { )] pub billing_address_postal_code: Option, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, } impl OrganizationUpgradeRequestModel { diff --git a/crates/bitwarden-api-api/src/models/organization_user_accept_init_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_accept_init_request_model.rs index ab4f7f0ff..ca714ca20 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_accept_init_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_accept_init_request_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserAcceptInitRequestModel { #[serde(rename = "token")] pub token: String, #[serde(rename = "key")] pub key: String, #[serde(rename = "keys")] - pub keys: Box, + pub keys: Box, #[serde(rename = "collectionName", skip_serializing_if = "Option::is_none")] pub collection_name: Option, } @@ -24,7 +28,7 @@ impl OrganizationUserAcceptInitRequestModel { pub fn new( token: String, key: String, - keys: crate::models::OrganizationKeysRequestModel, + keys: models::OrganizationKeysRequestModel, ) -> OrganizationUserAcceptInitRequestModel { OrganizationUserAcceptInitRequestModel { token, diff --git a/crates/bitwarden-api-api/src/models/organization_user_accept_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_accept_request_model.rs index 62732f1d3..7d6c40e39 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_accept_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_accept_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserAcceptRequestModel { #[serde(rename = "token")] pub token: String, diff --git a/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model.rs index 468d654a3..7b0383cb8 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model.rs @@ -8,15 +8,19 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserBulkConfirmRequestModel { #[serde(rename = "keys")] - pub keys: Vec, + pub keys: Vec, } impl OrganizationUserBulkConfirmRequestModel { pub fn new( - keys: Vec, + keys: Vec, ) -> OrganizationUserBulkConfirmRequestModel { OrganizationUserBulkConfirmRequestModel { keys } } diff --git a/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model_entry.rs b/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model_entry.rs index f3ccb5e08..f51d4ad33 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model_entry.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_bulk_confirm_request_model_entry.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserBulkConfirmRequestModelEntry { #[serde(rename = "id")] pub id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/organization_user_bulk_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_bulk_request_model.rs index 6f973f960..a6c6cef0f 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_bulk_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_bulk_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserBulkRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model.rs index f84f1509d..4967c7820 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserBulkResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model_list_response_model.rs index 0be2de9a1..d80d79b7d 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_bulk_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserBulkResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/organization_user_confirm_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_confirm_request_model.rs index e6a00ae6b..de5a469b8 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_confirm_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_confirm_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserConfirmRequestModel { #[serde(rename = "key")] pub key: String, diff --git a/crates/bitwarden-api-api/src/models/organization_user_details_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_details_response_model.rs index 5fe8caf42..f10c7b10b 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,9 +21,9 @@ pub struct OrganizationUserDetailsResponseModel { #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "accessAll", skip_serializing_if = "Option::is_none")] pub access_all: Option, #[serde(rename = "externalId", skip_serializing_if = "Option::is_none")] @@ -30,7 +34,7 @@ pub struct OrganizationUserDetailsResponseModel { )] pub access_secrets_manager: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde( rename = "resetPasswordEnrolled", skip_serializing_if = "Option::is_none" @@ -41,7 +45,7 @@ pub struct OrganizationUserDetailsResponseModel { #[serde(rename = "hasMasterPassword", skip_serializing_if = "Option::is_none")] pub has_master_password: Option, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] pub groups: Option>, } diff --git a/crates/bitwarden-api-api/src/models/organization_user_invite_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_invite_request_model.rs index 0cf5c3429..2e66bd7f2 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_invite_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_invite_request_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserInviteRequestModel { #[serde(rename = "emails")] pub emails: Vec, #[serde(rename = "type")] - pub r#type: crate::models::OrganizationUserType, + pub r#type: models::OrganizationUserType, #[serde(rename = "accessAll", skip_serializing_if = "Option::is_none")] pub access_all: Option, #[serde( @@ -22,9 +26,9 @@ pub struct OrganizationUserInviteRequestModel { )] pub access_secrets_manager: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] pub groups: Option>, } @@ -32,7 +36,7 @@ pub struct OrganizationUserInviteRequestModel { impl OrganizationUserInviteRequestModel { pub fn new( emails: Vec, - r#type: crate::models::OrganizationUserType, + r#type: models::OrganizationUserType, ) -> OrganizationUserInviteRequestModel { OrganizationUserInviteRequestModel { emails, diff --git a/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model.rs index 5bb053f81..4e444cfbc 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserPublicKeyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model_list_response_model.rs index ae59cc365..f9c6f3965 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_public_key_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserPublicKeyResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/organization_user_reset_password_details_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_reset_password_details_response_model.rs index 07343bf5b..eb999f06c 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_reset_password_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_reset_password_details_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserResetPasswordDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "kdf", skip_serializing_if = "Option::is_none")] - pub kdf: Option, + pub kdf: Option, #[serde(rename = "kdfIterations", skip_serializing_if = "Option::is_none")] pub kdf_iterations: Option, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/organization_user_reset_password_enrollment_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_reset_password_enrollment_request_model.rs index c11fcda48..edd45ea80 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_reset_password_enrollment_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_reset_password_enrollment_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserResetPasswordEnrollmentRequestModel { #[serde(rename = "resetPasswordKey", skip_serializing_if = "Option::is_none")] pub reset_password_key: Option, diff --git a/crates/bitwarden-api-api/src/models/organization_user_reset_password_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_reset_password_request_model.rs index 001086531..a7ffa611e 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_reset_password_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_reset_password_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserResetPasswordRequestModel { #[serde(rename = "newMasterPasswordHash")] pub new_master_password_hash: String, diff --git a/crates/bitwarden-api-api/src/models/organization_user_status_type.rs b/crates/bitwarden-api-api/src/models/organization_user_status_type.rs index 5d3c99199..5b2aa15b0 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_status_type.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_status_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum OrganizationUserStatusType { Invited = 0, @@ -20,13 +33,13 @@ pub enum OrganizationUserStatusType { Revoked = -1, } -impl ToString for OrganizationUserStatusType { - fn to_string(&self) -> String { +impl std::fmt::Display for OrganizationUserStatusType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Invited => String::from("0"), - Self::Accepted => String::from("1"), - Self::Confirmed => String::from("2"), - Self::Revoked => String::from("-1"), + Self::Invited => write!(f, "0"), + Self::Accepted => write!(f, "1"), + Self::Confirmed => write!(f, "2"), + Self::Revoked => write!(f, "-1"), } } } diff --git a/crates/bitwarden-api-api/src/models/organization_user_type.rs b/crates/bitwarden-api-api/src/models/organization_user_type.rs index 38e415f05..a87ea0960 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_type.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum OrganizationUserType { Owner = 0, @@ -21,14 +34,14 @@ pub enum OrganizationUserType { Custom = 4, } -impl ToString for OrganizationUserType { - fn to_string(&self) -> String { +impl std::fmt::Display for OrganizationUserType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Owner => String::from("0"), - Self::Admin => String::from("1"), - Self::User => String::from("2"), - Self::Manager => String::from("3"), - Self::Custom => String::from("4"), + Self::Owner => write!(f, "0"), + Self::Admin => write!(f, "1"), + Self::User => write!(f, "2"), + Self::Manager => write!(f, "3"), + Self::Custom => write!(f, "4"), } } } diff --git a/crates/bitwarden-api-api/src/models/organization_user_update_request_model.rs b/crates/bitwarden-api-api/src/models/organization_user_update_request_model.rs index 54b479dd6..1d6fa833f 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_update_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserUpdateRequestModel { #[serde(rename = "type")] - pub r#type: crate::models::OrganizationUserType, + pub r#type: models::OrganizationUserType, #[serde(rename = "accessAll", skip_serializing_if = "Option::is_none")] pub access_all: Option, #[serde( @@ -20,15 +24,15 @@ pub struct OrganizationUserUpdateRequestModel { )] pub access_secrets_manager: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] pub groups: Option>, } impl OrganizationUserUpdateRequestModel { - pub fn new(r#type: crate::models::OrganizationUserType) -> OrganizationUserUpdateRequestModel { + pub fn new(r#type: models::OrganizationUserType) -> OrganizationUserUpdateRequestModel { OrganizationUserUpdateRequestModel { r#type, access_all: None, diff --git a/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model.rs index add9e86e4..60cc46053 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserUserDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,9 +21,9 @@ pub struct OrganizationUserUserDetailsResponseModel { #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "accessAll", skip_serializing_if = "Option::is_none")] pub access_all: Option, #[serde(rename = "externalId", skip_serializing_if = "Option::is_none")] @@ -30,7 +34,7 @@ pub struct OrganizationUserUserDetailsResponseModel { )] pub access_secrets_manager: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde( rename = "resetPasswordEnrolled", skip_serializing_if = "Option::is_none" @@ -51,7 +55,7 @@ pub struct OrganizationUserUserDetailsResponseModel { #[serde(rename = "ssoBound", skip_serializing_if = "Option::is_none")] pub sso_bound: Option, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "groups", skip_serializing_if = "Option::is_none")] pub groups: Option>, } diff --git a/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model_list_response_model.rs index e3feac1db..33b43f815 100644 --- a/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_user_user_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationUserUserDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/organization_verify_bank_request_model.rs b/crates/bitwarden-api-api/src/models/organization_verify_bank_request_model.rs index e19bdb89d..58515ccc5 100644 --- a/crates/bitwarden-api-api/src/models/organization_verify_bank_request_model.rs +++ b/crates/bitwarden-api-api/src/models/organization_verify_bank_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OrganizationVerifyBankRequestModel { #[serde(rename = "amount1")] pub amount1: i32, diff --git a/crates/bitwarden-api-api/src/models/organization_verify_delete_recover_request_model.rs b/crates/bitwarden-api-api/src/models/organization_verify_delete_recover_request_model.rs new file mode 100644 index 000000000..19db9826a --- /dev/null +++ b/crates/bitwarden-api-api/src/models/organization_verify_delete_recover_request_model.rs @@ -0,0 +1,25 @@ +/* + * Bitwarden Internal API + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: latest + * + * Generated by: https://openapi-generator.tech + */ + +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] +pub struct OrganizationVerifyDeleteRecoverRequestModel { + #[serde(rename = "token")] + pub token: String, +} + +impl OrganizationVerifyDeleteRecoverRequestModel { + pub fn new(token: String) -> OrganizationVerifyDeleteRecoverRequestModel { + OrganizationVerifyDeleteRecoverRequestModel { token } + } +} diff --git a/crates/bitwarden-api-api/src/models/other_device_keys_update_request_model.rs b/crates/bitwarden-api-api/src/models/other_device_keys_update_request_model.rs index d7454c7cf..2ebcedb96 100644 --- a/crates/bitwarden-api-api/src/models/other_device_keys_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/other_device_keys_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct OtherDeviceKeysUpdateRequestModel { #[serde(rename = "encryptedPublicKey")] pub encrypted_public_key: String, diff --git a/crates/bitwarden-api-api/src/models/password_hint_request_model.rs b/crates/bitwarden-api-api/src/models/password_hint_request_model.rs index 8704c6fe1..70ae8cfc0 100644 --- a/crates/bitwarden-api-api/src/models/password_hint_request_model.rs +++ b/crates/bitwarden-api-api/src/models/password_hint_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PasswordHintRequestModel { #[serde(rename = "email")] pub email: String, diff --git a/crates/bitwarden-api-api/src/models/password_manager_plan_features_response_model.rs b/crates/bitwarden-api-api/src/models/password_manager_plan_features_response_model.rs index 91fa49b6a..618a85cb0 100644 --- a/crates/bitwarden-api-api/src/models/password_manager_plan_features_response_model.rs +++ b/crates/bitwarden-api-api/src/models/password_manager_plan_features_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PasswordManagerPlanFeaturesResponseModel { #[serde(rename = "stripePlanId", skip_serializing_if = "Option::is_none")] pub stripe_plan_id: Option, diff --git a/crates/bitwarden-api-api/src/models/password_request_model.rs b/crates/bitwarden-api-api/src/models/password_request_model.rs index c7fcb6e8b..a48f87284 100644 --- a/crates/bitwarden-api-api/src/models/password_request_model.rs +++ b/crates/bitwarden-api-api/src/models/password_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PasswordRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/payment_method_type.rs b/crates/bitwarden-api-api/src/models/payment_method_type.rs index c4d6cf93c..27b164261 100644 --- a/crates/bitwarden-api-api/src/models/payment_method_type.rs +++ b/crates/bitwarden-api-api/src/models/payment_method_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum PaymentMethodType { Card = 0, @@ -24,17 +37,17 @@ pub enum PaymentMethodType { None = 255, } -impl ToString for PaymentMethodType { - fn to_string(&self) -> String { +impl std::fmt::Display for PaymentMethodType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Card => String::from("0"), - Self::BankAccount => String::from("1"), - Self::PayPal => String::from("2"), - Self::BitPay => String::from("3"), - Self::Credit => String::from("4"), - Self::WireTransfer => String::from("5"), - Self::Check => String::from("8"), - Self::None => String::from("255"), + Self::Card => write!(f, "0"), + Self::BankAccount => write!(f, "1"), + Self::PayPal => write!(f, "2"), + Self::BitPay => write!(f, "3"), + Self::Credit => write!(f, "4"), + Self::WireTransfer => write!(f, "5"), + Self::Check => write!(f, "8"), + Self::None => write!(f, "255"), } } } diff --git a/crates/bitwarden-api-api/src/models/payment_request_model.rs b/crates/bitwarden-api-api/src/models/payment_request_model.rs index 00e07ff11..dd75f792b 100644 --- a/crates/bitwarden-api-api/src/models/payment_request_model.rs +++ b/crates/bitwarden-api-api/src/models/payment_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PaymentRequestModel { #[serde(rename = "country")] pub country: String, @@ -25,7 +29,7 @@ pub struct PaymentRequestModel { #[serde(rename = "state", skip_serializing_if = "Option::is_none")] pub state: Option, #[serde(rename = "paymentMethodType")] - pub payment_method_type: crate::models::PaymentMethodType, + pub payment_method_type: models::PaymentMethodType, #[serde(rename = "paymentToken")] pub payment_token: String, } @@ -33,7 +37,7 @@ pub struct PaymentRequestModel { impl PaymentRequestModel { pub fn new( country: String, - payment_method_type: crate::models::PaymentMethodType, + payment_method_type: models::PaymentMethodType, payment_token: String, ) -> PaymentRequestModel { PaymentRequestModel { diff --git a/crates/bitwarden-api-api/src/models/payment_response_model.rs b/crates/bitwarden-api-api/src/models/payment_response_model.rs index 2eddb498f..1ac49b66d 100644 --- a/crates/bitwarden-api-api/src/models/payment_response_model.rs +++ b/crates/bitwarden-api-api/src/models/payment_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PaymentResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "userProfile", skip_serializing_if = "Option::is_none")] - pub user_profile: Option>, + pub user_profile: Option>, #[serde( rename = "paymentIntentClientSecret", skip_serializing_if = "Option::is_none" diff --git a/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model.rs b/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model.rs index 5a0bc7bcb..f87d025c6 100644 --- a/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model.rs +++ b/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PendingOrganizationAuthRequestResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model_list_response_model.rs index d97c8c4ba..5798a24e5 100644 --- a/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/pending_organization_auth_request_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PendingOrganizationAuthRequestResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/people_access_policies_request_model.rs b/crates/bitwarden-api-api/src/models/people_access_policies_request_model.rs index 909ce9c30..c08eca935 100644 --- a/crates/bitwarden-api-api/src/models/people_access_policies_request_model.rs +++ b/crates/bitwarden-api-api/src/models/people_access_policies_request_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PeopleAccessPoliciesRequestModel { #[serde( rename = "userAccessPolicyRequests", skip_serializing_if = "Option::is_none" )] - pub user_access_policy_requests: Option>, + pub user_access_policy_requests: Option>, #[serde( rename = "groupAccessPolicyRequests", skip_serializing_if = "Option::is_none" )] - pub group_access_policy_requests: Option>, + pub group_access_policy_requests: Option>, } impl PeopleAccessPoliciesRequestModel { diff --git a/crates/bitwarden-api-api/src/models/permissions.rs b/crates/bitwarden-api-api/src/models/permissions.rs index 3d3a6b7b7..56246d661 100644 --- a/crates/bitwarden-api-api/src/models/permissions.rs +++ b/crates/bitwarden-api-api/src/models/permissions.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Permissions { #[serde(rename = "accessEventLogs", skip_serializing_if = "Option::is_none")] pub access_event_logs: Option, diff --git a/crates/bitwarden-api-api/src/models/plan_response_model.rs b/crates/bitwarden-api-api/src/models/plan_response_model.rs index e1e264e9a..d475ea3c5 100644 --- a/crates/bitwarden-api-api/src/models/plan_response_model.rs +++ b/crates/bitwarden-api-api/src/models/plan_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PlanResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "product", skip_serializing_if = "Option::is_none")] - pub product: Option, + pub product: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "isAnnual", skip_serializing_if = "Option::is_none")] @@ -68,9 +72,9 @@ pub struct PlanResponseModel { #[serde(rename = "disabled", skip_serializing_if = "Option::is_none")] pub disabled: Option, #[serde(rename = "secretsManager", skip_serializing_if = "Option::is_none")] - pub secrets_manager: Option>, + pub secrets_manager: Option>, #[serde(rename = "passwordManager", skip_serializing_if = "Option::is_none")] - pub password_manager: Option>, + pub password_manager: Option>, } impl PlanResponseModel { diff --git a/crates/bitwarden-api-api/src/models/plan_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/plan_response_model_list_response_model.rs index 15ce8c37a..666b87961 100644 --- a/crates/bitwarden-api-api/src/models/plan_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/plan_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PlanResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/plan_sponsorship_type.rs b/crates/bitwarden-api-api/src/models/plan_sponsorship_type.rs index 02a750f3d..cd90a9617 100644 --- a/crates/bitwarden-api-api/src/models/plan_sponsorship_type.rs +++ b/crates/bitwarden-api-api/src/models/plan_sponsorship_type.rs @@ -8,19 +8,32 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum PlanSponsorshipType { FamiliesForEnterprise = 0, } -impl ToString for PlanSponsorshipType { - fn to_string(&self) -> String { +impl std::fmt::Display for PlanSponsorshipType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::FamiliesForEnterprise => String::from("0"), + Self::FamiliesForEnterprise => write!(f, "0"), } } } diff --git a/crates/bitwarden-api-api/src/models/plan_type.rs b/crates/bitwarden-api-api/src/models/plan_type.rs index 8aa55fba1..38902b5d4 100644 --- a/crates/bitwarden-api-api/src/models/plan_type.rs +++ b/crates/bitwarden-api-api/src/models/plan_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum PlanType { Free = 0, @@ -38,31 +51,31 @@ pub enum PlanType { TeamsStarter = 21, } -impl ToString for PlanType { - fn to_string(&self) -> String { +impl std::fmt::Display for PlanType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Free => String::from("0"), - Self::FamiliesAnnually2019 => String::from("1"), - Self::TeamsMonthly2019 => String::from("2"), - Self::TeamsAnnually2019 => String::from("3"), - Self::EnterpriseMonthly2019 => String::from("4"), - Self::EnterpriseAnnually2019 => String::from("5"), - Self::Custom => String::from("6"), - Self::FamiliesAnnually => String::from("7"), - Self::TeamsMonthly2020 => String::from("8"), - Self::TeamsAnnually2020 => String::from("9"), - Self::EnterpriseMonthly2020 => String::from("10"), - Self::EnterpriseAnnually2020 => String::from("11"), - Self::TeamsMonthly2023 => String::from("12"), - Self::TeamsAnnually2023 => String::from("13"), - Self::EnterpriseMonthly2023 => String::from("14"), - Self::EnterpriseAnnually2023 => String::from("15"), - Self::TeamsStarter2023 => String::from("16"), - Self::TeamsMonthly => String::from("17"), - Self::TeamsAnnually => String::from("18"), - Self::EnterpriseMonthly => String::from("19"), - Self::EnterpriseAnnually => String::from("20"), - Self::TeamsStarter => String::from("21"), + Self::Free => write!(f, "0"), + Self::FamiliesAnnually2019 => write!(f, "1"), + Self::TeamsMonthly2019 => write!(f, "2"), + Self::TeamsAnnually2019 => write!(f, "3"), + Self::EnterpriseMonthly2019 => write!(f, "4"), + Self::EnterpriseAnnually2019 => write!(f, "5"), + Self::Custom => write!(f, "6"), + Self::FamiliesAnnually => write!(f, "7"), + Self::TeamsMonthly2020 => write!(f, "8"), + Self::TeamsAnnually2020 => write!(f, "9"), + Self::EnterpriseMonthly2020 => write!(f, "10"), + Self::EnterpriseAnnually2020 => write!(f, "11"), + Self::TeamsMonthly2023 => write!(f, "12"), + Self::TeamsAnnually2023 => write!(f, "13"), + Self::EnterpriseMonthly2023 => write!(f, "14"), + Self::EnterpriseAnnually2023 => write!(f, "15"), + Self::TeamsStarter2023 => write!(f, "16"), + Self::TeamsMonthly => write!(f, "17"), + Self::TeamsAnnually => write!(f, "18"), + Self::EnterpriseMonthly => write!(f, "19"), + Self::EnterpriseAnnually => write!(f, "20"), + Self::TeamsStarter => write!(f, "21"), } } } diff --git a/crates/bitwarden-api-api/src/models/policy_request_model.rs b/crates/bitwarden-api-api/src/models/policy_request_model.rs index 31b3880ea..2fd484351 100644 --- a/crates/bitwarden-api-api/src/models/policy_request_model.rs +++ b/crates/bitwarden-api-api/src/models/policy_request_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PolicyRequestModel { #[serde(rename = "type")] - pub r#type: crate::models::PolicyType, + pub r#type: models::PolicyType, #[serde(rename = "enabled")] pub enabled: bool, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option<::std::collections::HashMap>, + pub data: Option>, } impl PolicyRequestModel { - pub fn new(r#type: crate::models::PolicyType, enabled: bool) -> PolicyRequestModel { + pub fn new(r#type: models::PolicyType, enabled: bool) -> PolicyRequestModel { PolicyRequestModel { r#type, enabled, diff --git a/crates/bitwarden-api-api/src/models/policy_response_model.rs b/crates/bitwarden-api-api/src/models/policy_response_model.rs index bda9e87a5..137b891a8 100644 --- a/crates/bitwarden-api-api/src/models/policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,9 +21,9 @@ pub struct PolicyResponseModel { #[serde(rename = "organizationId", skip_serializing_if = "Option::is_none")] pub organization_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option<::std::collections::HashMap>, + pub data: Option>, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] pub enabled: Option, } diff --git a/crates/bitwarden-api-api/src/models/policy_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/policy_response_model_list_response_model.rs index bc96d434a..81a8dddef 100644 --- a/crates/bitwarden-api-api/src/models/policy_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/policy_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PolicyResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/policy_type.rs b/crates/bitwarden-api-api/src/models/policy_type.rs index fc9e6ca63..b20dfeb42 100644 --- a/crates/bitwarden-api-api/src/models/policy_type.rs +++ b/crates/bitwarden-api-api/src/models/policy_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum PolicyType { TwoFactorAuthentication = 0, @@ -28,21 +41,21 @@ pub enum PolicyType { ActivateAutofill = 11, } -impl ToString for PolicyType { - fn to_string(&self) -> String { +impl std::fmt::Display for PolicyType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::TwoFactorAuthentication => String::from("0"), - Self::MasterPassword => String::from("1"), - Self::PasswordGenerator => String::from("2"), - Self::SingleOrg => String::from("3"), - Self::RequireSso => String::from("4"), - Self::PersonalOwnership => String::from("5"), - Self::DisableSend => String::from("6"), - Self::SendOptions => String::from("7"), - Self::ResetPassword => String::from("8"), - Self::MaximumVaultTimeout => String::from("9"), - Self::DisablePersonalVaultExport => String::from("10"), - Self::ActivateAutofill => String::from("11"), + Self::TwoFactorAuthentication => write!(f, "0"), + Self::MasterPassword => write!(f, "1"), + Self::PasswordGenerator => write!(f, "2"), + Self::SingleOrg => write!(f, "3"), + Self::RequireSso => write!(f, "4"), + Self::PersonalOwnership => write!(f, "5"), + Self::DisableSend => write!(f, "6"), + Self::SendOptions => write!(f, "7"), + Self::ResetPassword => write!(f, "8"), + Self::MaximumVaultTimeout => write!(f, "9"), + Self::DisablePersonalVaultExport => write!(f, "10"), + Self::ActivateAutofill => write!(f, "11"), } } } diff --git a/crates/bitwarden-api-api/src/models/potential_grantee_response_model.rs b/crates/bitwarden-api-api/src/models/potential_grantee_response_model.rs index 52adb76f6..1f5e7ee31 100644 --- a/crates/bitwarden-api-api/src/models/potential_grantee_response_model.rs +++ b/crates/bitwarden-api-api/src/models/potential_grantee_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PotentialGranteeResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/potential_grantee_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/potential_grantee_response_model_list_response_model.rs index 65da6ae07..d6c099c33 100644 --- a/crates/bitwarden-api-api/src/models/potential_grantee_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/potential_grantee_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PotentialGranteeResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/prelogin_request_model.rs b/crates/bitwarden-api-api/src/models/prelogin_request_model.rs index 855c9fb09..3fc815e5c 100644 --- a/crates/bitwarden-api-api/src/models/prelogin_request_model.rs +++ b/crates/bitwarden-api-api/src/models/prelogin_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PreloginRequestModel { #[serde(rename = "email")] pub email: String, diff --git a/crates/bitwarden-api-api/src/models/prelogin_response_model.rs b/crates/bitwarden-api-api/src/models/prelogin_response_model.rs index bf5d536d2..8bf4aaf76 100644 --- a/crates/bitwarden-api-api/src/models/prelogin_response_model.rs +++ b/crates/bitwarden-api-api/src/models/prelogin_response_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PreloginResponseModel { #[serde(rename = "kdf", skip_serializing_if = "Option::is_none")] - pub kdf: Option, + pub kdf: Option, #[serde(rename = "kdfIterations", skip_serializing_if = "Option::is_none")] pub kdf_iterations: Option, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/product_type.rs b/crates/bitwarden-api-api/src/models/product_type.rs index e60a9c57c..38512819c 100644 --- a/crates/bitwarden-api-api/src/models/product_type.rs +++ b/crates/bitwarden-api-api/src/models/product_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum ProductType { Free = 0, @@ -21,14 +34,14 @@ pub enum ProductType { TeamsStarter = 4, } -impl ToString for ProductType { - fn to_string(&self) -> String { +impl std::fmt::Display for ProductType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Free => String::from("0"), - Self::Families => String::from("1"), - Self::Teams => String::from("2"), - Self::Enterprise => String::from("3"), - Self::TeamsStarter => String::from("4"), + Self::Free => write!(f, "0"), + Self::Families => write!(f, "1"), + Self::Teams => write!(f, "2"), + Self::Enterprise => write!(f, "3"), + Self::TeamsStarter => write!(f, "4"), } } } diff --git a/crates/bitwarden-api-api/src/models/profile_organization_response_model.rs b/crates/bitwarden-api-api/src/models/profile_organization_response_model.rs index 5984d13ae..fc11b8284 100644 --- a/crates/bitwarden-api-api/src/models/profile_organization_response_model.rs +++ b/crates/bitwarden-api-api/src/models/profile_organization_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProfileOrganizationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -65,9 +69,9 @@ pub struct ProfileOrganizationResponseModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] pub enabled: Option, #[serde(rename = "ssoBound", skip_serializing_if = "Option::is_none")] @@ -75,7 +79,7 @@ pub struct ProfileOrganizationResponseModel { #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde( rename = "resetPasswordEnrolled", skip_serializing_if = "Option::is_none" @@ -93,7 +97,7 @@ pub struct ProfileOrganizationResponseModel { #[serde(rename = "providerName", skip_serializing_if = "Option::is_none")] pub provider_name: Option, #[serde(rename = "providerType", skip_serializing_if = "Option::is_none")] - pub provider_type: Option, + pub provider_type: Option, #[serde( rename = "familySponsorshipFriendlyName", skip_serializing_if = "Option::is_none" @@ -105,7 +109,7 @@ pub struct ProfileOrganizationResponseModel { )] pub family_sponsorship_available: Option, #[serde(rename = "planProductType", skip_serializing_if = "Option::is_none")] - pub plan_product_type: Option, + pub plan_product_type: Option, #[serde( rename = "keyConnectorEnabled", skip_serializing_if = "Option::is_none" diff --git a/crates/bitwarden-api-api/src/models/profile_organization_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/profile_organization_response_model_list_response_model.rs index c1fb06209..0d801dc6e 100644 --- a/crates/bitwarden-api-api/src/models/profile_organization_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/profile_organization_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProfileOrganizationResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/profile_provider_organization_response_model.rs b/crates/bitwarden-api-api/src/models/profile_provider_organization_response_model.rs index af8b13fb6..dc102a396 100644 --- a/crates/bitwarden-api-api/src/models/profile_provider_organization_response_model.rs +++ b/crates/bitwarden-api-api/src/models/profile_provider_organization_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProfileProviderOrganizationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -65,9 +69,9 @@ pub struct ProfileProviderOrganizationResponseModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] pub enabled: Option, #[serde(rename = "ssoBound", skip_serializing_if = "Option::is_none")] @@ -75,7 +79,7 @@ pub struct ProfileProviderOrganizationResponseModel { #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde( rename = "resetPasswordEnrolled", skip_serializing_if = "Option::is_none" @@ -93,7 +97,7 @@ pub struct ProfileProviderOrganizationResponseModel { #[serde(rename = "providerName", skip_serializing_if = "Option::is_none")] pub provider_name: Option, #[serde(rename = "providerType", skip_serializing_if = "Option::is_none")] - pub provider_type: Option, + pub provider_type: Option, #[serde( rename = "familySponsorshipFriendlyName", skip_serializing_if = "Option::is_none" @@ -105,7 +109,7 @@ pub struct ProfileProviderOrganizationResponseModel { )] pub family_sponsorship_available: Option, #[serde(rename = "planProductType", skip_serializing_if = "Option::is_none")] - pub plan_product_type: Option, + pub plan_product_type: Option, #[serde( rename = "keyConnectorEnabled", skip_serializing_if = "Option::is_none" diff --git a/crates/bitwarden-api-api/src/models/profile_provider_response_model.rs b/crates/bitwarden-api-api/src/models/profile_provider_response_model.rs index aac654e96..7520be8d1 100644 --- a/crates/bitwarden-api-api/src/models/profile_provider_response_model.rs +++ b/crates/bitwarden-api-api/src/models/profile_provider_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProfileProviderResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -19,19 +23,19 @@ pub struct ProfileProviderResponseModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] pub enabled: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, #[serde(rename = "useEvents", skip_serializing_if = "Option::is_none")] pub use_events: Option, #[serde(rename = "providerStatus", skip_serializing_if = "Option::is_none")] - pub provider_status: Option, + pub provider_status: Option, } impl ProfileProviderResponseModel { diff --git a/crates/bitwarden-api-api/src/models/profile_response_model.rs b/crates/bitwarden-api-api/src/models/profile_response_model.rs index a151875b1..2ef3672d3 100644 --- a/crates/bitwarden-api-api/src/models/profile_response_model.rs +++ b/crates/bitwarden-api-api/src/models/profile_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProfileResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -48,15 +52,14 @@ pub struct ProfileResponseModel { #[serde(rename = "creationDate", skip_serializing_if = "Option::is_none")] pub creation_date: Option, #[serde(rename = "organizations", skip_serializing_if = "Option::is_none")] - pub organizations: Option>, + pub organizations: Option>, #[serde(rename = "providers", skip_serializing_if = "Option::is_none")] - pub providers: Option>, + pub providers: Option>, #[serde( rename = "providerOrganizations", skip_serializing_if = "Option::is_none" )] - pub provider_organizations: - Option>, + pub provider_organizations: Option>, } impl ProfileResponseModel { diff --git a/crates/bitwarden-api-api/src/models/project_create_request_model.rs b/crates/bitwarden-api-api/src/models/project_create_request_model.rs index dcec98f62..16c9fe6d0 100644 --- a/crates/bitwarden-api-api/src/models/project_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/project_create_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectCreateRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/project_people_access_policies_response_model.rs b/crates/bitwarden-api-api/src/models/project_people_access_policies_response_model.rs index 27655433f..43a5e71ff 100644 --- a/crates/bitwarden-api-api/src/models/project_people_access_policies_response_model.rs +++ b/crates/bitwarden-api-api/src/models/project_people_access_policies_response_model.rs @@ -8,17 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectPeopleAccessPoliciesResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "userAccessPolicies", skip_serializing_if = "Option::is_none")] - pub user_access_policies: Option>, + pub user_access_policies: Option>, #[serde( rename = "groupAccessPolicies", skip_serializing_if = "Option::is_none" )] - pub group_access_policies: Option>, + pub group_access_policies: Option>, } impl ProjectPeopleAccessPoliciesResponseModel { diff --git a/crates/bitwarden-api-api/src/models/project_response_model.rs b/crates/bitwarden-api-api/src/models/project_response_model.rs index 93bc6f14e..f2222a939 100644 --- a/crates/bitwarden-api-api/src/models/project_response_model.rs +++ b/crates/bitwarden-api-api/src/models/project_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/project_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/project_response_model_list_response_model.rs index b6143ddf5..9b8bfe7c5 100644 --- a/crates/bitwarden-api-api/src/models/project_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/project_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_request_model.rs b/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_request_model.rs index 030e36b4a..5356de2a5 100644 --- a/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_request_model.rs +++ b/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_request_model.rs @@ -8,13 +8,17 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectServiceAccountsAccessPoliciesRequestModel { #[serde( rename = "serviceAccountAccessPolicyRequests", skip_serializing_if = "Option::is_none" )] - pub service_account_access_policy_requests: Option>, + pub service_account_access_policy_requests: Option>, } impl ProjectServiceAccountsAccessPoliciesRequestModel { diff --git a/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_response_model.rs b/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_response_model.rs index 7e4b892de..74c883c08 100644 --- a/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_response_model.rs +++ b/crates/bitwarden-api-api/src/models/project_service_accounts_access_policies_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectServiceAccountsAccessPoliciesResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct ProjectServiceAccountsAccessPoliciesResponseModel { skip_serializing_if = "Option::is_none" )] pub service_account_access_policies: - Option>, + Option>, } impl ProjectServiceAccountsAccessPoliciesResponseModel { diff --git a/crates/bitwarden-api-api/src/models/project_update_request_model.rs b/crates/bitwarden-api-api/src/models/project_update_request_model.rs index 913168899..2eab13f22 100644 --- a/crates/bitwarden-api-api/src/models/project_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/project_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProjectUpdateRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/protected_device_response_model.rs b/crates/bitwarden-api-api/src/models/protected_device_response_model.rs index 055d34c20..eab023bc2 100644 --- a/crates/bitwarden-api-api/src/models/protected_device_response_model.rs +++ b/crates/bitwarden-api-api/src/models/protected_device_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProtectedDeviceResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct ProtectedDeviceResponseModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "creationDate", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/provider_organization_add_request_model.rs b/crates/bitwarden-api-api/src/models/provider_organization_add_request_model.rs index c25569d90..8649a67d9 100644 --- a/crates/bitwarden-api-api/src/models/provider_organization_add_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_organization_add_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderOrganizationAddRequestModel { #[serde(rename = "organizationId")] pub organization_id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/provider_organization_create_request_model.rs b/crates/bitwarden-api-api/src/models/provider_organization_create_request_model.rs index 4cfb59343..149847fb4 100644 --- a/crates/bitwarden-api-api/src/models/provider_organization_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_organization_create_request_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderOrganizationCreateRequestModel { #[serde(rename = "clientOwnerEmail")] pub client_owner_email: String, #[serde(rename = "organizationCreateRequest")] - pub organization_create_request: Box, + pub organization_create_request: Box, } impl ProviderOrganizationCreateRequestModel { pub fn new( client_owner_email: String, - organization_create_request: crate::models::OrganizationCreateRequestModel, + organization_create_request: models::OrganizationCreateRequestModel, ) -> ProviderOrganizationCreateRequestModel { ProviderOrganizationCreateRequestModel { client_owner_email, diff --git a/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model.rs b/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model.rs index 2c8e99a99..9ea18d08a 100644 --- a/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderOrganizationOrganizationDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model_list_response_model.rs index 114240fc1..6e2c3d30b 100644 --- a/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_organization_organization_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderOrganizationOrganizationDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/provider_organization_response_model.rs b/crates/bitwarden-api-api/src/models/provider_organization_response_model.rs index a1d339190..387189e4b 100644 --- a/crates/bitwarden-api-api/src/models/provider_organization_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_organization_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderOrganizationResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/provider_response_model.rs b/crates/bitwarden-api-api/src/models/provider_response_model.rs index 41404bd15..96980aead 100644 --- a/crates/bitwarden-api-api/src/models/provider_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -33,7 +37,7 @@ pub struct ProviderResponseModel { #[serde(rename = "creationDate", skip_serializing_if = "Option::is_none")] pub creation_date: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, } impl ProviderResponseModel { diff --git a/crates/bitwarden-api-api/src/models/provider_setup_request_model.rs b/crates/bitwarden-api-api/src/models/provider_setup_request_model.rs index 09c6e2a94..c50704a78 100644 --- a/crates/bitwarden-api-api/src/models/provider_setup_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_setup_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderSetupRequestModel { #[serde(rename = "name")] pub name: String, @@ -21,7 +25,7 @@ pub struct ProviderSetupRequestModel { #[serde(rename = "key")] pub key: String, #[serde(rename = "taxInfo", skip_serializing_if = "Option::is_none")] - pub tax_info: Option>, + pub tax_info: Option>, } impl ProviderSetupRequestModel { diff --git a/crates/bitwarden-api-api/src/models/provider_status_type.rs b/crates/bitwarden-api-api/src/models/provider_status_type.rs index ba8d93a66..538cc5f36 100644 --- a/crates/bitwarden-api-api/src/models/provider_status_type.rs +++ b/crates/bitwarden-api-api/src/models/provider_status_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum ProviderStatusType { Pending = 0, @@ -19,12 +32,12 @@ pub enum ProviderStatusType { Billable = 2, } -impl ToString for ProviderStatusType { - fn to_string(&self) -> String { +impl std::fmt::Display for ProviderStatusType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Pending => String::from("0"), - Self::Created => String::from("1"), - Self::Billable => String::from("2"), + Self::Pending => write!(f, "0"), + Self::Created => write!(f, "1"), + Self::Billable => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/provider_type.rs b/crates/bitwarden-api-api/src/models/provider_type.rs index f2d30a6cd..83b5e4c4d 100644 --- a/crates/bitwarden-api-api/src/models/provider_type.rs +++ b/crates/bitwarden-api-api/src/models/provider_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum ProviderType { Msp = 0, Reseller = 1, } -impl ToString for ProviderType { - fn to_string(&self) -> String { +impl std::fmt::Display for ProviderType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Msp => String::from("0"), - Self::Reseller => String::from("1"), + Self::Msp => write!(f, "0"), + Self::Reseller => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/provider_update_request_model.rs b/crates/bitwarden-api-api/src/models/provider_update_request_model.rs index 39d892904..1c9fd5300 100644 --- a/crates/bitwarden-api-api/src/models/provider_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUpdateRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/provider_user_accept_request_model.rs b/crates/bitwarden-api-api/src/models/provider_user_accept_request_model.rs index cf526fa7c..68f2f068e 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_accept_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_accept_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserAcceptRequestModel { #[serde(rename = "token")] pub token: String, diff --git a/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model.rs b/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model.rs index 78bc34e17..d260745d0 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model.rs @@ -8,15 +8,19 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserBulkConfirmRequestModel { #[serde(rename = "keys")] - pub keys: Vec, + pub keys: Vec, } impl ProviderUserBulkConfirmRequestModel { pub fn new( - keys: Vec, + keys: Vec, ) -> ProviderUserBulkConfirmRequestModel { ProviderUserBulkConfirmRequestModel { keys } } diff --git a/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model_entry.rs b/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model_entry.rs index cc5c82d82..101ff4f49 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model_entry.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_bulk_confirm_request_model_entry.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserBulkConfirmRequestModelEntry { #[serde(rename = "id")] pub id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/provider_user_bulk_request_model.rs b/crates/bitwarden-api-api/src/models/provider_user_bulk_request_model.rs index 5e4cdca5a..525fcc1ce 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_bulk_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_bulk_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserBulkRequestModel { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model.rs index 00da85ac4..04479834b 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserBulkResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model_list_response_model.rs index 9f76667b9..8e7835b6d 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_bulk_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserBulkResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/provider_user_confirm_request_model.rs b/crates/bitwarden-api-api/src/models/provider_user_confirm_request_model.rs index 917b858cf..3f878cf19 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_confirm_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_confirm_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserConfirmRequestModel { #[serde(rename = "key")] pub key: String, diff --git a/crates/bitwarden-api-api/src/models/provider_user_invite_request_model.rs b/crates/bitwarden-api-api/src/models/provider_user_invite_request_model.rs index 6113957bb..5ce044a21 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_invite_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_invite_request_model.rs @@ -8,18 +8,22 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserInviteRequestModel { #[serde(rename = "emails")] pub emails: Vec, #[serde(rename = "type")] - pub r#type: crate::models::ProviderUserType, + pub r#type: models::ProviderUserType, } impl ProviderUserInviteRequestModel { pub fn new( emails: Vec, - r#type: crate::models::ProviderUserType, + r#type: models::ProviderUserType, ) -> ProviderUserInviteRequestModel { ProviderUserInviteRequestModel { emails, r#type } } diff --git a/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model.rs index 8dbd5f0a7..66a6a057a 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserPublicKeyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model_list_response_model.rs index 154070458..e475601e4 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_public_key_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserPublicKeyResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/provider_user_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_response_model.rs index 3ffeaa926..001017982 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,11 +21,11 @@ pub struct ProviderUserResponseModel { #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, } impl ProviderUserResponseModel { diff --git a/crates/bitwarden-api-api/src/models/provider_user_status_type.rs b/crates/bitwarden-api-api/src/models/provider_user_status_type.rs index 653dabbeb..b45967eb5 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_status_type.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_status_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum ProviderUserStatusType { Invited = 0, @@ -19,12 +32,12 @@ pub enum ProviderUserStatusType { Confirmed = 2, } -impl ToString for ProviderUserStatusType { - fn to_string(&self) -> String { +impl std::fmt::Display for ProviderUserStatusType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Invited => String::from("0"), - Self::Accepted => String::from("1"), - Self::Confirmed => String::from("2"), + Self::Invited => write!(f, "0"), + Self::Accepted => write!(f, "1"), + Self::Confirmed => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/provider_user_type.rs b/crates/bitwarden-api-api/src/models/provider_user_type.rs index c51a3b932..831faa878 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_type.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum ProviderUserType { ProviderAdmin = 0, ServiceUser = 1, } -impl ToString for ProviderUserType { - fn to_string(&self) -> String { +impl std::fmt::Display for ProviderUserType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::ProviderAdmin => String::from("0"), - Self::ServiceUser => String::from("1"), + Self::ProviderAdmin => write!(f, "0"), + Self::ServiceUser => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/provider_user_update_request_model.rs b/crates/bitwarden-api-api/src/models/provider_user_update_request_model.rs index eeb36bff7..a57d7c02a 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_update_request_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserUpdateRequestModel { #[serde(rename = "type")] - pub r#type: crate::models::ProviderUserType, + pub r#type: models::ProviderUserType, } impl ProviderUserUpdateRequestModel { - pub fn new(r#type: crate::models::ProviderUserType) -> ProviderUserUpdateRequestModel { + pub fn new(r#type: models::ProviderUserType) -> ProviderUserUpdateRequestModel { ProviderUserUpdateRequestModel { r#type } } } diff --git a/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model.rs index 74f6169cb..4c7bb5a06 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserUserDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,11 +21,11 @@ pub struct ProviderUserUserDetailsResponseModel { #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "status", skip_serializing_if = "Option::is_none")] - pub status: Option, + pub status: Option, #[serde(rename = "permissions", skip_serializing_if = "Option::is_none")] - pub permissions: Option>, + pub permissions: Option>, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "email", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model_list_response_model.rs index 7e9a171fe..29a19db3d 100644 --- a/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_user_user_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderUserUserDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/provider_verify_delete_recover_request_model.rs b/crates/bitwarden-api-api/src/models/provider_verify_delete_recover_request_model.rs index 52d6d6b2b..7bce920f0 100644 --- a/crates/bitwarden-api-api/src/models/provider_verify_delete_recover_request_model.rs +++ b/crates/bitwarden-api-api/src/models/provider_verify_delete_recover_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ProviderVerifyDeleteRecoverRequestModel { #[serde(rename = "token")] pub token: String, diff --git a/crates/bitwarden-api-api/src/models/pub_key_cred_param.rs b/crates/bitwarden-api-api/src/models/pub_key_cred_param.rs index 670062fa1..5a4099540 100644 --- a/crates/bitwarden-api-api/src/models/pub_key_cred_param.rs +++ b/crates/bitwarden-api-api/src/models/pub_key_cred_param.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PubKeyCredParam { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "alg", skip_serializing_if = "Option::is_none")] - pub alg: Option, + pub alg: Option, } impl PubKeyCredParam { diff --git a/crates/bitwarden-api-api/src/models/public_key_credential_descriptor.rs b/crates/bitwarden-api-api/src/models/public_key_credential_descriptor.rs index e266e1105..cf2ac567d 100644 --- a/crates/bitwarden-api-api/src/models/public_key_credential_descriptor.rs +++ b/crates/bitwarden-api-api/src/models/public_key_credential_descriptor.rs @@ -8,14 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PublicKeyCredentialDescriptor { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, + #[serde_as(as = "Option")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")] - pub id: Option, + pub id: Option>, #[serde(rename = "transports", skip_serializing_if = "Option::is_none")] - pub transports: Option>, + pub transports: Option>, } impl PublicKeyCredentialDescriptor { diff --git a/crates/bitwarden-api-api/src/models/public_key_credential_rp_entity.rs b/crates/bitwarden-api-api/src/models/public_key_credential_rp_entity.rs index 318405f71..a64595325 100644 --- a/crates/bitwarden-api-api/src/models/public_key_credential_rp_entity.rs +++ b/crates/bitwarden-api-api/src/models/public_key_credential_rp_entity.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PublicKeyCredentialRpEntity { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/public_key_credential_type.rs b/crates/bitwarden-api-api/src/models/public_key_credential_type.rs index a12386a3d..c4b0e831c 100644 --- a/crates/bitwarden-api-api/src/models/public_key_credential_type.rs +++ b/crates/bitwarden-api-api/src/models/public_key_credential_type.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum PublicKeyCredentialType { @@ -15,10 +19,10 @@ pub enum PublicKeyCredentialType { PublicKey, } -impl ToString for PublicKeyCredentialType { - fn to_string(&self) -> String { +impl std::fmt::Display for PublicKeyCredentialType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::PublicKey => String::from("public-key"), + Self::PublicKey => write!(f, "public-key"), } } } diff --git a/crates/bitwarden-api-api/src/models/push_device_request_model.rs b/crates/bitwarden-api-api/src/models/push_device_request_model.rs index 8b65ff3bc..b234a6fd7 100644 --- a/crates/bitwarden-api-api/src/models/push_device_request_model.rs +++ b/crates/bitwarden-api-api/src/models/push_device_request_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PushDeviceRequestModel { #[serde(rename = "id")] pub id: String, #[serde(rename = "type")] - pub r#type: crate::models::DeviceType, + pub r#type: models::DeviceType, } impl PushDeviceRequestModel { - pub fn new(id: String, r#type: crate::models::DeviceType) -> PushDeviceRequestModel { + pub fn new(id: String, r#type: models::DeviceType) -> PushDeviceRequestModel { PushDeviceRequestModel { id, r#type } } } diff --git a/crates/bitwarden-api-api/src/models/push_registration_request_model.rs b/crates/bitwarden-api-api/src/models/push_registration_request_model.rs index aca447e3f..d24d2fe64 100644 --- a/crates/bitwarden-api-api/src/models/push_registration_request_model.rs +++ b/crates/bitwarden-api-api/src/models/push_registration_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PushRegistrationRequestModel { #[serde(rename = "deviceId")] pub device_id: String, @@ -17,7 +21,7 @@ pub struct PushRegistrationRequestModel { #[serde(rename = "userId")] pub user_id: String, #[serde(rename = "type")] - pub r#type: crate::models::DeviceType, + pub r#type: models::DeviceType, #[serde(rename = "identifier")] pub identifier: String, } @@ -27,7 +31,7 @@ impl PushRegistrationRequestModel { device_id: String, push_token: String, user_id: String, - r#type: crate::models::DeviceType, + r#type: models::DeviceType, identifier: String, ) -> PushRegistrationRequestModel { PushRegistrationRequestModel { diff --git a/crates/bitwarden-api-api/src/models/push_send_request_model.rs b/crates/bitwarden-api-api/src/models/push_send_request_model.rs index d064b78e2..5d8d6e804 100644 --- a/crates/bitwarden-api-api/src/models/push_send_request_model.rs +++ b/crates/bitwarden-api-api/src/models/push_send_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PushSendRequestModel { #[serde(rename = "userId", skip_serializing_if = "Option::is_none")] pub user_id: Option, @@ -19,14 +23,14 @@ pub struct PushSendRequestModel { #[serde(rename = "identifier", skip_serializing_if = "Option::is_none")] pub identifier: Option, #[serde(rename = "type")] - pub r#type: crate::models::PushType, + pub r#type: models::PushType, #[serde(rename = "payload")] pub payload: Option, } impl PushSendRequestModel { pub fn new( - r#type: crate::models::PushType, + r#type: models::PushType, payload: Option, ) -> PushSendRequestModel { PushSendRequestModel { diff --git a/crates/bitwarden-api-api/src/models/push_type.rs b/crates/bitwarden-api-api/src/models/push_type.rs index 42fc4d66d..aa8482450 100644 --- a/crates/bitwarden-api-api/src/models/push_type.rs +++ b/crates/bitwarden-api-api/src/models/push_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum PushType { SyncCipherUpdate = 0, @@ -34,27 +47,27 @@ pub enum PushType { SyncOrganizations = 17, } -impl ToString for PushType { - fn to_string(&self) -> String { +impl std::fmt::Display for PushType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::SyncCipherUpdate => String::from("0"), - Self::SyncCipherCreate => String::from("1"), - Self::SyncLoginDelete => String::from("2"), - Self::SyncFolderDelete => String::from("3"), - Self::SyncCiphers => String::from("4"), - Self::SyncVault => String::from("5"), - Self::SyncOrgKeys => String::from("6"), - Self::SyncFolderCreate => String::from("7"), - Self::SyncFolderUpdate => String::from("8"), - Self::SyncCipherDelete => String::from("9"), - Self::SyncSettings => String::from("10"), - Self::LogOut => String::from("11"), - Self::SyncSendCreate => String::from("12"), - Self::SyncSendUpdate => String::from("13"), - Self::SyncSendDelete => String::from("14"), - Self::AuthRequest => String::from("15"), - Self::AuthRequestResponse => String::from("16"), - Self::SyncOrganizations => String::from("17"), + Self::SyncCipherUpdate => write!(f, "0"), + Self::SyncCipherCreate => write!(f, "1"), + Self::SyncLoginDelete => write!(f, "2"), + Self::SyncFolderDelete => write!(f, "3"), + Self::SyncCiphers => write!(f, "4"), + Self::SyncVault => write!(f, "5"), + Self::SyncOrgKeys => write!(f, "6"), + Self::SyncFolderCreate => write!(f, "7"), + Self::SyncFolderUpdate => write!(f, "8"), + Self::SyncCipherDelete => write!(f, "9"), + Self::SyncSettings => write!(f, "10"), + Self::LogOut => write!(f, "11"), + Self::SyncSendCreate => write!(f, "12"), + Self::SyncSendUpdate => write!(f, "13"), + Self::SyncSendDelete => write!(f, "14"), + Self::AuthRequest => write!(f, "15"), + Self::AuthRequestResponse => write!(f, "16"), + Self::SyncOrganizations => write!(f, "17"), } } } diff --git a/crates/bitwarden-api-api/src/models/push_update_request_model.rs b/crates/bitwarden-api-api/src/models/push_update_request_model.rs index d13ddccd3..9d32b5ec1 100644 --- a/crates/bitwarden-api-api/src/models/push_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/push_update_request_model.rs @@ -8,17 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PushUpdateRequestModel { #[serde(rename = "devices")] - pub devices: Vec, + pub devices: Vec, #[serde(rename = "organizationId")] pub organization_id: String, } impl PushUpdateRequestModel { pub fn new( - devices: Vec, + devices: Vec, organization_id: String, ) -> PushUpdateRequestModel { PushUpdateRequestModel { diff --git a/crates/bitwarden-api-api/src/models/register_request_model.rs b/crates/bitwarden-api-api/src/models/register_request_model.rs index b4a0d4b8d..714b5bb06 100644 --- a/crates/bitwarden-api-api/src/models/register_request_model.rs +++ b/crates/bitwarden-api-api/src/models/register_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RegisterRequestModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, @@ -23,13 +27,13 @@ pub struct RegisterRequestModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, #[serde(rename = "token", skip_serializing_if = "Option::is_none")] pub token: Option, #[serde(rename = "organizationUserId", skip_serializing_if = "Option::is_none")] pub organization_user_id: Option, #[serde(rename = "kdf", skip_serializing_if = "Option::is_none")] - pub kdf: Option, + pub kdf: Option, #[serde(rename = "kdfIterations", skip_serializing_if = "Option::is_none")] pub kdf_iterations: Option, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] @@ -37,7 +41,7 @@ pub struct RegisterRequestModel { #[serde(rename = "kdfParallelism", skip_serializing_if = "Option::is_none")] pub kdf_parallelism: Option, #[serde(rename = "referenceData", skip_serializing_if = "Option::is_none")] - pub reference_data: Option<::std::collections::HashMap>, + pub reference_data: Option>, } impl RegisterRequestModel { diff --git a/crates/bitwarden-api-api/src/models/register_response_model.rs b/crates/bitwarden-api-api/src/models/register_response_model.rs index 629d2af4f..560f2409a 100644 --- a/crates/bitwarden-api-api/src/models/register_response_model.rs +++ b/crates/bitwarden-api-api/src/models/register_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RegisterResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/reset_password_with_org_id_request_model.rs b/crates/bitwarden-api-api/src/models/reset_password_with_org_id_request_model.rs index c74c02592..3bc06379f 100644 --- a/crates/bitwarden-api-api/src/models/reset_password_with_org_id_request_model.rs +++ b/crates/bitwarden-api-api/src/models/reset_password_with_org_id_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ResetPasswordWithOrgIdRequestModel { #[serde(rename = "resetPasswordKey", skip_serializing_if = "Option::is_none")] pub reset_password_key: Option, diff --git a/crates/bitwarden-api-api/src/models/response_data.rs b/crates/bitwarden-api-api/src/models/response_data.rs index 9ff2a66e0..e817bd72d 100644 --- a/crates/bitwarden-api-api/src/models/response_data.rs +++ b/crates/bitwarden-api-api/src/models/response_data.rs @@ -8,12 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ResponseData { + #[serde_as(as = "Option")] #[serde(rename = "attestationObject", skip_serializing_if = "Option::is_none")] - pub attestation_object: Option, + pub attestation_object: Option>, + #[serde_as(as = "Option")] #[serde(rename = "clientDataJSON", skip_serializing_if = "Option::is_none")] - pub client_data_json: Option, + pub client_data_json: Option>, } impl ResponseData { diff --git a/crates/bitwarden-api-api/src/models/revoke_access_tokens_request.rs b/crates/bitwarden-api-api/src/models/revoke_access_tokens_request.rs index 20d18ab59..a9c6c7d86 100644 --- a/crates/bitwarden-api-api/src/models/revoke_access_tokens_request.rs +++ b/crates/bitwarden-api-api/src/models/revoke_access_tokens_request.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RevokeAccessTokensRequest { #[serde(rename = "ids")] pub ids: Vec, diff --git a/crates/bitwarden-api-api/src/models/saml2_binding_type.rs b/crates/bitwarden-api-api/src/models/saml2_binding_type.rs index e01b398cd..e9e970207 100644 --- a/crates/bitwarden-api-api/src/models/saml2_binding_type.rs +++ b/crates/bitwarden-api-api/src/models/saml2_binding_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum Saml2BindingType { HttpRedirect = 1, HttpPost = 2, } -impl ToString for Saml2BindingType { - fn to_string(&self) -> String { +impl std::fmt::Display for Saml2BindingType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::HttpRedirect => String::from("1"), - Self::HttpPost => String::from("2"), + Self::HttpRedirect => write!(f, "1"), + Self::HttpPost => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/saml2_name_id_format.rs b/crates/bitwarden-api-api/src/models/saml2_name_id_format.rs index e8680e9a6..00d85c949 100644 --- a/crates/bitwarden-api-api/src/models/saml2_name_id_format.rs +++ b/crates/bitwarden-api-api/src/models/saml2_name_id_format.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum Saml2NameIdFormat { NotConfigured = 0, @@ -25,18 +38,18 @@ pub enum Saml2NameIdFormat { Transient = 8, } -impl ToString for Saml2NameIdFormat { - fn to_string(&self) -> String { +impl std::fmt::Display for Saml2NameIdFormat { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::NotConfigured => String::from("0"), - Self::Unspecified => String::from("1"), - Self::EmailAddress => String::from("2"), - Self::X509SubjectName => String::from("3"), - Self::WindowsDomainQualifiedName => String::from("4"), - Self::KerberosPrincipalName => String::from("5"), - Self::EntityIdentifier => String::from("6"), - Self::Persistent => String::from("7"), - Self::Transient => String::from("8"), + Self::NotConfigured => write!(f, "0"), + Self::Unspecified => write!(f, "1"), + Self::EmailAddress => write!(f, "2"), + Self::X509SubjectName => write!(f, "3"), + Self::WindowsDomainQualifiedName => write!(f, "4"), + Self::KerberosPrincipalName => write!(f, "5"), + Self::EntityIdentifier => write!(f, "6"), + Self::Persistent => write!(f, "7"), + Self::Transient => write!(f, "8"), } } } diff --git a/crates/bitwarden-api-api/src/models/saml2_signing_behavior.rs b/crates/bitwarden-api-api/src/models/saml2_signing_behavior.rs index 12be578aa..9bbe79a85 100644 --- a/crates/bitwarden-api-api/src/models/saml2_signing_behavior.rs +++ b/crates/bitwarden-api-api/src/models/saml2_signing_behavior.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum Saml2SigningBehavior { IfIdpWantAuthnRequestsSigned = 0, @@ -19,12 +32,12 @@ pub enum Saml2SigningBehavior { Never = 3, } -impl ToString for Saml2SigningBehavior { - fn to_string(&self) -> String { +impl std::fmt::Display for Saml2SigningBehavior { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::IfIdpWantAuthnRequestsSigned => String::from("0"), - Self::Always => String::from("1"), - Self::Never => String::from("3"), + Self::IfIdpWantAuthnRequestsSigned => write!(f, "0"), + Self::Always => write!(f, "1"), + Self::Never => write!(f, "3"), } } } diff --git a/crates/bitwarden-api-api/src/models/secret_create_request_model.rs b/crates/bitwarden-api-api/src/models/secret_create_request_model.rs index 7bc23b871..7325ba8e0 100644 --- a/crates/bitwarden-api-api/src/models/secret_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/secret_create_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretCreateRequestModel { #[serde(rename = "key")] pub key: String, diff --git a/crates/bitwarden-api-api/src/models/secret_response_inner_project.rs b/crates/bitwarden-api-api/src/models/secret_response_inner_project.rs index 25be360ad..a123ca901 100644 --- a/crates/bitwarden-api-api/src/models/secret_response_inner_project.rs +++ b/crates/bitwarden-api-api/src/models/secret_response_inner_project.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretResponseInnerProject { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/secret_response_model.rs b/crates/bitwarden-api-api/src/models/secret_response_model.rs index dffea3122..04e5355b3 100644 --- a/crates/bitwarden-api-api/src/models/secret_response_model.rs +++ b/crates/bitwarden-api-api/src/models/secret_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -27,7 +31,7 @@ pub struct SecretResponseModel { #[serde(rename = "revisionDate", skip_serializing_if = "Option::is_none")] pub revision_date: Option, #[serde(rename = "projects", skip_serializing_if = "Option::is_none")] - pub projects: Option>, + pub projects: Option>, #[serde(rename = "read", skip_serializing_if = "Option::is_none")] pub read: Option, #[serde(rename = "write", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/secret_update_request_model.rs b/crates/bitwarden-api-api/src/models/secret_update_request_model.rs index 67ae4ade2..c0f11a8a1 100644 --- a/crates/bitwarden-api-api/src/models/secret_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/secret_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretUpdateRequestModel { #[serde(rename = "key")] pub key: String, diff --git a/crates/bitwarden-api-api/src/models/secret_verification_request_model.rs b/crates/bitwarden-api-api/src/models/secret_verification_request_model.rs index 85ceee419..bd699deb3 100644 --- a/crates/bitwarden-api-api/src/models/secret_verification_request_model.rs +++ b/crates/bitwarden-api-api/src/models/secret_verification_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretVerificationRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/secret_with_projects_inner_project.rs b/crates/bitwarden-api-api/src/models/secret_with_projects_inner_project.rs index cce3b239c..453cdf8c3 100644 --- a/crates/bitwarden-api-api/src/models/secret_with_projects_inner_project.rs +++ b/crates/bitwarden-api-api/src/models/secret_with_projects_inner_project.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretWithProjectsInnerProject { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/secret_with_projects_list_response_model.rs b/crates/bitwarden-api-api/src/models/secret_with_projects_list_response_model.rs index 046e698f4..b774fa713 100644 --- a/crates/bitwarden-api-api/src/models/secret_with_projects_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/secret_with_projects_list_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretWithProjectsListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "secrets", skip_serializing_if = "Option::is_none")] - pub secrets: Option>, + pub secrets: Option>, #[serde(rename = "projects", skip_serializing_if = "Option::is_none")] - pub projects: Option>, + pub projects: Option>, } impl SecretWithProjectsListResponseModel { diff --git a/crates/bitwarden-api-api/src/models/secrets_manager_plan_features_response_model.rs b/crates/bitwarden-api-api/src/models/secrets_manager_plan_features_response_model.rs index ef8d32f04..7f46723bd 100644 --- a/crates/bitwarden-api-api/src/models/secrets_manager_plan_features_response_model.rs +++ b/crates/bitwarden-api-api/src/models/secrets_manager_plan_features_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretsManagerPlanFeaturesResponseModel { #[serde(rename = "maxServiceAccounts", skip_serializing_if = "Option::is_none")] pub max_service_accounts: Option, diff --git a/crates/bitwarden-api-api/src/models/secrets_manager_subscribe_request_model.rs b/crates/bitwarden-api-api/src/models/secrets_manager_subscribe_request_model.rs index cf27fa764..45861e984 100644 --- a/crates/bitwarden-api-api/src/models/secrets_manager_subscribe_request_model.rs +++ b/crates/bitwarden-api-api/src/models/secrets_manager_subscribe_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretsManagerSubscribeRequestModel { #[serde(rename = "additionalSmSeats")] pub additional_sm_seats: i32, diff --git a/crates/bitwarden-api-api/src/models/secrets_manager_subscription_update_request_model.rs b/crates/bitwarden-api-api/src/models/secrets_manager_subscription_update_request_model.rs index b61e9c2fe..346c7e4eb 100644 --- a/crates/bitwarden-api-api/src/models/secrets_manager_subscription_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/secrets_manager_subscription_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretsManagerSubscriptionUpdateRequestModel { #[serde(rename = "seatAdjustment")] pub seat_adjustment: i32, diff --git a/crates/bitwarden-api-api/src/models/secrets_sync_response_model.rs b/crates/bitwarden-api-api/src/models/secrets_sync_response_model.rs index 2cb07c18f..23efafa1d 100644 --- a/crates/bitwarden-api-api/src/models/secrets_sync_response_model.rs +++ b/crates/bitwarden-api-api/src/models/secrets_sync_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretsSyncResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "hasChanges", skip_serializing_if = "Option::is_none")] pub has_changes: Option, #[serde(rename = "secrets", skip_serializing_if = "Option::is_none")] - pub secrets: Option>, + pub secrets: Option>, } impl SecretsSyncResponseModel { diff --git a/crates/bitwarden-api-api/src/models/secrets_with_projects_inner_secret.rs b/crates/bitwarden-api-api/src/models/secrets_with_projects_inner_secret.rs index 2b6673ef1..a97fa1b54 100644 --- a/crates/bitwarden-api-api/src/models/secrets_with_projects_inner_secret.rs +++ b/crates/bitwarden-api-api/src/models/secrets_with_projects_inner_secret.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SecretsWithProjectsInnerSecret { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, @@ -21,7 +25,7 @@ pub struct SecretsWithProjectsInnerSecret { #[serde(rename = "revisionDate", skip_serializing_if = "Option::is_none")] pub revision_date: Option, #[serde(rename = "projects", skip_serializing_if = "Option::is_none")] - pub projects: Option>, + pub projects: Option>, #[serde(rename = "read", skip_serializing_if = "Option::is_none")] pub read: Option, #[serde(rename = "write", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/secure_note_type.rs b/crates/bitwarden-api-api/src/models/secure_note_type.rs index dd8516f6e..8807b3517 100644 --- a/crates/bitwarden-api-api/src/models/secure_note_type.rs +++ b/crates/bitwarden-api-api/src/models/secure_note_type.rs @@ -8,19 +8,32 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum SecureNoteType { Generic = 0, } -impl ToString for SecureNoteType { - fn to_string(&self) -> String { +impl std::fmt::Display for SecureNoteType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Generic => String::from("0"), + Self::Generic => write!(f, "0"), } } } diff --git a/crates/bitwarden-api-api/src/models/selection_read_only_request_model.rs b/crates/bitwarden-api-api/src/models/selection_read_only_request_model.rs index 81695f1d7..937bcbd1a 100644 --- a/crates/bitwarden-api-api/src/models/selection_read_only_request_model.rs +++ b/crates/bitwarden-api-api/src/models/selection_read_only_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SelectionReadOnlyRequestModel { #[serde(rename = "id")] pub id: uuid::Uuid, diff --git a/crates/bitwarden-api-api/src/models/selection_read_only_response_model.rs b/crates/bitwarden-api-api/src/models/selection_read_only_response_model.rs index b24fd8368..6b269613b 100644 --- a/crates/bitwarden-api-api/src/models/selection_read_only_response_model.rs +++ b/crates/bitwarden-api-api/src/models/selection_read_only_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SelectionReadOnlyResponseModel { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/self_hosted_organization_license_request_model.rs b/crates/bitwarden-api-api/src/models/self_hosted_organization_license_request_model.rs index 3e5038e38..afae19028 100644 --- a/crates/bitwarden-api-api/src/models/self_hosted_organization_license_request_model.rs +++ b/crates/bitwarden-api-api/src/models/self_hosted_organization_license_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SelfHostedOrganizationLicenseRequestModel { #[serde(rename = "licenseKey", skip_serializing_if = "Option::is_none")] pub license_key: Option, diff --git a/crates/bitwarden-api-api/src/models/send_access_request_model.rs b/crates/bitwarden-api-api/src/models/send_access_request_model.rs index 51192dc02..8fc407a4e 100644 --- a/crates/bitwarden-api-api/src/models/send_access_request_model.rs +++ b/crates/bitwarden-api-api/src/models/send_access_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendAccessRequestModel { #[serde(rename = "password", skip_serializing_if = "Option::is_none")] pub password: Option, diff --git a/crates/bitwarden-api-api/src/models/send_file_model.rs b/crates/bitwarden-api-api/src/models/send_file_model.rs index e94c99ea2..a2d799d7b 100644 --- a/crates/bitwarden-api-api/src/models/send_file_model.rs +++ b/crates/bitwarden-api-api/src/models/send_file_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendFileModel { #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, diff --git a/crates/bitwarden-api-api/src/models/send_file_upload_data_response_model.rs b/crates/bitwarden-api-api/src/models/send_file_upload_data_response_model.rs index 0f1329824..ecfda00b2 100644 --- a/crates/bitwarden-api-api/src/models/send_file_upload_data_response_model.rs +++ b/crates/bitwarden-api-api/src/models/send_file_upload_data_response_model.rs @@ -8,16 +8,20 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendFileUploadDataResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "url", skip_serializing_if = "Option::is_none")] pub url: Option, #[serde(rename = "fileUploadType", skip_serializing_if = "Option::is_none")] - pub file_upload_type: Option, + pub file_upload_type: Option, #[serde(rename = "sendResponse", skip_serializing_if = "Option::is_none")] - pub send_response: Option>, + pub send_response: Option>, } impl SendFileUploadDataResponseModel { diff --git a/crates/bitwarden-api-api/src/models/send_request_model.rs b/crates/bitwarden-api-api/src/models/send_request_model.rs index e117b82fb..4fee2b8d4 100644 --- a/crates/bitwarden-api-api/src/models/send_request_model.rs +++ b/crates/bitwarden-api-api/src/models/send_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendRequestModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "fileLength", skip_serializing_if = "Option::is_none")] pub file_length: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] @@ -27,9 +31,9 @@ pub struct SendRequestModel { #[serde(rename = "deletionDate")] pub deletion_date: String, #[serde(rename = "file", skip_serializing_if = "Option::is_none")] - pub file: Option>, + pub file: Option>, #[serde(rename = "text", skip_serializing_if = "Option::is_none")] - pub text: Option>, + pub text: Option>, #[serde(rename = "password", skip_serializing_if = "Option::is_none")] pub password: Option, #[serde(rename = "disabled")] diff --git a/crates/bitwarden-api-api/src/models/send_response_model.rs b/crates/bitwarden-api-api/src/models/send_response_model.rs index c74ddd7c4..34c6a71a7 100644 --- a/crates/bitwarden-api-api/src/models/send_response_model.rs +++ b/crates/bitwarden-api-api/src/models/send_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,15 +21,15 @@ pub struct SendResponseModel { #[serde(rename = "accessId", skip_serializing_if = "Option::is_none")] pub access_id: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "notes", skip_serializing_if = "Option::is_none")] pub notes: Option, #[serde(rename = "file", skip_serializing_if = "Option::is_none")] - pub file: Option>, + pub file: Option>, #[serde(rename = "text", skip_serializing_if = "Option::is_none")] - pub text: Option>, + pub text: Option>, #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "maxAccessCount", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/send_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/send_response_model_list_response_model.rs index c0870e19c..a2caa2205 100644 --- a/crates/bitwarden-api-api/src/models/send_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/send_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/send_text_model.rs b/crates/bitwarden-api-api/src/models/send_text_model.rs index 58f2effd0..e53dfe2d7 100644 --- a/crates/bitwarden-api-api/src/models/send_text_model.rs +++ b/crates/bitwarden-api-api/src/models/send_text_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendTextModel { #[serde(rename = "text", skip_serializing_if = "Option::is_none")] pub text: Option, diff --git a/crates/bitwarden-api-api/src/models/send_type.rs b/crates/bitwarden-api-api/src/models/send_type.rs index 6364c4af2..6568eb315 100644 --- a/crates/bitwarden-api-api/src/models/send_type.rs +++ b/crates/bitwarden-api-api/src/models/send_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum SendType { Text = 0, File = 1, } -impl ToString for SendType { - fn to_string(&self) -> String { +impl std::fmt::Display for SendType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Text => String::from("0"), - Self::File => String::from("1"), + Self::Text => write!(f, "0"), + Self::File => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-api/src/models/send_with_id_request_model.rs b/crates/bitwarden-api-api/src/models/send_with_id_request_model.rs index 06dc03a95..3ade1b0d3 100644 --- a/crates/bitwarden-api-api/src/models/send_with_id_request_model.rs +++ b/crates/bitwarden-api-api/src/models/send_with_id_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SendWithIdRequestModel { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, #[serde(rename = "fileLength", skip_serializing_if = "Option::is_none")] pub file_length: Option, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] @@ -27,9 +31,9 @@ pub struct SendWithIdRequestModel { #[serde(rename = "deletionDate")] pub deletion_date: String, #[serde(rename = "file", skip_serializing_if = "Option::is_none")] - pub file: Option>, + pub file: Option>, #[serde(rename = "text", skip_serializing_if = "Option::is_none")] - pub text: Option>, + pub text: Option>, #[serde(rename = "password", skip_serializing_if = "Option::is_none")] pub password: Option, #[serde(rename = "disabled")] diff --git a/crates/bitwarden-api-api/src/models/server_config_response_model.rs b/crates/bitwarden-api-api/src/models/server_config_response_model.rs index a5603808f..61d916de7 100644 --- a/crates/bitwarden-api-api/src/models/server_config_response_model.rs +++ b/crates/bitwarden-api-api/src/models/server_config_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServerConfigResponseModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, diff --git a/crates/bitwarden-api-api/src/models/service_account_create_request_model.rs b/crates/bitwarden-api-api/src/models/service_account_create_request_model.rs index ebebc8f96..d90ba46cd 100644 --- a/crates/bitwarden-api-api/src/models/service_account_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_create_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountCreateRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/service_account_granted_policies_permission_details_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_granted_policies_permission_details_response_model.rs index b781008e7..d55f2bec7 100644 --- a/crates/bitwarden-api-api/src/models/service_account_granted_policies_permission_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_granted_policies_permission_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountGrantedPoliciesPermissionDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct ServiceAccountGrantedPoliciesPermissionDetailsResponseModel { skip_serializing_if = "Option::is_none" )] pub granted_project_policies: - Option>, + Option>, } impl ServiceAccountGrantedPoliciesPermissionDetailsResponseModel { diff --git a/crates/bitwarden-api-api/src/models/service_account_granted_policies_request_model.rs b/crates/bitwarden-api-api/src/models/service_account_granted_policies_request_model.rs index 5873167ac..d9f87b85f 100644 --- a/crates/bitwarden-api-api/src/models/service_account_granted_policies_request_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_granted_policies_request_model.rs @@ -8,13 +8,17 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountGrantedPoliciesRequestModel { #[serde( rename = "projectGrantedPolicyRequests", skip_serializing_if = "Option::is_none" )] - pub project_granted_policy_requests: Option>, + pub project_granted_policy_requests: Option>, } impl ServiceAccountGrantedPoliciesRequestModel { diff --git a/crates/bitwarden-api-api/src/models/service_account_people_access_policies_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_people_access_policies_response_model.rs index 3b38851f4..84cf3ac18 100644 --- a/crates/bitwarden-api-api/src/models/service_account_people_access_policies_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_people_access_policies_response_model.rs @@ -8,19 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountPeopleAccessPoliciesResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "userAccessPolicies", skip_serializing_if = "Option::is_none")] - pub user_access_policies: - Option>, + pub user_access_policies: Option>, #[serde( rename = "groupAccessPolicies", skip_serializing_if = "Option::is_none" )] - pub group_access_policies: - Option>, + pub group_access_policies: Option>, } impl ServiceAccountPeopleAccessPoliciesResponseModel { diff --git a/crates/bitwarden-api-api/src/models/service_account_project_access_policy_permission_details_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_project_access_policy_permission_details_response_model.rs index fa4d2540d..1545c95b0 100644 --- a/crates/bitwarden-api-api/src/models/service_account_project_access_policy_permission_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_project_access_policy_permission_details_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountProjectAccessPolicyPermissionDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "accessPolicy", skip_serializing_if = "Option::is_none")] - pub access_policy: Option>, + pub access_policy: Option>, #[serde(rename = "hasPermission", skip_serializing_if = "Option::is_none")] pub has_permission: Option, } diff --git a/crates/bitwarden-api-api/src/models/service_account_project_access_policy_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_project_access_policy_response_model.rs index 8eb850e01..29369402d 100644 --- a/crates/bitwarden-api-api/src/models/service_account_project_access_policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_project_access_policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountProjectAccessPolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/service_account_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_response_model.rs index 0cba8669a..4b2d3d3e8 100644 --- a/crates/bitwarden-api-api/src/models/service_account_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model.rs index f8b8ce339..0c3c6460a 100644 --- a/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountSecretsDetailsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model_list_response_model.rs index 81ac10efa..ffe4a5cf2 100644 --- a/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_secrets_details_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountSecretsDetailsResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/service_account_update_request_model.rs b/crates/bitwarden-api-api/src/models/service_account_update_request_model.rs index 400617ed8..968bc7a7e 100644 --- a/crates/bitwarden-api-api/src/models/service_account_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/service_account_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ServiceAccountUpdateRequestModel { #[serde(rename = "name")] pub name: String, diff --git a/crates/bitwarden-api-api/src/models/set_key_connector_key_request_model.rs b/crates/bitwarden-api-api/src/models/set_key_connector_key_request_model.rs index 8da90aa4e..d3a1ee448 100644 --- a/crates/bitwarden-api-api/src/models/set_key_connector_key_request_model.rs +++ b/crates/bitwarden-api-api/src/models/set_key_connector_key_request_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SetKeyConnectorKeyRequestModel { #[serde(rename = "key")] pub key: String, #[serde(rename = "keys")] - pub keys: Box, + pub keys: Box, #[serde(rename = "kdf")] - pub kdf: crate::models::KdfType, + pub kdf: models::KdfType, #[serde(rename = "kdfIterations")] pub kdf_iterations: i32, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] @@ -29,8 +33,8 @@ pub struct SetKeyConnectorKeyRequestModel { impl SetKeyConnectorKeyRequestModel { pub fn new( key: String, - keys: crate::models::KeysRequestModel, - kdf: crate::models::KdfType, + keys: models::KeysRequestModel, + kdf: models::KdfType, kdf_iterations: i32, org_identifier: String, ) -> SetKeyConnectorKeyRequestModel { diff --git a/crates/bitwarden-api-api/src/models/set_password_request_model.rs b/crates/bitwarden-api-api/src/models/set_password_request_model.rs index 30b04c9fc..daf250417 100644 --- a/crates/bitwarden-api-api/src/models/set_password_request_model.rs +++ b/crates/bitwarden-api-api/src/models/set_password_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SetPasswordRequestModel { #[serde(rename = "masterPasswordHash")] pub master_password_hash: String, @@ -17,9 +21,9 @@ pub struct SetPasswordRequestModel { #[serde(rename = "masterPasswordHint", skip_serializing_if = "Option::is_none")] pub master_password_hint: Option, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, #[serde(rename = "kdf")] - pub kdf: crate::models::KdfType, + pub kdf: models::KdfType, #[serde(rename = "kdfIterations")] pub kdf_iterations: i32, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] @@ -34,7 +38,7 @@ impl SetPasswordRequestModel { pub fn new( master_password_hash: String, key: String, - kdf: crate::models::KdfType, + kdf: models::KdfType, kdf_iterations: i32, ) -> SetPasswordRequestModel { SetPasswordRequestModel { diff --git a/crates/bitwarden-api-api/src/models/sm_export_response_model.rs b/crates/bitwarden-api-api/src/models/sm_export_response_model.rs index 71f821254..e13d1a507 100644 --- a/crates/bitwarden-api-api/src/models/sm_export_response_model.rs +++ b/crates/bitwarden-api-api/src/models/sm_export_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SmExportResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "projects", skip_serializing_if = "Option::is_none")] - pub projects: Option>, + pub projects: Option>, #[serde(rename = "secrets", skip_serializing_if = "Option::is_none")] - pub secrets: Option>, + pub secrets: Option>, } impl SmExportResponseModel { diff --git a/crates/bitwarden-api-api/src/models/sm_import_request_model.rs b/crates/bitwarden-api-api/src/models/sm_import_request_model.rs index 68e53efbb..1a73c368d 100644 --- a/crates/bitwarden-api-api/src/models/sm_import_request_model.rs +++ b/crates/bitwarden-api-api/src/models/sm_import_request_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SmImportRequestModel { #[serde(rename = "projects", skip_serializing_if = "Option::is_none")] - pub projects: Option>, + pub projects: Option>, #[serde(rename = "secrets", skip_serializing_if = "Option::is_none")] - pub secrets: Option>, + pub secrets: Option>, } impl SmImportRequestModel { diff --git a/crates/bitwarden-api-api/src/models/sso_configuration_data.rs b/crates/bitwarden-api-api/src/models/sso_configuration_data.rs index 1cf5ea714..8bb1f3895 100644 --- a/crates/bitwarden-api-api/src/models/sso_configuration_data.rs +++ b/crates/bitwarden-api-api/src/models/sso_configuration_data.rs @@ -8,15 +8,19 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SsoConfigurationData { #[serde(rename = "configType", skip_serializing_if = "Option::is_none")] - pub config_type: Option, + pub config_type: Option, #[serde( rename = "memberDecryptionType", skip_serializing_if = "Option::is_none" )] - pub member_decryption_type: Option, + pub member_decryption_type: Option, /// Legacy property to determine if KeyConnector was enabled. Kept for backwards compatibility /// with old configs that will not have the new /// Bit.Core.Auth.Models.Data.SsoConfigurationData.MemberDecryptionType when deserialized from @@ -37,7 +41,7 @@ pub struct SsoConfigurationData { #[serde(rename = "metadataAddress", skip_serializing_if = "Option::is_none")] pub metadata_address: Option, #[serde(rename = "redirectBehavior", skip_serializing_if = "Option::is_none")] - pub redirect_behavior: Option, + pub redirect_behavior: Option, #[serde( rename = "getClaimsFromUserInfoEndpoint", skip_serializing_if = "Option::is_none" @@ -82,7 +86,7 @@ pub struct SsoConfigurationData { #[serde(rename = "idpX509PublicCert", skip_serializing_if = "Option::is_none")] pub idp_x509_public_cert: Option, #[serde(rename = "idpBindingType", skip_serializing_if = "Option::is_none")] - pub idp_binding_type: Option, + pub idp_binding_type: Option, #[serde( rename = "idpAllowUnsolicitedAuthnResponse", skip_serializing_if = "Option::is_none" @@ -111,14 +115,14 @@ pub struct SsoConfigurationData { #[serde(rename = "spUniqueEntityId", skip_serializing_if = "Option::is_none")] pub sp_unique_entity_id: Option, #[serde(rename = "spNameIdFormat", skip_serializing_if = "Option::is_none")] - pub sp_name_id_format: Option, + pub sp_name_id_format: Option, #[serde( rename = "spOutboundSigningAlgorithm", skip_serializing_if = "Option::is_none" )] pub sp_outbound_signing_algorithm: Option, #[serde(rename = "spSigningBehavior", skip_serializing_if = "Option::is_none")] - pub sp_signing_behavior: Option, + pub sp_signing_behavior: Option, #[serde( rename = "spWantAssertionsSigned", skip_serializing_if = "Option::is_none" diff --git a/crates/bitwarden-api-api/src/models/sso_configuration_data_request.rs b/crates/bitwarden-api-api/src/models/sso_configuration_data_request.rs index 7b26413c8..b1f3392c2 100644 --- a/crates/bitwarden-api-api/src/models/sso_configuration_data_request.rs +++ b/crates/bitwarden-api-api/src/models/sso_configuration_data_request.rs @@ -8,15 +8,19 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SsoConfigurationDataRequest { #[serde(rename = "configType")] - pub config_type: crate::models::SsoType, + pub config_type: models::SsoType, #[serde( rename = "memberDecryptionType", skip_serializing_if = "Option::is_none" )] - pub member_decryption_type: Option, + pub member_decryption_type: Option, #[serde( rename = "keyConnectorEnabled", skip_serializing_if = "Option::is_none" @@ -33,7 +37,7 @@ pub struct SsoConfigurationDataRequest { #[serde(rename = "metadataAddress", skip_serializing_if = "Option::is_none")] pub metadata_address: Option, #[serde(rename = "redirectBehavior", skip_serializing_if = "Option::is_none")] - pub redirect_behavior: Option, + pub redirect_behavior: Option, #[serde( rename = "getClaimsFromUserInfoEndpoint", skip_serializing_if = "Option::is_none" @@ -66,14 +70,14 @@ pub struct SsoConfigurationDataRequest { #[serde(rename = "spUniqueEntityId", skip_serializing_if = "Option::is_none")] pub sp_unique_entity_id: Option, #[serde(rename = "spNameIdFormat", skip_serializing_if = "Option::is_none")] - pub sp_name_id_format: Option, + pub sp_name_id_format: Option, #[serde( rename = "spOutboundSigningAlgorithm", skip_serializing_if = "Option::is_none" )] pub sp_outbound_signing_algorithm: Option, #[serde(rename = "spSigningBehavior", skip_serializing_if = "Option::is_none")] - pub sp_signing_behavior: Option, + pub sp_signing_behavior: Option, #[serde( rename = "spWantAssertionsSigned", skip_serializing_if = "Option::is_none" @@ -92,7 +96,7 @@ pub struct SsoConfigurationDataRequest { #[serde(rename = "idpEntityId", skip_serializing_if = "Option::is_none")] pub idp_entity_id: Option, #[serde(rename = "idpBindingType", skip_serializing_if = "Option::is_none")] - pub idp_binding_type: Option, + pub idp_binding_type: Option, #[serde( rename = "idpSingleSignOnServiceUrl", skip_serializing_if = "Option::is_none" @@ -133,7 +137,7 @@ pub struct SsoConfigurationDataRequest { } impl SsoConfigurationDataRequest { - pub fn new(config_type: crate::models::SsoType) -> SsoConfigurationDataRequest { + pub fn new(config_type: models::SsoType) -> SsoConfigurationDataRequest { SsoConfigurationDataRequest { config_type, member_decryption_type: None, diff --git a/crates/bitwarden-api-api/src/models/sso_type.rs b/crates/bitwarden-api-api/src/models/sso_type.rs index 9ff337676..b7c4b3611 100644 --- a/crates/bitwarden-api-api/src/models/sso_type.rs +++ b/crates/bitwarden-api-api/src/models/sso_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum SsoType { OpenIdConnect = 1, Saml2 = 2, } -impl ToString for SsoType { - fn to_string(&self) -> String { +impl std::fmt::Display for SsoType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::OpenIdConnect => String::from("1"), - Self::Saml2 => String::from("2"), + Self::OpenIdConnect => write!(f, "1"), + Self::Saml2 => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-api/src/models/sso_urls.rs b/crates/bitwarden-api-api/src/models/sso_urls.rs index fa0b03cfb..e75495b76 100644 --- a/crates/bitwarden-api-api/src/models/sso_urls.rs +++ b/crates/bitwarden-api-api/src/models/sso_urls.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SsoUrls { #[serde(rename = "callbackPath", skip_serializing_if = "Option::is_none")] pub callback_path: Option, diff --git a/crates/bitwarden-api-api/src/models/storage_request_model.rs b/crates/bitwarden-api-api/src/models/storage_request_model.rs index 8d7778a73..a4c940357 100644 --- a/crates/bitwarden-api-api/src/models/storage_request_model.rs +++ b/crates/bitwarden-api-api/src/models/storage_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct StorageRequestModel { #[serde(rename = "storageGbAdjustment")] pub storage_gb_adjustment: i32, diff --git a/crates/bitwarden-api-api/src/models/subscription_cancellation_request_model.rs b/crates/bitwarden-api-api/src/models/subscription_cancellation_request_model.rs index b6948a3f2..cb0339991 100644 --- a/crates/bitwarden-api-api/src/models/subscription_cancellation_request_model.rs +++ b/crates/bitwarden-api-api/src/models/subscription_cancellation_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SubscriptionCancellationRequestModel { #[serde(rename = "reason", skip_serializing_if = "Option::is_none")] pub reason: Option, diff --git a/crates/bitwarden-api-api/src/models/subscription_response_model.rs b/crates/bitwarden-api-api/src/models/subscription_response_model.rs index a3d80dba3..7bb800d86 100644 --- a/crates/bitwarden-api-api/src/models/subscription_response_model.rs +++ b/crates/bitwarden-api-api/src/models/subscription_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SubscriptionResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -19,11 +23,11 @@ pub struct SubscriptionResponseModel { #[serde(rename = "maxStorageGb", skip_serializing_if = "Option::is_none")] pub max_storage_gb: Option, #[serde(rename = "upcomingInvoice", skip_serializing_if = "Option::is_none")] - pub upcoming_invoice: Option>, + pub upcoming_invoice: Option>, #[serde(rename = "subscription", skip_serializing_if = "Option::is_none")] - pub subscription: Option>, + pub subscription: Option>, #[serde(rename = "license", skip_serializing_if = "Option::is_none")] - pub license: Option>, + pub license: Option>, #[serde(rename = "expiration", skip_serializing_if = "Option::is_none")] pub expiration: Option, } diff --git a/crates/bitwarden-api-api/src/models/sync_response_model.rs b/crates/bitwarden-api-api/src/models/sync_response_model.rs index 757cecc14..238013b39 100644 --- a/crates/bitwarden-api-api/src/models/sync_response_model.rs +++ b/crates/bitwarden-api-api/src/models/sync_response_model.rs @@ -8,24 +8,28 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct SyncResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "profile", skip_serializing_if = "Option::is_none")] - pub profile: Option>, + pub profile: Option>, #[serde(rename = "folders", skip_serializing_if = "Option::is_none")] - pub folders: Option>, + pub folders: Option>, #[serde(rename = "collections", skip_serializing_if = "Option::is_none")] - pub collections: Option>, + pub collections: Option>, #[serde(rename = "ciphers", skip_serializing_if = "Option::is_none")] - pub ciphers: Option>, + pub ciphers: Option>, #[serde(rename = "domains", skip_serializing_if = "Option::is_none")] - pub domains: Option>, + pub domains: Option>, #[serde(rename = "policies", skip_serializing_if = "Option::is_none")] - pub policies: Option>, + pub policies: Option>, #[serde(rename = "sends", skip_serializing_if = "Option::is_none")] - pub sends: Option>, + pub sends: Option>, } impl SyncResponseModel { diff --git a/crates/bitwarden-api-api/src/models/tax_info_response_model.rs b/crates/bitwarden-api-api/src/models/tax_info_response_model.rs index e7825b67c..624f7192c 100644 --- a/crates/bitwarden-api-api/src/models/tax_info_response_model.rs +++ b/crates/bitwarden-api-api/src/models/tax_info_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TaxInfoResponseModel { #[serde(rename = "taxIdNumber", skip_serializing_if = "Option::is_none")] pub tax_id_number: Option, diff --git a/crates/bitwarden-api-api/src/models/tax_info_update_request_model.rs b/crates/bitwarden-api-api/src/models/tax_info_update_request_model.rs index 153fb27b0..99346d18c 100644 --- a/crates/bitwarden-api-api/src/models/tax_info_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/tax_info_update_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TaxInfoUpdateRequestModel { #[serde(rename = "country")] pub country: String, diff --git a/crates/bitwarden-api-api/src/models/tax_rate_response_model.rs b/crates/bitwarden-api-api/src/models/tax_rate_response_model.rs index 3980008c3..16f2eb27e 100644 --- a/crates/bitwarden-api-api/src/models/tax_rate_response_model.rs +++ b/crates/bitwarden-api-api/src/models/tax_rate_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TaxRateResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/tax_rate_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/tax_rate_response_model_list_response_model.rs index 496b713ff..8121be6b5 100644 --- a/crates/bitwarden-api-api/src/models/tax_rate_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/tax_rate_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TaxRateResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/transaction_type.rs b/crates/bitwarden-api-api/src/models/transaction_type.rs index 1bb69ccbb..dd9edb2bc 100644 --- a/crates/bitwarden-api-api/src/models/transaction_type.rs +++ b/crates/bitwarden-api-api/src/models/transaction_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum TransactionType { Charge = 0, @@ -21,14 +34,14 @@ pub enum TransactionType { Refund = 4, } -impl ToString for TransactionType { - fn to_string(&self) -> String { +impl std::fmt::Display for TransactionType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Charge => String::from("0"), - Self::Credit => String::from("1"), - Self::PromotionalCredit => String::from("2"), - Self::ReferralCredit => String::from("3"), - Self::Refund => String::from("4"), + Self::Charge => write!(f, "0"), + Self::Credit => write!(f, "1"), + Self::PromotionalCredit => write!(f, "2"), + Self::ReferralCredit => write!(f, "3"), + Self::Refund => write!(f, "4"), } } } diff --git a/crates/bitwarden-api-api/src/models/two_factor_authenticator_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_authenticator_response_model.rs index cf2707e15..bc4eaa339 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_authenticator_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_authenticator_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorAuthenticatorResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_duo_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_duo_response_model.rs index e0afc8212..c1afa6b1f 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_duo_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_duo_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorDuoResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_email_request_model.rs b/crates/bitwarden-api-api/src/models/two_factor_email_request_model.rs index 7d121412a..cd946e28b 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_email_request_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_email_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorEmailRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_email_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_email_response_model.rs index a976dba0f..cbeac40a8 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_email_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_email_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorEmailResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_provider_request_model.rs b/crates/bitwarden-api-api/src/models/two_factor_provider_request_model.rs index 7b22d2a6b..2d1cafeb0 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_provider_request_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_provider_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorProviderRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, @@ -22,11 +26,11 @@ pub struct TwoFactorProviderRequestModel { #[serde(rename = "secret", skip_serializing_if = "Option::is_none")] pub secret: Option, #[serde(rename = "type")] - pub r#type: crate::models::TwoFactorProviderType, + pub r#type: models::TwoFactorProviderType, } impl TwoFactorProviderRequestModel { - pub fn new(r#type: crate::models::TwoFactorProviderType) -> TwoFactorProviderRequestModel { + pub fn new(r#type: models::TwoFactorProviderType) -> TwoFactorProviderRequestModel { TwoFactorProviderRequestModel { master_password_hash: None, otp: None, diff --git a/crates/bitwarden-api-api/src/models/two_factor_provider_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_provider_response_model.rs index 0c97a3088..afeb14cf8 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_provider_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_provider_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorProviderResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] pub enabled: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, } impl TwoFactorProviderResponseModel { diff --git a/crates/bitwarden-api-api/src/models/two_factor_provider_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_provider_response_model_list_response_model.rs index 73a7b4d57..172f0502d 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_provider_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_provider_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorProviderResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/two_factor_provider_type.rs b/crates/bitwarden-api-api/src/models/two_factor_provider_type.rs index 94d20ee2a..11d34f8cb 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_provider_type.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_provider_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum TwoFactorProviderType { Authenticator = 0, @@ -24,17 +37,17 @@ pub enum TwoFactorProviderType { WebAuthn = 7, } -impl ToString for TwoFactorProviderType { - fn to_string(&self) -> String { +impl std::fmt::Display for TwoFactorProviderType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Authenticator => String::from("0"), - Self::Email => String::from("1"), - Self::Duo => String::from("2"), - Self::YubiKey => String::from("3"), - Self::U2f => String::from("4"), - Self::Remember => String::from("5"), - Self::OrganizationDuo => String::from("6"), - Self::WebAuthn => String::from("7"), + Self::Authenticator => write!(f, "0"), + Self::Email => write!(f, "1"), + Self::Duo => write!(f, "2"), + Self::YubiKey => write!(f, "3"), + Self::U2f => write!(f, "4"), + Self::Remember => write!(f, "5"), + Self::OrganizationDuo => write!(f, "6"), + Self::WebAuthn => write!(f, "7"), } } } diff --git a/crates/bitwarden-api-api/src/models/two_factor_recover_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_recover_response_model.rs index c35ce8a17..5f3cdafa8 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_recover_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_recover_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorRecoverResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_recovery_request_model.rs b/crates/bitwarden-api-api/src/models/two_factor_recovery_request_model.rs index 425d528b3..f8c13fe1f 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_recovery_request_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_recovery_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorRecoveryRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_web_authn_delete_request_model.rs b/crates/bitwarden-api-api/src/models/two_factor_web_authn_delete_request_model.rs index e981d0e5d..b0ca0fdb4 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_web_authn_delete_request_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_web_authn_delete_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorWebAuthnDeleteRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/two_factor_web_authn_request_model.rs b/crates/bitwarden-api-api/src/models/two_factor_web_authn_request_model.rs index 2139ad022..32429e737 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_web_authn_request_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_web_authn_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorWebAuthnRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, @@ -24,7 +28,7 @@ pub struct TwoFactorWebAuthnRequestModel { #[serde(rename = "id")] pub id: i32, #[serde(rename = "deviceResponse")] - pub device_response: Box, + pub device_response: Box, #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, } @@ -32,7 +36,7 @@ pub struct TwoFactorWebAuthnRequestModel { impl TwoFactorWebAuthnRequestModel { pub fn new( id: i32, - device_response: crate::models::AuthenticatorAttestationRawResponse, + device_response: models::AuthenticatorAttestationRawResponse, ) -> TwoFactorWebAuthnRequestModel { TwoFactorWebAuthnRequestModel { master_password_hash: None, diff --git a/crates/bitwarden-api-api/src/models/two_factor_web_authn_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_web_authn_response_model.rs index c372f2f45..db083572f 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_web_authn_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_web_authn_response_model.rs @@ -8,14 +8,18 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorWebAuthnResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "enabled", skip_serializing_if = "Option::is_none")] pub enabled: Option, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, } impl TwoFactorWebAuthnResponseModel { diff --git a/crates/bitwarden-api-api/src/models/two_factor_yubi_key_response_model.rs b/crates/bitwarden-api-api/src/models/two_factor_yubi_key_response_model.rs index f2122d29a..673e6f3cf 100644 --- a/crates/bitwarden-api-api/src/models/two_factor_yubi_key_response_model.rs +++ b/crates/bitwarden-api-api/src/models/two_factor_yubi_key_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TwoFactorYubiKeyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/update_avatar_request_model.rs b/crates/bitwarden-api-api/src/models/update_avatar_request_model.rs index ea648983e..d0f982247 100644 --- a/crates/bitwarden-api-api/src/models/update_avatar_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_avatar_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateAvatarRequestModel { #[serde(rename = "avatarColor", skip_serializing_if = "Option::is_none")] pub avatar_color: Option, diff --git a/crates/bitwarden-api-api/src/models/update_client_organization_request_body.rs b/crates/bitwarden-api-api/src/models/update_client_organization_request_body.rs index 5cf5d29dc..993d2240e 100644 --- a/crates/bitwarden-api-api/src/models/update_client_organization_request_body.rs +++ b/crates/bitwarden-api-api/src/models/update_client_organization_request_body.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateClientOrganizationRequestBody { #[serde(rename = "assignedSeats")] pub assigned_seats: i32, diff --git a/crates/bitwarden-api-api/src/models/update_devices_trust_request_model.rs b/crates/bitwarden-api-api/src/models/update_devices_trust_request_model.rs index ab69cf249..2b7aff81e 100644 --- a/crates/bitwarden-api-api/src/models/update_devices_trust_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_devices_trust_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateDevicesTrustRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, @@ -22,14 +26,14 @@ pub struct UpdateDevicesTrustRequestModel { #[serde(rename = "secret", skip_serializing_if = "Option::is_none")] pub secret: Option, #[serde(rename = "currentDevice")] - pub current_device: Box, + pub current_device: Box, #[serde(rename = "otherDevices", skip_serializing_if = "Option::is_none")] - pub other_devices: Option>, + pub other_devices: Option>, } impl UpdateDevicesTrustRequestModel { pub fn new( - current_device: crate::models::DeviceKeysUpdateRequestModel, + current_device: models::DeviceKeysUpdateRequestModel, ) -> UpdateDevicesTrustRequestModel { UpdateDevicesTrustRequestModel { master_password_hash: None, diff --git a/crates/bitwarden-api-api/src/models/update_domains_request_model.rs b/crates/bitwarden-api-api/src/models/update_domains_request_model.rs index 7bf75cb8a..c0c1f017d 100644 --- a/crates/bitwarden-api-api/src/models/update_domains_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_domains_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateDomainsRequestModel { #[serde(rename = "equivalentDomains", skip_serializing_if = "Option::is_none")] pub equivalent_domains: Option>>, @@ -16,7 +20,7 @@ pub struct UpdateDomainsRequestModel { rename = "excludedGlobalEquivalentDomains", skip_serializing_if = "Option::is_none" )] - pub excluded_global_equivalent_domains: Option>, + pub excluded_global_equivalent_domains: Option>, } impl UpdateDomainsRequestModel { diff --git a/crates/bitwarden-api-api/src/models/update_key_request_model.rs b/crates/bitwarden-api-api/src/models/update_key_request_model.rs index c6b298251..e721fbecb 100644 --- a/crates/bitwarden-api-api/src/models/update_key_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_key_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateKeyRequestModel { #[serde(rename = "masterPasswordHash")] pub master_password_hash: String, @@ -17,18 +21,18 @@ pub struct UpdateKeyRequestModel { #[serde(rename = "privateKey")] pub private_key: String, #[serde(rename = "ciphers", skip_serializing_if = "Option::is_none")] - pub ciphers: Option>, + pub ciphers: Option>, #[serde(rename = "folders", skip_serializing_if = "Option::is_none")] - pub folders: Option>, + pub folders: Option>, #[serde(rename = "sends", skip_serializing_if = "Option::is_none")] - pub sends: Option>, + pub sends: Option>, #[serde( rename = "emergencyAccessKeys", skip_serializing_if = "Option::is_none" )] - pub emergency_access_keys: Option>, + pub emergency_access_keys: Option>, #[serde(rename = "resetPasswordKeys", skip_serializing_if = "Option::is_none")] - pub reset_password_keys: Option>, + pub reset_password_keys: Option>, } impl UpdateKeyRequestModel { diff --git a/crates/bitwarden-api-api/src/models/update_profile_request_model.rs b/crates/bitwarden-api-api/src/models/update_profile_request_model.rs index deb6a9d9e..858cd7fb4 100644 --- a/crates/bitwarden-api-api/src/models/update_profile_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_profile_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateProfileRequestModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, diff --git a/crates/bitwarden-api-api/src/models/update_temp_password_request_model.rs b/crates/bitwarden-api-api/src/models/update_temp_password_request_model.rs index 40eebaab9..f7d8fa2ee 100644 --- a/crates/bitwarden-api-api/src/models/update_temp_password_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_temp_password_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateTempPasswordRequestModel { #[serde(rename = "newMasterPasswordHash")] pub new_master_password_hash: String, diff --git a/crates/bitwarden-api-api/src/models/update_two_factor_authenticator_request_model.rs b/crates/bitwarden-api-api/src/models/update_two_factor_authenticator_request_model.rs index 245993415..af4d177b5 100644 --- a/crates/bitwarden-api-api/src/models/update_two_factor_authenticator_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_two_factor_authenticator_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateTwoFactorAuthenticatorRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/update_two_factor_duo_request_model.rs b/crates/bitwarden-api-api/src/models/update_two_factor_duo_request_model.rs index 55a168af3..61bf2c446 100644 --- a/crates/bitwarden-api-api/src/models/update_two_factor_duo_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_two_factor_duo_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateTwoFactorDuoRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/update_two_factor_email_request_model.rs b/crates/bitwarden-api-api/src/models/update_two_factor_email_request_model.rs index 1dc4f190c..2296248a6 100644 --- a/crates/bitwarden-api-api/src/models/update_two_factor_email_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_two_factor_email_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateTwoFactorEmailRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/update_two_factor_yubico_otp_request_model.rs b/crates/bitwarden-api-api/src/models/update_two_factor_yubico_otp_request_model.rs index 19c5e37ba..c3be61dd1 100644 --- a/crates/bitwarden-api-api/src/models/update_two_factor_yubico_otp_request_model.rs +++ b/crates/bitwarden-api-api/src/models/update_two_factor_yubico_otp_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UpdateTwoFactorYubicoOtpRequestModel { #[serde(rename = "masterPasswordHash", skip_serializing_if = "Option::is_none")] pub master_password_hash: Option, diff --git a/crates/bitwarden-api-api/src/models/uri_match_type.rs b/crates/bitwarden-api-api/src/models/uri_match_type.rs index 6ccf82edb..221f110c9 100644 --- a/crates/bitwarden-api-api/src/models/uri_match_type.rs +++ b/crates/bitwarden-api-api/src/models/uri_match_type.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum UriMatchType { Domain = 0, @@ -22,15 +35,15 @@ pub enum UriMatchType { Never = 5, } -impl ToString for UriMatchType { - fn to_string(&self) -> String { +impl std::fmt::Display for UriMatchType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Domain => String::from("0"), - Self::Host => String::from("1"), - Self::StartsWith => String::from("2"), - Self::Exact => String::from("3"), - Self::RegularExpression => String::from("4"), - Self::Never => String::from("5"), + Self::Domain => write!(f, "0"), + Self::Host => write!(f, "1"), + Self::StartsWith => write!(f, "2"), + Self::Exact => write!(f, "3"), + Self::RegularExpression => write!(f, "4"), + Self::Never => write!(f, "5"), } } } diff --git a/crates/bitwarden-api-api/src/models/user.rs b/crates/bitwarden-api-api/src/models/user.rs index 470a2837f..7d387288a 100644 --- a/crates/bitwarden-api-api/src/models/user.rs +++ b/crates/bitwarden-api-api/src/models/user.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct User { #[serde(rename = "email", skip_serializing_if = "Option::is_none")] pub email: Option, diff --git a/crates/bitwarden-api-api/src/models/user_key_response_model.rs b/crates/bitwarden-api-api/src/models/user_key_response_model.rs index bb70b620d..cb06e2277 100644 --- a/crates/bitwarden-api-api/src/models/user_key_response_model.rs +++ b/crates/bitwarden-api-api/src/models/user_key_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UserKeyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/user_license.rs b/crates/bitwarden-api-api/src/models/user_license.rs index 508222fb7..1b2c21704 100644 --- a/crates/bitwarden-api-api/src/models/user_license.rs +++ b/crates/bitwarden-api-api/src/models/user_license.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UserLicense { #[serde(rename = "licenseKey", skip_serializing_if = "Option::is_none")] pub license_key: Option, @@ -33,7 +37,7 @@ pub struct UserLicense { #[serde(rename = "trial", skip_serializing_if = "Option::is_none")] pub trial: Option, #[serde(rename = "licenseType", skip_serializing_if = "Option::is_none")] - pub license_type: Option, + pub license_type: Option, #[serde(rename = "hash", skip_serializing_if = "Option::is_none")] pub hash: Option, #[serde(rename = "signature", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-api/src/models/user_project_access_policy_response_model.rs b/crates/bitwarden-api-api/src/models/user_project_access_policy_response_model.rs index 280657ec1..c06deebde 100644 --- a/crates/bitwarden-api-api/src/models/user_project_access_policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/user_project_access_policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UserProjectAccessPolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/user_service_account_access_policy_response_model.rs b/crates/bitwarden-api-api/src/models/user_service_account_access_policy_response_model.rs index a69bb2a7c..1eaf94cda 100644 --- a/crates/bitwarden-api-api/src/models/user_service_account_access_policy_response_model.rs +++ b/crates/bitwarden-api-api/src/models/user_service_account_access_policy_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct UserServiceAccountAccessPolicyResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-api/src/models/user_verification_requirement.rs b/crates/bitwarden-api-api/src/models/user_verification_requirement.rs index 647b1f9b9..684add6c4 100644 --- a/crates/bitwarden-api-api/src/models/user_verification_requirement.rs +++ b/crates/bitwarden-api-api/src/models/user_verification_requirement.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UserVerificationRequirement { @@ -19,12 +23,12 @@ pub enum UserVerificationRequirement { Discouraged, } -impl ToString for UserVerificationRequirement { - fn to_string(&self) -> String { +impl std::fmt::Display for UserVerificationRequirement { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Required => String::from("required"), - Self::Preferred => String::from("preferred"), - Self::Discouraged => String::from("discouraged"), + Self::Required => write!(f, "required"), + Self::Preferred => write!(f, "preferred"), + Self::Discouraged => write!(f, "discouraged"), } } } diff --git a/crates/bitwarden-api-api/src/models/verify_delete_recover_request_model.rs b/crates/bitwarden-api-api/src/models/verify_delete_recover_request_model.rs index 0ad0e127c..9bdaa3aae 100644 --- a/crates/bitwarden-api-api/src/models/verify_delete_recover_request_model.rs +++ b/crates/bitwarden-api-api/src/models/verify_delete_recover_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct VerifyDeleteRecoverRequestModel { #[serde(rename = "userId")] pub user_id: String, diff --git a/crates/bitwarden-api-api/src/models/verify_email_request_model.rs b/crates/bitwarden-api-api/src/models/verify_email_request_model.rs index 74304bcca..b5876bf9c 100644 --- a/crates/bitwarden-api-api/src/models/verify_email_request_model.rs +++ b/crates/bitwarden-api-api/src/models/verify_email_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct VerifyEmailRequestModel { #[serde(rename = "userId")] pub user_id: String, diff --git a/crates/bitwarden-api-api/src/models/verify_otp_request_model.rs b/crates/bitwarden-api-api/src/models/verify_otp_request_model.rs index 6c9be6992..f0ed5b3c5 100644 --- a/crates/bitwarden-api-api/src/models/verify_otp_request_model.rs +++ b/crates/bitwarden-api-api/src/models/verify_otp_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct VerifyOtpRequestModel { #[serde(rename = "otp")] pub otp: String, diff --git a/crates/bitwarden-api-api/src/models/web_authn_credential_create_options_response_model.rs b/crates/bitwarden-api-api/src/models/web_authn_credential_create_options_response_model.rs index f13024a6f..1af9af90f 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_credential_create_options_response_model.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_credential_create_options_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnCredentialCreateOptionsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "options", skip_serializing_if = "Option::is_none")] - pub options: Option>, + pub options: Option>, #[serde(rename = "token", skip_serializing_if = "Option::is_none")] pub token: Option, } diff --git a/crates/bitwarden-api-api/src/models/web_authn_credential_response_model.rs b/crates/bitwarden-api-api/src/models/web_authn_credential_response_model.rs index 852b3a527..56534214f 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_credential_response_model.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_credential_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnCredentialResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, @@ -17,7 +21,7 @@ pub struct WebAuthnCredentialResponseModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "prfStatus", skip_serializing_if = "Option::is_none")] - pub prf_status: Option, + pub prf_status: Option, } impl WebAuthnCredentialResponseModel { diff --git a/crates/bitwarden-api-api/src/models/web_authn_credential_response_model_list_response_model.rs b/crates/bitwarden-api-api/src/models/web_authn_credential_response_model_list_response_model.rs index b0072c62f..f03412c89 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_credential_response_model_list_response_model.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_credential_response_model_list_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnCredentialResponseModelListResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "data", skip_serializing_if = "Option::is_none")] - pub data: Option>, + pub data: Option>, #[serde(rename = "continuationToken", skip_serializing_if = "Option::is_none")] pub continuation_token: Option, } diff --git a/crates/bitwarden-api-api/src/models/web_authn_login_assertion_options_response_model.rs b/crates/bitwarden-api-api/src/models/web_authn_login_assertion_options_response_model.rs index 27ed6afc4..0007add9a 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_login_assertion_options_response_model.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_login_assertion_options_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnLoginAssertionOptionsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "options", skip_serializing_if = "Option::is_none")] - pub options: Option>, + pub options: Option>, #[serde(rename = "token", skip_serializing_if = "Option::is_none")] pub token: Option, } diff --git a/crates/bitwarden-api-api/src/models/web_authn_login_credential_create_request_model.rs b/crates/bitwarden-api-api/src/models/web_authn_login_credential_create_request_model.rs index f5565655a..d37ee18c3 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_login_credential_create_request_model.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_login_credential_create_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnLoginCredentialCreateRequestModel { #[serde(rename = "deviceResponse")] - pub device_response: Box, + pub device_response: Box, #[serde(rename = "name")] pub name: String, #[serde(rename = "token")] @@ -31,7 +35,7 @@ pub struct WebAuthnLoginCredentialCreateRequestModel { impl WebAuthnLoginCredentialCreateRequestModel { pub fn new( - device_response: crate::models::AuthenticatorAttestationRawResponse, + device_response: models::AuthenticatorAttestationRawResponse, name: String, token: String, supports_prf: bool, diff --git a/crates/bitwarden-api-api/src/models/web_authn_login_credential_update_request_model.rs b/crates/bitwarden-api-api/src/models/web_authn_login_credential_update_request_model.rs index ce12d0c43..a03e3b6af 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_login_credential_update_request_model.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_login_credential_update_request_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnLoginCredentialUpdateRequestModel { #[serde(rename = "deviceResponse")] - pub device_response: Box, + pub device_response: Box, #[serde(rename = "token")] pub token: String, #[serde(rename = "encryptedUserKey")] @@ -24,7 +28,7 @@ pub struct WebAuthnLoginCredentialUpdateRequestModel { impl WebAuthnLoginCredentialUpdateRequestModel { pub fn new( - device_response: crate::models::AuthenticatorAssertionRawResponse, + device_response: models::AuthenticatorAssertionRawResponse, token: String, encrypted_user_key: String, encrypted_public_key: String, diff --git a/crates/bitwarden-api-api/src/models/web_authn_prf_status.rs b/crates/bitwarden-api-api/src/models/web_authn_prf_status.rs index 074c402dc..e6607fd61 100644 --- a/crates/bitwarden-api-api/src/models/web_authn_prf_status.rs +++ b/crates/bitwarden-api-api/src/models/web_authn_prf_status.rs @@ -8,10 +8,23 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum WebAuthnPrfStatus { Enabled = 0, @@ -19,12 +32,12 @@ pub enum WebAuthnPrfStatus { Unsupported = 2, } -impl ToString for WebAuthnPrfStatus { - fn to_string(&self) -> String { +impl std::fmt::Display for WebAuthnPrfStatus { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Enabled => String::from("0"), - Self::Supported => String::from("1"), - Self::Unsupported => String::from("2"), + Self::Enabled => write!(f, "0"), + Self::Supported => write!(f, "1"), + Self::Unsupported => write!(f, "2"), } } } diff --git a/crates/bitwarden-api-identity/.openapi-generator/VERSION b/crates/bitwarden-api-identity/.openapi-generator/VERSION index 4b49d9bb6..93c8ddab9 100644 --- a/crates/bitwarden-api-identity/.openapi-generator/VERSION +++ b/crates/bitwarden-api-identity/.openapi-generator/VERSION @@ -1 +1 @@ -7.2.0 \ No newline at end of file +7.6.0 diff --git a/crates/bitwarden-api-identity/Cargo.toml b/crates/bitwarden-api-identity/Cargo.toml index 74d96d144..00ceada04 100644 --- a/crates/bitwarden-api-identity/Cargo.toml +++ b/crates/bitwarden-api-identity/Cargo.toml @@ -1,8 +1,6 @@ [package] name = "bitwarden-api-identity" -description = """ -Api bindings for the Bitwarden Identity API. -""" +description = "Api bindings for the Bitwarden Identity API." categories = ["api-bindings"] version.workspace = true @@ -15,15 +13,10 @@ license-file.workspace = true keywords.workspace = true [dependencies] -serde = ">=1.0.163, <2" -serde_derive = ">=1.0.163, <2" +serde = { version = ">=1.0.163, <2", features = ["derive"] } +serde_with = { version = ">=3.8, <4", default-features = false, features = ["base64", "std", "macros"] } serde_json = ">=1.0.96, <2" serde_repr = ">=0.1.12, <0.2" -url = ">=2.3.1, <3" -uuid = { version = ">=1.3.3, <2", features = ["serde"] } -[dependencies.reqwest] -version = ">=0.12, <0.13" -features = ["http2", "json", "multipart"] -default-features = false - -[dev-dependencies] +url = ">=2.5, <3" +uuid = { version = ">=1.3.3, <2", features = ["serde", "v4"] } +reqwest = { version = ">=0.12, <0.13", features = ["json", "multipart", "http2"], default-features = false } diff --git a/crates/bitwarden-api-identity/README.md b/crates/bitwarden-api-identity/README.md index e35d031c0..16339f7a9 100644 --- a/crates/bitwarden-api-identity/README.md +++ b/crates/bitwarden-api-identity/README.md @@ -10,7 +10,8 @@ using the [openapi-spec](https://openapis.org) from a remote server, you can eas client. - API version: v1 -- Package version: 1.0.0 +- Package version: 0.5.0 +- Generator version: 7.6.0 - Build package: `org.openapitools.codegen.languages.RustClientCodegen` ## Installation diff --git a/crates/bitwarden-api-identity/src/apis/accounts_api.rs b/crates/bitwarden-api-identity/src/apis/accounts_api.rs index c7b0bd1fd..420326cfc 100644 --- a/crates/bitwarden-api-identity/src/apis/accounts_api.rs +++ b/crates/bitwarden-api-identity/src/apis/accounts_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`accounts_prelogin_post`] #[derive(Debug, Clone, Serialize, Deserialize)] @@ -36,8 +37,8 @@ pub enum AccountsWebauthnAssertionOptionsGetError { pub async fn accounts_prelogin_post( configuration: &configuration::Configuration, - prelogin_request_model: Option, -) -> Result> { + prelogin_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -74,8 +75,8 @@ pub async fn accounts_prelogin_post( pub async fn accounts_register_post( configuration: &configuration::Configuration, - register_request_model: Option, -) -> Result> { + register_request_model: Option, +) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -113,7 +114,7 @@ pub async fn accounts_register_post( pub async fn accounts_webauthn_assertion_options_get( configuration: &configuration::Configuration, ) -> Result< - crate::models::WebAuthnLoginAssertionOptionsResponseModel, + models::WebAuthnLoginAssertionOptionsResponseModel, Error, > { let local_var_configuration = configuration; diff --git a/crates/bitwarden-api-identity/src/apis/info_api.rs b/crates/bitwarden-api-identity/src/apis/info_api.rs index 3519a111c..89951e5e5 100644 --- a/crates/bitwarden-api-identity/src/apis/info_api.rs +++ b/crates/bitwarden-api-identity/src/apis/info_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`alive_get`] #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/crates/bitwarden-api-identity/src/apis/sso_api.rs b/crates/bitwarden-api-identity/src/apis/sso_api.rs index e0f73008c..4ad81b061 100644 --- a/crates/bitwarden-api-identity/src/apis/sso_api.rs +++ b/crates/bitwarden-api-identity/src/apis/sso_api.rs @@ -9,9 +9,10 @@ */ use reqwest; +use serde::{Deserialize, Serialize}; use super::{configuration, Error}; -use crate::apis::ResponseContent; +use crate::{apis::ResponseContent, models}; /// struct for typed errors of method [`sso_external_callback_get`] #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/crates/bitwarden-api-identity/src/lib.rs b/crates/bitwarden-api-identity/src/lib.rs index 73fa05abe..3cf407d12 100644 --- a/crates/bitwarden-api-identity/src/lib.rs +++ b/crates/bitwarden-api-identity/src/lib.rs @@ -1,10 +1,9 @@ -#![allow(warnings)] -#![allow(clippy::all)] - -#[macro_use] -extern crate serde_derive; -#[macro_use] -extern crate serde_repr; +#![allow(unused_imports, unused_variables, unused_mut, non_camel_case_types)] +#![allow( + clippy::too_many_arguments, + clippy::empty_docs, + clippy::to_string_in_format_args +)] extern crate reqwest; extern crate serde; diff --git a/crates/bitwarden-api-identity/src/models/assertion_options.rs b/crates/bitwarden-api-identity/src/models/assertion_options.rs index f69580f77..ef32e2311 100644 --- a/crates/bitwarden-api-identity/src/models/assertion_options.rs +++ b/crates/bitwarden-api-identity/src/models/assertion_options.rs @@ -8,24 +8,31 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AssertionOptions { #[serde(rename = "status", skip_serializing_if = "Option::is_none")] pub status: Option, #[serde(rename = "errorMessage", skip_serializing_if = "Option::is_none")] pub error_message: Option, + #[serde_as(as = "Option")] #[serde(rename = "challenge", skip_serializing_if = "Option::is_none")] - pub challenge: Option, + pub challenge: Option>, #[serde(rename = "timeout", skip_serializing_if = "Option::is_none")] pub timeout: Option, #[serde(rename = "rpId", skip_serializing_if = "Option::is_none")] pub rp_id: Option, #[serde(rename = "allowCredentials", skip_serializing_if = "Option::is_none")] - pub allow_credentials: Option>, + pub allow_credentials: Option>, #[serde(rename = "userVerification", skip_serializing_if = "Option::is_none")] - pub user_verification: Option, + pub user_verification: Option, #[serde(rename = "extensions", skip_serializing_if = "Option::is_none")] - pub extensions: Option>, + pub extensions: Option>, } impl AssertionOptions { diff --git a/crates/bitwarden-api-identity/src/models/authentication_extensions_client_inputs.rs b/crates/bitwarden-api-identity/src/models/authentication_extensions_client_inputs.rs index 2677278cc..4f500b87d 100644 --- a/crates/bitwarden-api-identity/src/models/authentication_extensions_client_inputs.rs +++ b/crates/bitwarden-api-identity/src/models/authentication_extensions_client_inputs.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct AuthenticationExtensionsClientInputs { #[serde(rename = "example.extension", skip_serializing_if = "Option::is_none")] pub example_period_extension: Option, diff --git a/crates/bitwarden-api-identity/src/models/authenticator_transport.rs b/crates/bitwarden-api-identity/src/models/authenticator_transport.rs index bd3881305..cedc74f75 100644 --- a/crates/bitwarden-api-identity/src/models/authenticator_transport.rs +++ b/crates/bitwarden-api-identity/src/models/authenticator_transport.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum AuthenticatorTransport { @@ -21,13 +25,13 @@ pub enum AuthenticatorTransport { Internal, } -impl ToString for AuthenticatorTransport { - fn to_string(&self) -> String { +impl std::fmt::Display for AuthenticatorTransport { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Usb => String::from("usb"), - Self::Nfc => String::from("nfc"), - Self::Ble => String::from("ble"), - Self::Internal => String::from("internal"), + Self::Usb => write!(f, "usb"), + Self::Nfc => write!(f, "nfc"), + Self::Ble => write!(f, "ble"), + Self::Internal => write!(f, "internal"), } } } diff --git a/crates/bitwarden-api-identity/src/models/kdf_type.rs b/crates/bitwarden-api-identity/src/models/kdf_type.rs index 733fba272..fd49d689d 100644 --- a/crates/bitwarden-api-identity/src/models/kdf_type.rs +++ b/crates/bitwarden-api-identity/src/models/kdf_type.rs @@ -8,21 +8,34 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[repr(i64)] #[derive( - Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr, + Clone, + Copy, + Debug, + Eq, + PartialEq, + Ord, + PartialOrd, + Hash, + serde_repr::Serialize_repr, + serde_repr::Deserialize_repr, )] pub enum KdfType { PBKDF2_SHA256 = 0, Argon2id = 1, } -impl ToString for KdfType { - fn to_string(&self) -> String { +impl std::fmt::Display for KdfType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::PBKDF2_SHA256 => String::from("0"), - Self::Argon2id => String::from("1"), + Self::PBKDF2_SHA256 => write!(f, "0"), + Self::Argon2id => write!(f, "1"), } } } diff --git a/crates/bitwarden-api-identity/src/models/keys_request_model.rs b/crates/bitwarden-api-identity/src/models/keys_request_model.rs index 579c08aed..bb76c371b 100644 --- a/crates/bitwarden-api-identity/src/models/keys_request_model.rs +++ b/crates/bitwarden-api-identity/src/models/keys_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct KeysRequestModel { #[serde(rename = "publicKey", skip_serializing_if = "Option::is_none")] pub public_key: Option, diff --git a/crates/bitwarden-api-identity/src/models/prelogin_request_model.rs b/crates/bitwarden-api-identity/src/models/prelogin_request_model.rs index eb845142b..d01d636ac 100644 --- a/crates/bitwarden-api-identity/src/models/prelogin_request_model.rs +++ b/crates/bitwarden-api-identity/src/models/prelogin_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PreloginRequestModel { #[serde(rename = "email")] pub email: String, diff --git a/crates/bitwarden-api-identity/src/models/prelogin_response_model.rs b/crates/bitwarden-api-identity/src/models/prelogin_response_model.rs index a8935137d..5a5df9cbd 100644 --- a/crates/bitwarden-api-identity/src/models/prelogin_response_model.rs +++ b/crates/bitwarden-api-identity/src/models/prelogin_response_model.rs @@ -8,10 +8,14 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PreloginResponseModel { #[serde(rename = "kdf", skip_serializing_if = "Option::is_none")] - pub kdf: Option, + pub kdf: Option, #[serde(rename = "kdfIterations", skip_serializing_if = "Option::is_none")] pub kdf_iterations: Option, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] diff --git a/crates/bitwarden-api-identity/src/models/public_key_credential_descriptor.rs b/crates/bitwarden-api-identity/src/models/public_key_credential_descriptor.rs index 67a4750ca..1a49a1610 100644 --- a/crates/bitwarden-api-identity/src/models/public_key_credential_descriptor.rs +++ b/crates/bitwarden-api-identity/src/models/public_key_credential_descriptor.rs @@ -8,14 +8,21 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; +use serde_with::serde_as; + +use crate::models; + +#[serde_as] +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PublicKeyCredentialDescriptor { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] - pub r#type: Option, + pub r#type: Option, + #[serde_as(as = "Option")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")] - pub id: Option, + pub id: Option>, #[serde(rename = "transports", skip_serializing_if = "Option::is_none")] - pub transports: Option>, + pub transports: Option>, } impl PublicKeyCredentialDescriptor { diff --git a/crates/bitwarden-api-identity/src/models/public_key_credential_type.rs b/crates/bitwarden-api-identity/src/models/public_key_credential_type.rs index 85027f09e..63312b6a5 100644 --- a/crates/bitwarden-api-identity/src/models/public_key_credential_type.rs +++ b/crates/bitwarden-api-identity/src/models/public_key_credential_type.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum PublicKeyCredentialType { @@ -15,10 +19,10 @@ pub enum PublicKeyCredentialType { PublicKey, } -impl ToString for PublicKeyCredentialType { - fn to_string(&self) -> String { +impl std::fmt::Display for PublicKeyCredentialType { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::PublicKey => String::from("public-key"), + Self::PublicKey => write!(f, "public-key"), } } } diff --git a/crates/bitwarden-api-identity/src/models/register_request_model.rs b/crates/bitwarden-api-identity/src/models/register_request_model.rs index 6034235a8..27e6babe9 100644 --- a/crates/bitwarden-api-identity/src/models/register_request_model.rs +++ b/crates/bitwarden-api-identity/src/models/register_request_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RegisterRequestModel { #[serde(rename = "name", skip_serializing_if = "Option::is_none")] pub name: Option, @@ -23,13 +27,13 @@ pub struct RegisterRequestModel { #[serde(rename = "key", skip_serializing_if = "Option::is_none")] pub key: Option, #[serde(rename = "keys", skip_serializing_if = "Option::is_none")] - pub keys: Option>, + pub keys: Option>, #[serde(rename = "token", skip_serializing_if = "Option::is_none")] pub token: Option, #[serde(rename = "organizationUserId", skip_serializing_if = "Option::is_none")] pub organization_user_id: Option, #[serde(rename = "kdf", skip_serializing_if = "Option::is_none")] - pub kdf: Option, + pub kdf: Option, #[serde(rename = "kdfIterations", skip_serializing_if = "Option::is_none")] pub kdf_iterations: Option, #[serde(rename = "kdfMemory", skip_serializing_if = "Option::is_none")] @@ -37,7 +41,7 @@ pub struct RegisterRequestModel { #[serde(rename = "kdfParallelism", skip_serializing_if = "Option::is_none")] pub kdf_parallelism: Option, #[serde(rename = "referenceData", skip_serializing_if = "Option::is_none")] - pub reference_data: Option<::std::collections::HashMap>, + pub reference_data: Option>, } impl RegisterRequestModel { diff --git a/crates/bitwarden-api-identity/src/models/register_response_model.rs b/crates/bitwarden-api-identity/src/models/register_response_model.rs index d2dbf37be..0f294a03b 100644 --- a/crates/bitwarden-api-identity/src/models/register_response_model.rs +++ b/crates/bitwarden-api-identity/src/models/register_response_model.rs @@ -8,7 +8,11 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RegisterResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, diff --git a/crates/bitwarden-api-identity/src/models/user_verification_requirement.rs b/crates/bitwarden-api-identity/src/models/user_verification_requirement.rs index ca0ddadb0..d66a0ffde 100644 --- a/crates/bitwarden-api-identity/src/models/user_verification_requirement.rs +++ b/crates/bitwarden-api-identity/src/models/user_verification_requirement.rs @@ -8,6 +8,10 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + +use crate::models; + /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] pub enum UserVerificationRequirement { @@ -19,12 +23,12 @@ pub enum UserVerificationRequirement { Discouraged, } -impl ToString for UserVerificationRequirement { - fn to_string(&self) -> String { +impl std::fmt::Display for UserVerificationRequirement { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - Self::Required => String::from("required"), - Self::Preferred => String::from("preferred"), - Self::Discouraged => String::from("discouraged"), + Self::Required => write!(f, "required"), + Self::Preferred => write!(f, "preferred"), + Self::Discouraged => write!(f, "discouraged"), } } } diff --git a/crates/bitwarden-api-identity/src/models/web_authn_login_assertion_options_response_model.rs b/crates/bitwarden-api-identity/src/models/web_authn_login_assertion_options_response_model.rs index 199b12111..3655701ba 100644 --- a/crates/bitwarden-api-identity/src/models/web_authn_login_assertion_options_response_model.rs +++ b/crates/bitwarden-api-identity/src/models/web_authn_login_assertion_options_response_model.rs @@ -8,12 +8,16 @@ * Generated by: https://openapi-generator.tech */ -#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +use serde::{Deserialize, Serialize}; + +use crate::models; + +#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct WebAuthnLoginAssertionOptionsResponseModel { #[serde(rename = "object", skip_serializing_if = "Option::is_none")] pub object: Option, #[serde(rename = "options", skip_serializing_if = "Option::is_none")] - pub options: Option>, + pub options: Option>, #[serde(rename = "token", skip_serializing_if = "Option::is_none")] pub token: Option, }