Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/bitwarden-api-api/.openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ src/apis/secrets_manager_events_api.rs
src/apis/secrets_manager_porting_api.rs
src/apis/security_task_api.rs
src/apis/self_hosted_account_billing_api.rs
src/apis/self_hosted_billing_api.rs
src/apis/self_hosted_organization_licenses_api.rs
src/apis/self_hosted_organization_sponsorships_api.rs
src/apis/sends_api.rs
Expand Down
6 changes: 4 additions & 2 deletions crates/bitwarden-api-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ client.
- API version: latest
- Package version: 1.0.0
- Server Git commit:
[`1274fe656234f06507f9af73927fa9ff7982438b`](https://github.com/bitwarden/server/commit/1274fe656234f06507f9af73927fa9ff7982438b)
[`8a67aafbe5e01a738b479ebb82185fbc947866f8`](https://github.com/bitwarden/server/commit/8a67aafbe5e01a738b479ebb82185fbc947866f8)
- Generator version: 7.15.0
- Build package: `org.openapitools.codegen.languages.RustClientCodegen`

Expand Down Expand Up @@ -302,6 +302,7 @@ All URIs are relative to *https://api.bitwarden.com*
| _OrganizationSponsorshipsApi_ | [**sync**](docs/OrganizationSponsorshipsApi.md#organization_sponsorships_sync) | **POST** /organization/sponsorship/sync |
| _OrganizationUsersApi_ | [**accept**](docs/OrganizationUsersApi.md#organization_users_accept) | **POST** /organizations/{orgId}/users/{organizationUserId}/accept |
| _OrganizationUsersApi_ | [**accept_init**](docs/OrganizationUsersApi.md#organization_users_accept_init) | **POST** /organizations/{orgId}/users/{organizationUserId}/accept-init |
| _OrganizationUsersApi_ | [**automatically_confirm_organization_user**](docs/OrganizationUsersApi.md#organization_users_automatically_confirm_organization_user) | **POST** /organizations/{orgId}/users/{id}/auto-confirm |
| _OrganizationUsersApi_ | [**bulk_confirm**](docs/OrganizationUsersApi.md#organization_users_bulk_confirm) | **POST** /organizations/{orgId}/users/confirm |
| _OrganizationUsersApi_ | [**bulk_delete_account**](docs/OrganizationUsersApi.md#organization_users_bulk_delete_account) | **DELETE** /organizations/{orgId}/users/delete-account |
| _OrganizationUsersApi_ | [**bulk_enable_secrets_manager**](docs/OrganizationUsersApi.md#organization_users_bulk_enable_secrets_manager) | **PUT** /organizations/{orgId}/users/enable-secrets-manager |
Expand Down Expand Up @@ -351,7 +352,7 @@ All URIs are relative to *https://api.bitwarden.com*
| _OrganizationsApi_ | [**post_subscribe_secrets_manager**](docs/OrganizationsApi.md#organizations_post_subscribe_secrets_manager) | **POST** /organizations/{id}/subscribe-secrets-manager |
| _OrganizationsApi_ | [**post_subscription**](docs/OrganizationsApi.md#organizations_post_subscription) | **POST** /organizations/{id}/subscription |
| _OrganizationsApi_ | [**post_upgrade**](docs/OrganizationsApi.md#organizations_post_upgrade) | **POST** /organizations/{id}/upgrade |
| _OrganizationsApi_ | [**put**](docs/OrganizationsApi.md#organizations_put) | **PUT** /organizations/{id} |
| _OrganizationsApi_ | [**put**](docs/OrganizationsApi.md#organizations_put) | **PUT** /organizations/{organizationId} |
| _OrganizationsApi_ | [**put_collection_management**](docs/OrganizationsApi.md#organizations_put_collection_management) | **PUT** /organizations/{id}/collection-management |
| _OrganizationsApi_ | [**put_tax_info**](docs/OrganizationsApi.md#organizations_put_tax_info) | **PUT** /organizations/{id}/tax |
| _OrganizationsApi_ | [**rotate_api_key**](docs/OrganizationsApi.md#organizations_rotate_api_key) | **POST** /organizations/{id}/rotate-api-key |
Expand Down Expand Up @@ -438,6 +439,7 @@ All URIs are relative to *https://api.bitwarden.com*
| _SecurityTaskApi_ | [**get_task_metrics_for_organization**](docs/SecurityTaskApi.md#security_task_get_task_metrics_for_organization) | **GET** /tasks/{organizationId}/metrics | Retrieves security task metrics for an organization. |
| _SecurityTaskApi_ | [**list_for_organization**](docs/SecurityTaskApi.md#security_task_list_for_organization) | **GET** /tasks/organization | Retrieves security tasks for an organization. Restricted to organization administrators. |
| _SelfHostedAccountBillingApi_ | [**upload_license**](docs/SelfHostedAccountBillingApi.md#self_hosted_account_billing_upload_license) | **POST** /account/billing/vnext/self-host/license |
| _SelfHostedBillingApi_ | [**get_metadata**](docs/SelfHostedBillingApi.md#self_hosted_billing_get_metadata) | **GET** /organizations/{organizationId}/billing/vnext/self-host/metadata |
| _SelfHostedOrganizationLicensesApi_ | [**create_license**](docs/SelfHostedOrganizationLicensesApi.md#self_hosted_organization_licenses_create_license) | **POST** /organizations/licenses/self-hosted |
| _SelfHostedOrganizationLicensesApi_ | [**sync_license**](docs/SelfHostedOrganizationLicensesApi.md#self_hosted_organization_licenses_sync_license) | **POST** /organizations/licenses/self-hosted/{id}/sync |
| _SelfHostedOrganizationLicensesApi_ | [**update_license**](docs/SelfHostedOrganizationLicensesApi.md#self_hosted_organization_licenses_update_license) | **POST** /organizations/licenses/self-hosted/{id} |
Expand Down
12 changes: 12 additions & 0 deletions crates/bitwarden-api-api/src/apis/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ pub mod secrets_manager_events_api;
pub mod secrets_manager_porting_api;
pub mod security_task_api;
pub mod self_hosted_account_billing_api;
pub mod self_hosted_billing_api;
pub mod self_hosted_organization_licenses_api;
pub mod self_hosted_organization_sponsorships_api;
pub mod sends_api;
Expand Down Expand Up @@ -247,6 +248,7 @@ struct ApiClientReal {
security_task_api: security_task_api::SecurityTaskApiClient,
self_hosted_account_billing_api:
self_hosted_account_billing_api::SelfHostedAccountBillingApiClient,
self_hosted_billing_api: self_hosted_billing_api::SelfHostedBillingApiClient,
self_hosted_organization_licenses_api:
self_hosted_organization_licenses_api::SelfHostedOrganizationLicensesApiClient,
self_hosted_organization_sponsorships_api:
Expand Down Expand Up @@ -324,6 +326,7 @@ pub struct ApiClientMock {
pub security_task_api: security_task_api::MockSecurityTaskApi,
pub self_hosted_account_billing_api:
self_hosted_account_billing_api::MockSelfHostedAccountBillingApi,
pub self_hosted_billing_api: self_hosted_billing_api::MockSelfHostedBillingApi,
pub self_hosted_organization_licenses_api:
self_hosted_organization_licenses_api::MockSelfHostedOrganizationLicensesApi,
pub self_hosted_organization_sponsorships_api:
Expand Down Expand Up @@ -397,6 +400,7 @@ impl ApiClient {
secrets_manager_porting_api: secrets_manager_porting_api::SecretsManagerPortingApiClient::new(configuration.clone()),
security_task_api: security_task_api::SecurityTaskApiClient::new(configuration.clone()),
self_hosted_account_billing_api: self_hosted_account_billing_api::SelfHostedAccountBillingApiClient::new(configuration.clone()),
self_hosted_billing_api: self_hosted_billing_api::SelfHostedBillingApiClient::new(configuration.clone()),
self_hosted_organization_licenses_api: self_hosted_organization_licenses_api::SelfHostedOrganizationLicensesApiClient::new(configuration.clone()),
self_hosted_organization_sponsorships_api: self_hosted_organization_sponsorships_api::SelfHostedOrganizationSponsorshipsApiClient::new(configuration.clone()),
sends_api: sends_api::SendsApiClient::new(configuration.clone()),
Expand Down Expand Up @@ -469,6 +473,7 @@ impl ApiClient {
secrets_manager_porting_api: secrets_manager_porting_api::MockSecretsManagerPortingApi::new(),
security_task_api: security_task_api::MockSecurityTaskApi::new(),
self_hosted_account_billing_api: self_hosted_account_billing_api::MockSelfHostedAccountBillingApi::new(),
self_hosted_billing_api: self_hosted_billing_api::MockSelfHostedBillingApi::new(),
self_hosted_organization_licenses_api: self_hosted_organization_licenses_api::MockSelfHostedOrganizationLicensesApi::new(),
self_hosted_organization_sponsorships_api: self_hosted_organization_sponsorships_api::MockSelfHostedOrganizationSponsorshipsApi::new(),
sends_api: sends_api::MockSendsApi::new(),
Expand Down Expand Up @@ -885,6 +890,13 @@ impl ApiClient {
ApiClient::Mock(mock) => &mock.self_hosted_account_billing_api,
}
}
pub fn self_hosted_billing_api(&self) -> &dyn self_hosted_billing_api::SelfHostedBillingApi {
match self {
ApiClient::Real(real) => &real.self_hosted_billing_api,
#[cfg(feature = "mockall")]
ApiClient::Mock(mock) => &mock.self_hosted_billing_api,
}
}
pub fn self_hosted_organization_licenses_api(
&self,
) -> &dyn self_hosted_organization_licenses_api::SelfHostedOrganizationLicensesApi {
Expand Down
68 changes: 68 additions & 0 deletions crates/bitwarden-api-api/src/apis/organization_users_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ pub trait OrganizationUsersApi: Send + Sync {
>,
) -> Result<(), Error<AcceptInitError>>;

/// POST /organizations/{orgId}/users/{id}/auto-confirm
async fn automatically_confirm_organization_user<'a>(
&self,
org_id: uuid::Uuid,
id: uuid::Uuid,
organization_user_confirm_request_model: Option<
models::OrganizationUserConfirmRequestModel,
>,
) -> Result<(), Error<AutomaticallyConfirmOrganizationUserError>>;

/// POST /organizations/{orgId}/users/confirm
async fn bulk_confirm<'a>(
&self,
Expand Down Expand Up @@ -346,6 +356,57 @@ impl OrganizationUsersApi for OrganizationUsersApiClient {
}
}

async fn automatically_confirm_organization_user<'a>(
&self,
org_id: uuid::Uuid,
id: uuid::Uuid,
organization_user_confirm_request_model: Option<
models::OrganizationUserConfirmRequestModel,
>,
) -> Result<(), Error<AutomaticallyConfirmOrganizationUserError>> {
let local_var_configuration = &self.configuration;

let local_var_client = &local_var_configuration.client;

let local_var_uri_str = format!(
"{}/organizations/{orgId}/users/{id}/auto-confirm",
local_var_configuration.base_path,
orgId = org_id,
id = id
);
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(&organization_user_confirm_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() {
Ok(())
} else {
let local_var_entity: Option<AutomaticallyConfirmOrganizationUserError> =
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))
}
}

async fn bulk_confirm<'a>(
&self,
org_id: uuid::Uuid,
Expand Down Expand Up @@ -1683,6 +1744,13 @@ pub enum AcceptError {
pub enum AcceptInitError {
UnknownValue(serde_json::Value),
}
/// struct for typed errors of method
/// [`OrganizationUsersApi::automatically_confirm_organization_user`]
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(untagged)]
pub enum AutomaticallyConfirmOrganizationUserError {
UnknownValue(serde_json::Value),
}
/// struct for typed errors of method [`OrganizationUsersApi::bulk_confirm`]
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(untagged)]
Expand Down
34 changes: 8 additions & 26 deletions crates/bitwarden-api-api/src/apis/organizations_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@ pub trait OrganizationsApi: Send + Sync {
organization_upgrade_request_model: Option<models::OrganizationUpgradeRequestModel>,
) -> Result<models::PaymentResponseModel, Error<PostUpgradeError>>;

/// PUT /organizations/{id}
/// PUT /organizations/{organizationId}
async fn put<'a>(
&self,
id: &'a str,
organization_id: uuid::Uuid,
organization_update_request_model: Option<models::OrganizationUpdateRequestModel>,
) -> Result<models::OrganizationResponseModel, Error<PutError>>;
) -> Result<(), Error<PutError>>;

/// PUT /organizations/{id}/collection-management
async fn put_collection_management<'a>(
Expand Down Expand Up @@ -1796,17 +1796,17 @@ impl OrganizationsApi for OrganizationsApiClient {

async fn put<'a>(
&self,
id: &'a str,
organization_id: uuid::Uuid,
organization_update_request_model: Option<models::OrganizationUpdateRequestModel>,
) -> Result<models::OrganizationResponseModel, Error<PutError>> {
) -> Result<(), Error<PutError>> {
let local_var_configuration = &self.configuration;

let local_var_client = &local_var_configuration.client;

let local_var_uri_str = format!(
"{}/organizations/{id}",
"{}/organizations/{organizationId}",
local_var_configuration.base_path,
id = crate::apis::urlencode(id)
organizationId = organization_id
);
let mut local_var_req_builder =
local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str());
Expand All @@ -1824,28 +1824,10 @@ impl OrganizationsApi for OrganizationsApiClient {
let local_var_resp = local_var_client.execute(local_var_req).await?;

let local_var_status = local_var_resp.status();
let local_var_content_type = local_var_resp
.headers()
.get("content-type")
.and_then(|v| v.to_str().ok())
.unwrap_or("application/octet-stream");
let local_var_content_type = super::ContentType::from(local_var_content_type);
let local_var_content = local_var_resp.text().await?;

if !local_var_status.is_client_error() && !local_var_status.is_server_error() {
match local_var_content_type {
ContentType::Json => serde_json::from_str(&local_var_content).map_err(Error::from),
ContentType::Text => {
return Err(Error::from(serde_json::Error::custom(
"Received `text/plain` content type response that cannot be converted to `models::OrganizationResponseModel`",
)));
}
ContentType::Unsupported(local_var_unknown_type) => {
return Err(Error::from(serde_json::Error::custom(format!(
"Received `{local_var_unknown_type}` content type response that cannot be converted to `models::OrganizationResponseModel`"
))));
}
}
Ok(())
} else {
let local_var_entity: Option<PutError> = serde_json::from_str(&local_var_content).ok();
let local_var_error = ResponseContent {
Expand Down
Loading
Loading