Update code to new bindings

dani-garcia · dani-garcia · commit c3d62e346690 · 2025-07-31T17:58:05.000+02:00
diff --git a/bitwarden_license/bitwarden-sm/src/error.rs b/bitwarden_license/bitwarden-sm/src/error.rs
@@ -84,8 +84,8 @@ impl From<ValidationErrors> for SecretsManagerError {
     }
 }
 
-impl<T> From<ApiApisError<T>> for SecretsManagerError {
-    fn from(e: bitwarden_api_api::apis::Error<T>) -> Self {
+impl From<ApiApisError> for SecretsManagerError {
+    fn from(e: bitwarden_api_api::apis::Error) -> Self {
         SecretsManagerError::ApiError(e.into())
     }
 }
diff --git a/bitwarden_license/bitwarden-sm/src/projects/create.rs b/bitwarden_license/bitwarden-sm/src/projects/create.rs
@@ -40,12 +40,11 @@ pub(crate) async fn create_project(
     });
 
     let config = client.internal.get_api_configurations().await;
-    let res = bitwarden_api_api::apis::projects_api::organizations_organization_id_projects_post(
-        &config.api,
-        input.organization_id,
-        project,
-    )
-    .await?;
+    let res = config
+        .api_client
+        .projects_api()
+        .organizations_organization_id_projects_post(input.organization_id, project)
+        .await?;
 
     ProjectResponse::process_response(res, &mut key_store.context())
 }
diff --git a/bitwarden_license/bitwarden-sm/src/projects/delete.rs b/bitwarden_license/bitwarden-sm/src/projects/delete.rs
@@ -21,9 +21,11 @@ pub(crate) async fn delete_projects(
     input: ProjectsDeleteRequest,
 ) -> Result<ProjectsDeleteResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
-    let res =
-        bitwarden_api_api::apis::projects_api::projects_delete_post(&config.api, Some(input.ids))
-            .await?;
+    let res = config
+        .api_client
+        .projects_api()
+        .projects_delete_post(Some(input.ids))
+        .await?;
 
     ProjectsDeleteResponse::process_response(res)
 }
diff --git a/bitwarden_license/bitwarden-sm/src/projects/get.rs b/bitwarden_license/bitwarden-sm/src/projects/get.rs
@@ -19,7 +19,11 @@ pub(crate) async fn get_project(
 ) -> Result<ProjectResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
 
-    let res = bitwarden_api_api::apis::projects_api::projects_id_get(&config.api, input.id).await?;
+    let res = config
+        .api_client
+        .projects_api()
+        .projects_id_get(input.id)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
diff --git a/bitwarden_license/bitwarden-sm/src/projects/list.rs b/bitwarden_license/bitwarden-sm/src/projects/list.rs
@@ -20,11 +20,11 @@ pub(crate) async fn list_projects(
     input: &ProjectsListRequest,
 ) -> Result<ProjectsResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
-    let res = bitwarden_api_api::apis::projects_api::organizations_organization_id_projects_get(
-        &config.api,
-        input.organization_id,
-    )
-    .await?;
+    let res = config
+        .api_client
+        .projects_api()
+        .organizations_organization_id_projects_get(input.organization_id)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
diff --git a/bitwarden_license/bitwarden-sm/src/projects/update.rs b/bitwarden_license/bitwarden-sm/src/projects/update.rs
@@ -42,9 +42,11 @@ pub(crate) async fn update_project(
     });
 
     let config = client.internal.get_api_configurations().await;
-    let res =
-        bitwarden_api_api::apis::projects_api::projects_id_put(&config.api, input.id, project)
-            .await?;
+    let res = config
+        .api_client
+        .projects_api()
+        .projects_id_put(input.id, project)
+        .await?;
 
     ProjectResponse::process_response(res, &mut key_store.context())
 }
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/create.rs b/bitwarden_license/bitwarden-sm/src/secrets/create.rs
@@ -55,12 +55,11 @@ pub(crate) async fn create_secret(
     };
 
     let config = client.internal.get_api_configurations().await;
-    let res = bitwarden_api_api::apis::secrets_api::organizations_organization_id_secrets_post(
-        &config.api,
-        input.organization_id,
-        secret,
-    )
-    .await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .organizations_organization_id_secrets_post(input.organization_id, secret)
+        .await?;
 
     SecretResponse::process_response(res, &mut key_store.context())
 }
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/delete.rs b/bitwarden_license/bitwarden-sm/src/secrets/delete.rs
@@ -21,9 +21,11 @@ pub(crate) async fn delete_secrets(
     input: SecretsDeleteRequest,
 ) -> Result<SecretsDeleteResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
-    let res =
-        bitwarden_api_api::apis::secrets_api::secrets_delete_post(&config.api, Some(input.ids))
-            .await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .secrets_delete_post(Some(input.ids))
+        .await?;
 
     SecretsDeleteResponse::process_response(res)
 }
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/get.rs b/bitwarden_license/bitwarden-sm/src/secrets/get.rs
@@ -18,7 +18,11 @@ pub(crate) async fn get_secret(
     input: &SecretGetRequest,
 ) -> Result<SecretResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
-    let res = bitwarden_api_api::apis::secrets_api::secrets_id_get(&config.api, input.id).await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .secrets_id_get(input.id)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/get_by_ids.rs b/bitwarden_license/bitwarden-sm/src/secrets/get_by_ids.rs
@@ -22,8 +22,11 @@ pub(crate) async fn get_secrets_by_ids(
 
     let config = client.internal.get_api_configurations().await;
 
-    let res =
-        bitwarden_api_api::apis::secrets_api::secrets_get_by_ids_post(&config.api, request).await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .secrets_get_by_ids_post(request)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/list.rs b/bitwarden_license/bitwarden-sm/src/secrets/list.rs
@@ -26,11 +26,11 @@ pub(crate) async fn list_secrets(
     input: &SecretIdentifiersRequest,
 ) -> Result<SecretIdentifiersResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
-    let res = bitwarden_api_api::apis::secrets_api::organizations_organization_id_secrets_get(
-        &config.api,
-        input.organization_id,
-    )
-    .await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .organizations_organization_id_secrets_get(input.organization_id)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
@@ -50,11 +50,11 @@ pub(crate) async fn list_secrets_by_project(
     input: &SecretIdentifiersByProjectRequest,
 ) -> Result<SecretIdentifiersResponse, SecretsManagerError> {
     let config = client.internal.get_api_configurations().await;
-    let res = bitwarden_api_api::apis::secrets_api::projects_project_id_secrets_get(
-        &config.api,
-        input.project_id,
-    )
-    .await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .projects_project_id_secrets_get(input.project_id)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/sync.rs b/bitwarden_license/bitwarden-sm/src/secrets/sync.rs
@@ -25,12 +25,11 @@ pub(crate) async fn sync_secrets(
     let config = client.internal.get_api_configurations().await;
     let last_synced_date = input.last_synced_date.map(|date| date.to_rfc3339());
 
-    let res = bitwarden_api_api::apis::secrets_api::organizations_organization_id_secrets_sync_get(
-        &config.api,
-        input.organization_id,
-        last_synced_date,
-    )
-    .await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .organizations_organization_id_secrets_sync_get(input.organization_id, last_synced_date)
+        .await?;
 
     let key_store = client.internal.get_key_store();
 
diff --git a/bitwarden_license/bitwarden-sm/src/secrets/update.rs b/bitwarden_license/bitwarden-sm/src/secrets/update.rs
@@ -54,8 +54,11 @@ pub(crate) async fn update_secret(
     };
 
     let config = client.internal.get_api_configurations().await;
-    let res =
-        bitwarden_api_api::apis::secrets_api::secrets_id_put(&config.api, input.id, secret).await?;
+    let res = config
+        .api_client
+        .secrets_api()
+        .secrets_id_put(input.id, secret)
+        .await?;
 
     SecretResponse::process_response(res, &mut key_store.context())
 }
diff --git a/crates/bitwarden-core/src/auth/api/request/mod.rs b/crates/bitwarden-core/src/auth/api/request/mod.rs
@@ -33,21 +33,19 @@ async fn send_identity_connect_request(
     email: Option<&str>,
     body: impl serde::Serialize,
 ) -> Result<IdentityTokenResponse, LoginError> {
-    let mut request = configurations
-        .identity
+    let config = &configurations.identity_config;
+
+    let mut request = config
         .client
-        .post(format!(
-            "{}/connect/token",
-            &configurations.identity.base_path
-        ))
+        .post(format!("{}/connect/token", &config.base_path))
         .header(
             reqwest::header::CONTENT_TYPE,
             "application/x-www-form-urlencoded; charset=utf-8",
         )
         .header(reqwest::header::ACCEPT, "application/json")
         .header("Device-Type", configurations.device_type as usize);
 
-    if let Some(ref user_agent) = configurations.identity.user_agent {
+    if let Some(ref user_agent) = config.user_agent {
         request = request.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
 
diff --git a/crates/bitwarden-core/src/auth/login/auth_request.rs b/crates/bitwarden-core/src/auth/login/auth_request.rs
@@ -1,7 +1,4 @@
-use bitwarden_api_api::{
-    apis::auth_requests_api::{auth_requests_id_response_get, auth_requests_post},
-    models::{AuthRequestCreateRequestModel, AuthRequestType},
-};
+use bitwarden_api_api::models::{AuthRequestCreateRequestModel, AuthRequestType};
 use bitwarden_crypto::Kdf;
 use uuid::Uuid;
 
@@ -43,7 +40,10 @@ pub(crate) async fn send_new_auth_request(
         r#type: AuthRequestType::AuthenticateAndUnlock,
     };
 
-    let res = auth_requests_post(&config.api, Some(req))
+    let res = config
+        .api_client
+        .auth_requests_api()
+        .auth_requests_post(Some(req))
         .await
         .map_err(ApiError::from)?;
 
@@ -62,14 +62,12 @@ pub(crate) async fn complete_auth_request(
     auth_req: NewAuthRequestResponse,
 ) -> Result<(), LoginError> {
     let config = client.internal.get_api_configurations().await;
-
-    let res = auth_requests_id_response_get(
-        &config.api,
-        auth_req.auth_request_id,
-        Some(&auth_req.access_code),
-    )
-    .await
-    .map_err(ApiError::from)?;
+    let res = config
+        .api_client
+        .auth_requests_api()
+        .auth_requests_id_response_get(auth_req.auth_request_id, Some(&auth_req.access_code))
+        .await
+        .map_err(ApiError::from)?;
 
     let approved = res.request_approved.unwrap_or(false);
 
diff --git a/crates/bitwarden-core/src/auth/login/prelogin.rs b/crates/bitwarden-core/src/auth/login/prelogin.rs
@@ -1,7 +1,4 @@
-use bitwarden_api_identity::{
-    apis::accounts_api::accounts_prelogin_post,
-    models::{PreloginRequestModel, PreloginResponseModel},
-};
+use bitwarden_api_identity::models::{PreloginRequestModel, PreloginResponseModel};
 use bitwarden_crypto::Kdf;
 use thiserror::Error;
 
@@ -19,7 +16,10 @@ pub enum PreloginError {
 pub(crate) async fn prelogin(client: &Client, email: String) -> Result<Kdf, PreloginError> {
     let request_model = PreloginRequestModel::new(email);
     let config = client.internal.get_api_configurations().await;
-    let result = accounts_prelogin_post(&config.identity, Some(request_model))
+    let result = config
+        .identity_client
+        .accounts_api()
+        .accounts_prelogin_post(Some(request_model))
         .await
         .map_err(ApiError::from)?;
 
diff --git a/crates/bitwarden-core/src/auth/login/two_factor.rs b/crates/bitwarden-core/src/auth/login/two_factor.rs
@@ -46,20 +46,20 @@ pub(crate) async fn send_two_factor_email(
     )?;
 
     let config = client.internal.get_api_configurations().await;
-    bitwarden_api_api::apis::two_factor_api::two_factor_send_email_login_post(
-        &config.api,
-        Some(TwoFactorEmailRequestModel {
+    config
+        .api_client
+        .two_factor_api()
+        .two_factor_send_email_login_post(Some(TwoFactorEmailRequestModel {
             master_password_hash: Some(password_hash),
             otp: None,
             auth_request_access_code: None,
             secret: None,
             email: input.email.to_owned(),
             auth_request_id: None,
             sso_email2_fa_session_token: None,
-        }),
-    )
-    .await
-    .map_err(ApiError::from)?;
+        }))
+        .await
+        .map_err(ApiError::from)?;
 
     Ok(())
 }
diff --git a/crates/bitwarden-core/src/client/client.rs b/crates/bitwarden-core/src/client/client.rs
@@ -99,11 +99,11 @@ impl Client {
                 login_method: RwLock::new(None),
                 #[cfg(feature = "internal")]
                 flags: RwLock::new(Flags::default()),
-                __api_configurations: RwLock::new(Arc::new(ApiConfigurations {
+                __api_configurations: RwLock::new(ApiConfigurations::new(
                     identity,
                     api,
-                    device_type: settings.device_type,
-                })),
+                    settings.device_type,
+                )),
                 external_client,
                 key_store: KeyStore::default(),
                 #[cfg(feature = "internal")]
diff --git a/crates/bitwarden-core/src/client/internal.rs b/crates/bitwarden-core/src/client/internal.rs
diff --git a/crates/bitwarden-core/src/error.rs b/crates/bitwarden-core/src/error.rs
diff --git a/crates/bitwarden-core/src/platform/get_user_api_key.rs b/crates/bitwarden-core/src/platform/get_user_api_key.rs
diff --git a/crates/bitwarden-test/src/api.rs b/crates/bitwarden-test/src/api.rs
diff --git a/crates/bitwarden-vault/src/folder/create.rs b/crates/bitwarden-vault/src/folder/create.rs
diff --git a/crates/bitwarden-vault/src/folder/edit.rs b/crates/bitwarden-vault/src/folder/edit.rs
diff --git a/crates/bitwarden-vault/src/folder/folder_client.rs b/crates/bitwarden-vault/src/folder/folder_client.rs
diff --git a/crates/bitwarden-vault/src/sync.rs b/crates/bitwarden-vault/src/sync.rs

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ impl From<ValidationErrors> for SecretsManagerError {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`-impl<T> From<ApiApisError<T>> for SecretsManagerError {`
`88`		`- fn from(e: bitwarden_api_api::apis::Error<T>) -> Self {`
	`87`	`+impl From<ApiApisError> for SecretsManagerError {`
	`88`	`+ fn from(e: bitwarden_api_api::apis::Error) -> Self {`
`89`	`89`	`SecretsManagerError::ApiError(e.into())`
`90`	`90`	`}`
`91`	`91`	`}`