Skip to content

Commit 8f9cd18

Browse files
bw-ghapp[bot]bw-ghapp[bot]
committed
Update API bindings to 408002d1b6e6c6b6aee907c1dc2f6b56abd6adf9
1 parent 378df4c commit 8f9cd18

12 files changed

Lines changed: 145 additions & 65 deletions

‎crates/bitwarden-api-api/.openapi-generator/FILES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ src/apis/two_factor_api.rs
6969
src/apis/users_api.rs
7070
src/apis/web_authn_api.rs
7171
src/lib.rs
72+
src/models/accept_organization_invite_link_request_model.rs
7273
src/models/access_policy_request.rs
7374
src/models/access_token_create_request_model.rs
7475
src/models/access_token_creation_response_model.rs

‎crates/bitwarden-api-api/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ client.
2222
- API version: latest
2323
- Package version: 3.0.0
2424
- Server Git commit:
25-
[`87eeba2134f4b2f1a82db1c800aa58508da03b43`](https://github.com/bitwarden/server/commit/87eeba2134f4b2f1a82db1c800aa58508da03b43)
25+
[`408002d1b6e6c6b6aee907c1dc2f6b56abd6adf9`](https://github.com/bitwarden/server/commit/408002d1b6e6c6b6aee907c1dc2f6b56abd6adf9)
2626
- Generator version: 7.15.0
2727
- Build package: `org.openapitools.codegen.languages.RustClientCodegen`
2828

@@ -313,6 +313,7 @@ All URIs are relative to *https://api.bitwarden.com*
313313
| _OrganizationSponsorshipsApi_ | [**sync**](docs/OrganizationSponsorshipsApi.md#organization_sponsorships_sync) | **POST** /organization/sponsorship/sync |
314314
| _OrganizationUsersApi_ | [**accept**](docs/OrganizationUsersApi.md#organization_users_accept) | **POST** /organizations/{orgId}/users/{organizationUserId}/accept |
315315
| _OrganizationUsersApi_ | [**accept_init**](docs/OrganizationUsersApi.md#organization_users_accept_init) | **POST** /organizations/{orgId}/users/{organizationUserId}/accept-init |
316+
| _OrganizationUsersApi_ | [**accept_invite_link**](docs/OrganizationUsersApi.md#organization_users_accept_invite_link) | **POST** /organizations/users/invite-link/accept |
316317
| _OrganizationUsersApi_ | [**automatically_confirm_organization_user**](docs/OrganizationUsersApi.md#organization_users_automatically_confirm_organization_user) | **POST** /organizations/{orgId}/users/{id}/auto-confirm |
317318
| _OrganizationUsersApi_ | [**bulk_automatically_confirm_organization_users**](docs/OrganizationUsersApi.md#organization_users_bulk_automatically_confirm_organization_users) | **POST** /organizations/{orgId}/users/bulk-auto-confirm |
318319
| _OrganizationUsersApi_ | [**bulk_confirm**](docs/OrganizationUsersApi.md#organization_users_bulk_confirm) | **POST** /organizations/{orgId}/users/confirm |
@@ -332,9 +333,8 @@ All URIs are relative to *https://api.bitwarden.com*
332333
| _OrganizationUsersApi_ | [**get_reset_password_details**](docs/OrganizationUsersApi.md#organization_users_get_reset_password_details) | **GET** /organizations/{orgId}/users/{id}/reset-password-details |
333334
| _OrganizationUsersApi_ | [**invite**](docs/OrganizationUsersApi.md#organization_users_invite) | **POST** /organizations/{orgId}/users/invite |
334335
| _OrganizationUsersApi_ | [**put**](docs/OrganizationUsersApi.md#organization_users_put) | **PUT** /organizations/{orgId}/users/{id} |
335-
| _OrganizationUsersApi_ | [**put_recover_account**](docs/OrganizationUsersApi.md#organization_users_put_recover_account) | **PUT** /organizations/{orgId}/users/{id}/recover-account |
336-
| _OrganizationUsersApi_ | [**put_reset_password**](docs/OrganizationUsersApi.md#organization_users_put_reset_password) | **PUT** /organizations/{orgId}/users/{id}/reset-password | Backward compat alias — remove after clients migrate to recover-account. |
337336
| _OrganizationUsersApi_ | [**put_reset_password_enrollment**](docs/OrganizationUsersApi.md#organization_users_put_reset_password_enrollment) | **PUT** /organizations/{orgId}/users/{userId}/reset-password-enrollment |
337+
| _OrganizationUsersApi_ | [**recover_account**](docs/OrganizationUsersApi.md#organization_users_recover_account) | **PUT** /organizations/{orgId}/users/{id}/recover-account |
338338
| _OrganizationUsersApi_ | [**reinvite**](docs/OrganizationUsersApi.md#organization_users_reinvite) | **POST** /organizations/{orgId}/users/{id}/reinvite |
339339
| _OrganizationUsersApi_ | [**remove**](docs/OrganizationUsersApi.md#organization_users_remove) | **DELETE** /organizations/{orgId}/users/{id} |
340340
| _OrganizationUsersApi_ | [**restore_async_v_next**](docs/OrganizationUsersApi.md#organization_users_restore_async_v_next) | **PUT** /organizations/{orgId}/users/{id}/restore/vnext |
@@ -532,6 +532,7 @@ All URIs are relative to *https://api.bitwarden.com*
532532

533533
## Documentation For Models
534534

535+
- [AcceptOrganizationInviteLinkRequestModel](docs/AcceptOrganizationInviteLinkRequestModel.md)
535536
- [AccessPolicyRequest](docs/AccessPolicyRequest.md)
536537
- [AccessTokenCreateRequestModel](docs/AccessTokenCreateRequestModel.md)
537538
- [AccessTokenCreationResponseModel](docs/AccessTokenCreationResponseModel.md)

‎crates/bitwarden-api-api/src/apis/organization_users_api.rs‎

Lines changed: 48 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ pub trait OrganizationUsersApi: Send + Sync {
4444
>,
4545
) -> Result<(), Error>;
4646

47+
/// POST /organizations/users/invite-link/accept
48+
async fn accept_invite_link<'a>(
49+
&self,
50+
accept_organization_invite_link_request_model: Option<
51+
models::AcceptOrganizationInviteLinkRequestModel,
52+
>,
53+
) -> Result<(), Error>;
54+
4755
/// POST /organizations/{orgId}/users/{id}/auto-confirm
4856
async fn automatically_confirm_organization_user<'a>(
4957
&self,
@@ -186,19 +194,18 @@ pub trait OrganizationUsersApi: Send + Sync {
186194
organization_user_update_request_model: Option<models::OrganizationUserUpdateRequestModel>,
187195
) -> Result<(), Error>;
188196

189-
/// PUT /organizations/{orgId}/users/{id}/recover-account
190-
async fn put_recover_account<'a>(
197+
/// PUT /organizations/{orgId}/users/{userId}/reset-password-enrollment
198+
async fn put_reset_password_enrollment<'a>(
191199
&self,
192200
org_id: uuid::Uuid,
193-
id: uuid::Uuid,
194-
target_organization_user: Option<models::OrganizationUser>,
195-
organization_user_reset_password_request_model: Option<
196-
models::OrganizationUserResetPasswordRequestModel,
201+
user_id: uuid::Uuid,
202+
organization_user_reset_password_enrollment_request_model: Option<
203+
models::OrganizationUserResetPasswordEnrollmentRequestModel,
197204
>,
198205
) -> Result<(), Error>;
199206

200-
/// PUT /organizations/{orgId}/users/{id}/reset-password
201-
async fn put_reset_password<'a>(
207+
/// PUT /organizations/{orgId}/users/{id}/recover-account
208+
async fn recover_account<'a>(
202209
&self,
203210
org_id: uuid::Uuid,
204211
id: uuid::Uuid,
@@ -208,16 +215,6 @@ pub trait OrganizationUsersApi: Send + Sync {
208215
>,
209216
) -> Result<(), Error>;
210217

211-
/// PUT /organizations/{orgId}/users/{userId}/reset-password-enrollment
212-
async fn put_reset_password_enrollment<'a>(
213-
&self,
214-
org_id: uuid::Uuid,
215-
user_id: uuid::Uuid,
216-
organization_user_reset_password_enrollment_request_model: Option<
217-
models::OrganizationUserResetPasswordEnrollmentRequestModel,
218-
>,
219-
) -> Result<(), Error>;
220-
221218
/// POST /organizations/{orgId}/users/{id}/reinvite
222219
async fn reinvite<'a>(&self, org_id: uuid::Uuid, id: uuid::Uuid) -> Result<(), Error>;
223220

@@ -312,6 +309,30 @@ impl OrganizationUsersApi for OrganizationUsersApiClient {
312309
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
313310
}
314311

312+
async fn accept_invite_link<'a>(
313+
&self,
314+
accept_organization_invite_link_request_model: Option<
315+
models::AcceptOrganizationInviteLinkRequestModel,
316+
>,
317+
) -> Result<(), Error> {
318+
let local_var_configuration = &self.configuration;
319+
320+
let local_var_client = &local_var_configuration.client;
321+
322+
let local_var_uri_str = format!(
323+
"{}/organizations/users/invite-link/accept",
324+
local_var_configuration.base_path
325+
);
326+
let mut local_var_req_builder =
327+
local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str());
328+
329+
local_var_req_builder = local_var_req_builder.with_extension(AuthRequired::Bearer);
330+
local_var_req_builder =
331+
local_var_req_builder.json(&accept_organization_invite_link_request_model);
332+
333+
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
334+
}
335+
315336
async fn automatically_confirm_organization_user<'a>(
316337
&self,
317338
org_id: uuid::Uuid,
@@ -784,42 +805,35 @@ impl OrganizationUsersApi for OrganizationUsersApiClient {
784805
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
785806
}
786807

787-
async fn put_recover_account<'a>(
808+
async fn put_reset_password_enrollment<'a>(
788809
&self,
789810
org_id: uuid::Uuid,
790-
id: uuid::Uuid,
791-
target_organization_user: Option<models::OrganizationUser>,
792-
organization_user_reset_password_request_model: Option<
793-
models::OrganizationUserResetPasswordRequestModel,
811+
user_id: uuid::Uuid,
812+
organization_user_reset_password_enrollment_request_model: Option<
813+
models::OrganizationUserResetPasswordEnrollmentRequestModel,
794814
>,
795815
) -> Result<(), Error> {
796816
let local_var_configuration = &self.configuration;
797817

798818
let local_var_client = &local_var_configuration.client;
799819

800820
let local_var_uri_str = format!(
801-
"{}/organizations/{orgId}/users/{id}/recover-account",
821+
"{}/organizations/{orgId}/users/{userId}/reset-password-enrollment",
802822
local_var_configuration.base_path,
803823
orgId = org_id,
804-
id = id
824+
userId = user_id
805825
);
806826
let mut local_var_req_builder =
807827
local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str());
808828

809-
if let Some(ref param_value) = target_organization_user {
810-
local_var_req_builder = local_var_req_builder.query(&[(
811-
"targetOrganizationUser",
812-
&serde_json::to_value(param_value)?,
813-
)]);
814-
}
815829
local_var_req_builder = local_var_req_builder.with_extension(AuthRequired::Bearer);
816830
local_var_req_builder =
817-
local_var_req_builder.json(&organization_user_reset_password_request_model);
831+
local_var_req_builder.json(&organization_user_reset_password_enrollment_request_model);
818832

819833
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
820834
}
821835

822-
async fn put_reset_password<'a>(
836+
async fn recover_account<'a>(
823837
&self,
824838
org_id: uuid::Uuid,
825839
id: uuid::Uuid,
@@ -833,7 +847,7 @@ impl OrganizationUsersApi for OrganizationUsersApiClient {
833847
let local_var_client = &local_var_configuration.client;
834848

835849
let local_var_uri_str = format!(
836-
"{}/organizations/{orgId}/users/{id}/reset-password",
850+
"{}/organizations/{orgId}/users/{id}/recover-account",
837851
local_var_configuration.base_path,
838852
orgId = org_id,
839853
id = id
@@ -854,34 +868,6 @@ impl OrganizationUsersApi for OrganizationUsersApiClient {
854868
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
855869
}
856870

857-
async fn put_reset_password_enrollment<'a>(
858-
&self,
859-
org_id: uuid::Uuid,
860-
user_id: uuid::Uuid,
861-
organization_user_reset_password_enrollment_request_model: Option<
862-
models::OrganizationUserResetPasswordEnrollmentRequestModel,
863-
>,
864-
) -> Result<(), Error> {
865-
let local_var_configuration = &self.configuration;
866-
867-
let local_var_client = &local_var_configuration.client;
868-
869-
let local_var_uri_str = format!(
870-
"{}/organizations/{orgId}/users/{userId}/reset-password-enrollment",
871-
local_var_configuration.base_path,
872-
orgId = org_id,
873-
userId = user_id
874-
);
875-
let mut local_var_req_builder =
876-
local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str());
877-
878-
local_var_req_builder = local_var_req_builder.with_extension(AuthRequired::Bearer);
879-
local_var_req_builder =
880-
local_var_req_builder.json(&organization_user_reset_password_enrollment_request_model);
881-
882-
bitwarden_api_base::process_with_empty_response(local_var_req_builder).await
883-
}
884-
885871
async fn reinvite<'a>(&self, org_id: uuid::Uuid, id: uuid::Uuid) -> Result<(), Error> {
886872
let local_var_configuration = &self.configuration;
887873

‎crates/bitwarden-api-api/src/models/accept_organization_invite_link_request_model.rs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Bitwarden Internal API
3+
*
4+
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
5+
*
6+
* The version of the OpenAPI document: latest
7+
*
8+
* Generated by: https://openapi-generator.tech
9+
*/
10+
11+
use serde::{Deserialize, Serialize};
12+
13+
use crate::models;
14+
15+
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
16+
pub struct AcceptOrganizationInviteLinkRequestModel {
17+
#[serde(rename = "code", alias = "Code")]
18+
pub code: uuid::Uuid,
19+
#[serde(
20+
rename = "resetPasswordKey",
21+
alias = "ResetPasswordKey",
22+
skip_serializing_if = "Option::is_none"
23+
)]
24+
pub reset_password_key: Option<String>,
25+
}
26+
27+
impl AcceptOrganizationInviteLinkRequestModel {
28+
pub fn new(code: uuid::Uuid) -> AcceptOrganizationInviteLinkRequestModel {
29+
AcceptOrganizationInviteLinkRequestModel {
30+
code,
31+
reset_password_key: None,
32+
}
33+
}
34+
}

‎crates/bitwarden-api-api/src/models/billing_customer_discount.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@ pub struct BillingCustomerDiscount {
4848
skip_serializing_if = "Option::is_none"
4949
)]
5050
pub amount_off: Option<f64>,
51+
/// The instant the discount stops applying (Stripe Discount.end). Null = no end date /
52+
/// perpetual.
53+
#[serde(rename = "end", alias = "End", skip_serializing_if = "Option::is_none")]
54+
pub end: Option<String>,
55+
/// For a repeating coupon, the number of months it applies. Null for once/forever.
56+
#[serde(
57+
rename = "durationInMonths",
58+
alias = "DurationInMonths",
59+
skip_serializing_if = "Option::is_none"
60+
)]
61+
pub duration_in_months: Option<i64>,
5162
/// List of Stripe product IDs that this discount applies to (e.g., [\"prod_premium\",
5263
/// \"prod_families\"]). Null: discount applies to all products with no restrictions
5364
/// (AppliesTo not specified in Stripe). Empty list: discount restricted to zero products (edge
@@ -69,6 +80,8 @@ impl BillingCustomerDiscount {
6980
active: None,
7081
percent_off: None,
7182
amount_off: None,
83+
end: None,
84+
duration_in_months: None,
7285
applies_to: None,
7386
}
7487
}

‎crates/bitwarden-api-api/src/models/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
pub mod accept_organization_invite_link_request_model;
2+
pub use self::accept_organization_invite_link_request_model::AcceptOrganizationInviteLinkRequestModel;
13
pub mod access_policy_request;
24
pub use self::access_policy_request::AccessPolicyRequest;
35
pub mod access_token_create_request_model;

‎crates/bitwarden-api-api/src/models/organization.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,13 @@ pub struct Organization {
496496
skip_serializing_if = "Option::is_none"
497497
)]
498498
pub use_invite_links: Option<bool>,
499+
/// If true, the organization is subscribed to the Privileged Access Management (PAM) product.
500+
#[serde(
501+
rename = "usePam",
502+
alias = "UsePam",
503+
skip_serializing_if = "Option::is_none"
504+
)]
505+
pub use_pam: Option<bool>,
499506
/// When set to true, the organization is excluded from automated billing lifecycle operations
500507
/// such as subscription cancellation and disabling for non-payment.
501508
#[serde(
@@ -575,6 +582,7 @@ impl Organization {
575582
use_phishing_blocker: None,
576583
use_my_items: None,
577584
use_invite_links: None,
585+
use_pam: None,
578586
exempt_from_billing_automation: None,
579587
}
580588
}

‎crates/bitwarden-api-api/src/models/organization_license.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,12 @@ pub struct OrganizationLicense {
292292
skip_serializing_if = "Option::is_none"
293293
)]
294294
pub use_invite_links: Option<bool>,
295+
#[serde(
296+
rename = "usePam",
297+
alias = "UsePam",
298+
skip_serializing_if = "Option::is_none"
299+
)]
300+
pub use_pam: Option<bool>,
295301
#[serde(
296302
rename = "hash",
297303
alias = "Hash",
@@ -362,6 +368,7 @@ impl OrganizationLicense {
362368
use_disable_sm_ads_for_users: None,
363369
use_my_items: None,
364370
use_invite_links: None,
371+
use_pam: None,
365372
hash: None,
366373
signature: None,
367374
token: None,

‎crates/bitwarden-api-api/src/models/organization_response_model.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,12 @@ pub struct OrganizationResponseModel {
310310
skip_serializing_if = "Option::is_none"
311311
)]
312312
pub use_invite_links: Option<bool>,
313+
#[serde(
314+
rename = "usePam",
315+
alias = "UsePam",
316+
skip_serializing_if = "Option::is_none"
317+
)]
318+
pub use_pam: Option<bool>,
313319
}
314320

315321
impl OrganizationResponseModel {
@@ -365,6 +371,7 @@ impl OrganizationResponseModel {
365371
use_phishing_blocker: None,
366372
use_my_items: None,
367373
use_invite_links: None,
374+
use_pam: None,
368375
}
369376
}
370377
}

‎crates/bitwarden-api-api/src/models/organization_subscription_response_model.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,12 @@ pub struct OrganizationSubscriptionResponseModel {
310310
skip_serializing_if = "Option::is_none"
311311
)]
312312
pub use_invite_links: Option<bool>,
313+
#[serde(
314+
rename = "usePam",
315+
alias = "UsePam",
316+
skip_serializing_if = "Option::is_none"
317+
)]
318+
pub use_pam: Option<bool>,
313319
#[serde(
314320
rename = "storageName",
315321
alias = "StorageName",
@@ -415,6 +421,7 @@ impl OrganizationSubscriptionResponseModel {
415421
use_phishing_blocker: None,
416422
use_my_items: None,
417423
use_invite_links: None,
424+
use_pam: None,
418425
storage_name: None,
419426
storage_gb: None,
420427
customer_discount: None,

0 commit comments

Comments
 (0)