Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions crates/bitwarden-api-api/.openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ src/models/password_manager_update_selections.rs
src/models/password_request_model.rs
src/models/payment_method_type.rs
src/models/payment_response_model.rs
src/models/pending_annual_upgrade_response_model.rs
src/models/pending_auth_request.rs
src/models/pending_auth_request_response_model.rs
src/models/pending_auth_request_response_model_list_response_model.rs
Expand Down Expand Up @@ -551,6 +552,7 @@ src/models/service_account_secrets_details_response_model_list_response_model.rs
src/models/service_account_update_request_model.rs
src/models/set_initial_password_request_model.rs
src/models/set_key_connector_key_request_model.rs
src/models/set_user_key_id_request_model.rs
src/models/set_verify_devices_request_model.rs
src/models/setup_business_unit_request_body.rs
src/models/signature_key_pair_request_model.rs
Expand Down
9 changes: 7 additions & 2 deletions crates/bitwarden-api-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ client.
- API version: latest
- Package version: 3.0.0
- Server Git commit:
[`5fb52be87ba94df49b5d53caf53907f72bf1cc4c`](https://github.com/bitwarden/server/commit/5fb52be87ba94df49b5d53caf53907f72bf1cc4c)
[`e19a9bbc8ab6507a6c66a66f27d3a861825822bc`](https://github.com/bitwarden/server/commit/e19a9bbc8ab6507a6c66a66f27d3a861825822bc)
- Generator version: 7.15.0
- Build package: `org.openapitools.codegen.languages.RustClientCodegen`

Expand Down Expand Up @@ -111,6 +111,7 @@ All URIs are relative to *https://api.bitwarden.com*
| _AccountsKeyManagementApi_ | [**post_convert_to_key_connector**](docs/AccountsKeyManagementApi.md#accounts_key_management_post_convert_to_key_connector) | **POST** /accounts/convert-to-key-connector |
| _AccountsKeyManagementApi_ | [**post_enroll_to_key_connector**](docs/AccountsKeyManagementApi.md#accounts_key_management_post_enroll_to_key_connector) | **POST** /accounts/key-connector/enroll |
| _AccountsKeyManagementApi_ | [**post_set_key_connector_key**](docs/AccountsKeyManagementApi.md#accounts_key_management_post_set_key_connector_key) | **POST** /accounts/set-key-connector-key |
| _AccountsKeyManagementApi_ | [**post_user_key_id**](docs/AccountsKeyManagementApi.md#accounts_key_management_post_user_key_id) | **POST** /accounts/key-management/user-key-id | Reports the key id of the caller's current user key to the server. |
| _AccountsKeyManagementApi_ | [**regenerate_keys**](docs/AccountsKeyManagementApi.md#accounts_key_management_regenerate_keys) | **POST** /accounts/key-management/regenerate-keys |
| _AccountsKeyManagementApi_ | [**rotate_user_keys**](docs/AccountsKeyManagementApi.md#accounts_key_management_rotate_user_keys) | **POST** /accounts/key-management/rotate-user-keys |
| _AuthRequestsApi_ | [**get**](docs/AuthRequestsApi.md#auth_requests_get) | **GET** /auth-requests/{id} |
Expand Down Expand Up @@ -246,7 +247,6 @@ All URIs are relative to *https://api.bitwarden.com*
| _ImportCiphersApi_ | [**post_import**](docs/ImportCiphersApi.md#import_ciphers_post_import) | **POST** /ciphers/import |
| _ImportCiphersApi_ | [**post_import_organization**](docs/ImportCiphersApi.md#import_ciphers_post_import_organization) | **POST** /ciphers/import-organization |
| _InfoApi_ | [**get_alive**](docs/InfoApi.md#info_get_alive) | **GET** /alive |
| _InfoApi_ | [**get_version**](docs/InfoApi.md#info_get_version) | **GET** /version |
| _InstallationsApi_ | [**get**](docs/InstallationsApi.md#installations_get) | **GET** /installations/{id} |
| _InstallationsApi_ | [**post**](docs/InstallationsApi.md#installations_post) | **POST** /installations |
| _LeasesApi_ | [**extend**](docs/LeasesApi.md#pam_leases_extend) | **POST** /leases/{id}/extend |
Expand All @@ -270,12 +270,14 @@ All URIs are relative to *https://api.bitwarden.com*
| _OrganizationBillingApi_ | [**get_transactions**](docs/OrganizationBillingApi.md#organization_billing_get_transactions) | **GET** /organizations/{organizationId}/billing/transactions |
| _OrganizationBillingApi_ | [**setup_business_unit**](docs/OrganizationBillingApi.md#organization_billing_setup_business_unit) | **POST** /organizations/{organizationId}/billing/setup-business-unit |
| _OrganizationBillingVNextApi_ | [**add_credit_via_bit_pay**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_add_credit_via_bit_pay) | **POST** /organizations/{organizationId}/billing/vnext/credit/bitpay |
| _OrganizationBillingVNextApi_ | [**get_annual_upgrade_offer**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_annual_upgrade_offer) | **GET** /organizations/{organizationId}/billing/vnext/annual-upgrade-offer |
| _OrganizationBillingVNextApi_ | [**get_billing_address**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_billing_address) | **GET** /organizations/{organizationId}/billing/vnext/address |
| _OrganizationBillingVNextApi_ | [**get_churn_mitigation_offer**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_churn_mitigation_offer) | **GET** /organizations/{organizationId}/billing/vnext/churn-mitigation-offer |
| _OrganizationBillingVNextApi_ | [**get_credit**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_credit) | **GET** /organizations/{organizationId}/billing/vnext/credit |
| _OrganizationBillingVNextApi_ | [**get_metadata**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_metadata) | **GET** /organizations/{organizationId}/billing/vnext/metadata |
| _OrganizationBillingVNextApi_ | [**get_payment_method**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_payment_method) | **GET** /organizations/{organizationId}/billing/vnext/payment-method |
| _OrganizationBillingVNextApi_ | [**get_warnings**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_get_warnings) | **GET** /organizations/{organizationId}/billing/vnext/warnings |
| _OrganizationBillingVNextApi_ | [**redeem_annual_upgrade_offer**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_redeem_annual_upgrade_offer) | **POST** /organizations/{organizationId}/billing/vnext/annual-upgrade-offer/redeem |
| _OrganizationBillingVNextApi_ | [**redeem_churn_mitigation_offer**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_redeem_churn_mitigation_offer) | **POST** /organizations/{organizationId}/billing/vnext/churn-mitigation-offer/redeem |
| _OrganizationBillingVNextApi_ | [**restart_subscription**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_restart_subscription) | **POST** /organizations/{organizationId}/billing/vnext/subscription/restart |
| _OrganizationBillingVNextApi_ | [**update_billing_address**](docs/OrganizationBillingVNextApi.md#organization_billing_v_next_update_billing_address) | **PUT** /organizations/{organizationId}/billing/vnext/address |
Expand Down Expand Up @@ -340,6 +342,7 @@ All URIs are relative to *https://api.bitwarden.com*
| _OrganizationUsersApi_ | [**bulk_automatically_confirm_organization_users**](docs/OrganizationUsersApi.md#organization_users_bulk_automatically_confirm_organization_users) | **POST** /organizations/{orgId}/users/bulk-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_pam**](docs/OrganizationUsersApi.md#organization_users_bulk_enable_pam) | **PUT** /organizations/{orgId}/users/enable-pam | Grants PAM access to the specified members. A plain field write: PAM has no seats, so there is no autoscale or billing step. Members who already have access are skipped. |
| _OrganizationUsersApi_ | [**bulk_enable_secrets_manager**](docs/OrganizationUsersApi.md#organization_users_bulk_enable_secrets_manager) | **PUT** /organizations/{orgId}/users/enable-secrets-manager |
| _OrganizationUsersApi_ | [**bulk_reinvite**](docs/OrganizationUsersApi.md#organization_users_bulk_reinvite) | **POST** /organizations/{orgId}/users/reinvite |
| _OrganizationUsersApi_ | [**bulk_remove**](docs/OrganizationUsersApi.md#organization_users_bulk_remove) | **DELETE** /organizations/{orgId}/users |
Expand Down Expand Up @@ -884,6 +887,7 @@ All URIs are relative to *https://api.bitwarden.com*
- [PasswordRequestModel](docs/PasswordRequestModel.md)
- [PaymentMethodType](docs/PaymentMethodType.md)
- [PaymentResponseModel](docs/PaymentResponseModel.md)
- [PendingAnnualUpgradeResponseModel](docs/PendingAnnualUpgradeResponseModel.md)
- [PendingAuthRequest](docs/PendingAuthRequest.md)
- [PendingAuthRequestResponseModel](docs/PendingAuthRequestResponseModel.md)
- [PendingAuthRequestResponseModelListResponseModel](docs/PendingAuthRequestResponseModelListResponseModel.md)
Expand Down Expand Up @@ -1036,6 +1040,7 @@ All URIs are relative to *https://api.bitwarden.com*
- [ServiceAccountUpdateRequestModel](docs/ServiceAccountUpdateRequestModel.md)
- [SetInitialPasswordRequestModel](docs/SetInitialPasswordRequestModel.md)
- [SetKeyConnectorKeyRequestModel](docs/SetKeyConnectorKeyRequestModel.md)
- [SetUserKeyIdRequestModel](docs/SetUserKeyIdRequestModel.md)
- [SetVerifyDevicesRequestModel](docs/SetVerifyDevicesRequestModel.md)
- [SetupBusinessUnitRequestBody](docs/SetupBusinessUnitRequestBody.md)
- [SignatureKeyPairRequestModel](docs/SignatureKeyPairRequestModel.md)
Expand Down
31 changes: 31 additions & 0 deletions crates/bitwarden-api-api/src/apis/accounts_key_management_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ pub trait AccountsKeyManagementApi: Send + Sync {
set_key_connector_key_request_model: Option<models::SetKeyConnectorKeyRequestModel>,
) -> Result<(), Error>;

/// POST /accounts/key-management/user-key-id
/// This is meant for backfilling the user-key id for existing users for whom the key id is not
/// yet recorded.
async fn post_user_key_id<'a>(
&self,
set_user_key_id_request_model: Option<models::SetUserKeyIdRequestModel>,
) -> Result<(), Error>;

/// POST /accounts/key-management/regenerate-keys
async fn regenerate_keys<'a>(
&self,
Expand Down Expand Up @@ -205,6 +213,29 @@ impl AccountsKeyManagementApi for AccountsKeyManagementApiClient {
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
}

/// This is meant for backfilling the user-key id for existing users for whom the key id is not
/// yet recorded.
async fn post_user_key_id<'a>(
&self,
set_user_key_id_request_model: Option<models::SetUserKeyIdRequestModel>,
) -> Result<(), Error> {
let local_var_configuration = &self.configuration;

let local_var_client = &local_var_configuration.client;

let local_var_uri_str = format!(
"{}/accounts/key-management/user-key-id",
local_var_configuration.base_path
);
let mut local_var_req_builder =
local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str());

local_var_req_builder = local_var_req_builder.with_extension(AuthRequired::Bearer);
local_var_req_builder = local_var_req_builder.json(&set_user_key_id_request_model);

bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
}

async fn regenerate_keys<'a>(
&self,
key_regeneration_request_model: Option<models::KeyRegenerationRequestModel>,
Expand Down
17 changes: 0 additions & 17 deletions crates/bitwarden-api-api/src/apis/info_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ use crate::{
pub trait InfoApi: Send + Sync {
/// GET /alive
async fn get_alive(&self) -> Result<String, Error>;

/// GET /version
async fn get_version(&self) -> Result<(), Error>;
}

pub struct InfoApiClient {
Expand Down Expand Up @@ -59,18 +56,4 @@ impl InfoApi for InfoApiClient {

bitwarden_api_base::process_with_json_response(local_var_req_builder).await
}

async fn get_version(&self) -> Result<(), Error> {
let local_var_configuration = &self.configuration;

let local_var_client = &local_var_configuration.client;

let local_var_uri_str = format!("{}/version", local_var_configuration.base_path);
let mut local_var_req_builder =
local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str());

local_var_req_builder = local_var_req_builder.with_extension(AuthRequired::Bearer);

bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
}
}
Loading
Loading