Update bindings to use the reqwest-trait template

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())
     }
 }

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())
 }

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)
 }

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();
 

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();
 

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())
 }

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())
 }

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)
 }

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();
 

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();
 

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();
 

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();
 

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())
 }

crates/bitwarden-api-api/.openapi-generator-ignore

@@ -25,3 +25,7 @@
 docs/*.md
 .travis.yml
 git_push.sh
+.gitignore
+
+# We handle dependency updates with renovate, so we don't want to overwrite Cargo.toml
+Cargo.toml

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

@@ -1,5 +1,3 @@
-.gitignore
-Cargo.toml
 README.md
 src/apis/access_policies_api.rs
 src/apis/account_billing_v_next_api.rs

crates/bitwarden-api-api/.openapi-generator/VERSION

@@ -1 +1 @@
-7.13.0
+7.14.0

crates/bitwarden-api-api/README.md

@@ -11,7 +11,7 @@ client.
 
 - API version: latest
 - Package version: 1.0.0
-- Generator version: 7.13.0
+- Generator version: 7.14.0
 - Build package: `org.openapitools.codegen.languages.RustClientCodegen`
 
 ## Installation
@@ -25,7 +25,7 @@ bitwarden-api-api = { path = "./bitwarden-api-api" }
 
 ## Documentation for API Endpoints
 
-All URIs are relative to _http://localhost_
+All URIs are relative to *https://api.bitwarden.com*
 
 | Class                                     | Method                                                                                                                                                                                                                                                             | HTTP request                                                                                                  | Description                                                                                                                                                                                                                                                             |
 | ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |