SM-807: BWS CLI & SDK Updates

crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts

@@ -351,6 +351,7 @@ export interface SecretPutRequest {
      * Organization ID of the secret to modify
      */
     organizationId: string;
+    projectIds?:    string[] | null;
     value:          string;
 }
 
@@ -923,6 +924,7 @@ const typeMap: any = {
         { json: "key", js: "key", typ: "" },
         { json: "note", js: "note", typ: "" },
         { json: "organizationId", js: "organizationId", typ: "" },
+        { json: "projectIds", js: "projectIds", typ: u(undefined, u(a(""), null)) },
         { json: "value", js: "value", typ: "" },
     ], false),
     "SyncRequest": o([

crates/bitwarden/src/secrets_manager/secrets/update.rs

@@ -20,6 +20,7 @@ pub struct SecretPutRequest {
     pub key: String,
     pub value: String,
     pub note: String,
+    pub project_ids: Option<Vec<Uuid>>,
 }
 
 pub(crate) async fn update_secret(
@@ -37,7 +38,7 @@ pub(crate) async fn update_secret(
         key: enc.encrypt(input.key.as_bytes(), org_id)?.to_string(),
         value: enc.encrypt(input.value.as_bytes(), org_id)?.to_string(),
         note: enc.encrypt(input.note.as_bytes(), org_id)?.to_string(),
-        project_ids: None,
+        project_ids: input.project_ids.clone(),
     });
 
     let config = client.get_api_configurations().await;

crates/bws/src/main.rs

@@ -108,16 +108,15 @@ enum SecretCommand {
     Create {
         key: String,
         value: String,
+        project_id: Uuid,
 
         #[arg(long, help = "An optional note to add to the secret")]
         note: Option<String>,
-
-        #[arg(long, help = "The ID of the project this secret will be added to")]
-        project_id: Option<Uuid>,
     },
     Delete {
         secret_ids: Vec<Uuid>,
     },
+    #[clap(group = ArgGroup::new("edit_field").required(true).multiple(true))]
     Edit {
         secret_id: Uuid,
         #[arg(long, group = "edit_field")]
@@ -126,6 +125,8 @@ enum SecretCommand {
         value: Option<String>,
         #[arg(long, group = "edit_field")]
         note: Option<String>,
+        #[arg(long, group = "edit_field")]
+        project_id: Option<Uuid>,
     },
     Get {
         secret_id: Uuid,
@@ -179,7 +180,7 @@ enum CreateCommand {
         note: Option<String>,
 
         #[arg(long, help = "The ID of the project this secret will be added to")]
-        project_id: Option<Uuid>,
+        project_id: Uuid,
     },
 }
 
@@ -200,6 +201,8 @@ enum EditCommand {
         value: Option<String>,
         #[arg(long, group = "edit_field")]
         note: Option<String>,
+        #[arg(long, group = "edit_field")]
+        project_id: Option<Uuid>,
     },
 }
 
@@ -383,17 +386,37 @@ async fn process_commands() -> Result<()> {
         | Commands::Delete {
             cmd: DeleteCommand::Project { project_ids },
         } => {
-            let project_count = project_ids.len();
-
-            client
+            let result = client
                 .projects()
                 .delete(ProjectsDeleteRequest { ids: project_ids })
                 .await?;
 
-            if project_count > 1 {
-                println!("Projects deleted successfully.");
+            let mut projects_success = 0;
+            let mut projects_failed: Vec<(Uuid, String)> = Vec::new();
+
+            for project in result.data.iter() {
+                match &project.error {
+                    Some(error_message) => {
+                        projects_failed.push((project.id, error_message.to_owned()))
+                    }
+                    None => projects_success += 1,
+                }
+            }
+
+            if projects_success == 0 || projects_success > 1 {
+                println!("{} projects deleted successfully.", projects_success);
             } else {
-                println!("Project deleted successfully.");
+                println!("{} project deleted successfully.", projects_success);
+            }
+
+            if projects_failed.len() > 1 {
+                println!("{} projects had errors:", projects_failed.len());
+            } else if projects_failed.len() == 1 {
+                println!("{} project had an error:", projects_failed.len());
+            }
+
+            for project in projects_failed {
+                println!("{}: {}", project.0, project.1);
             }
         }
 
@@ -466,7 +489,7 @@ async fn process_commands() -> Result<()> {
                     key,
                     value,
                     note: note.unwrap_or_default(),
-                    project_ids: project_id.map(|p| vec![p]),
+                    project_ids: Some(vec![project_id]),
                 })
                 .await?;
             serialize_response(secret, cli.output, color);
@@ -479,6 +502,7 @@ async fn process_commands() -> Result<()> {
                     key,
                     value,
                     note,
+                    project_id,
                 },
         }
         | Commands::Edit {
@@ -488,6 +512,7 @@ async fn process_commands() -> Result<()> {
                     key,
                     value,
                     note,
+                    project_id,
                 },
         } => {
             let old_secret = client
@@ -505,6 +530,13 @@ async fn process_commands() -> Result<()> {
                     key: key.unwrap_or(old_secret.key),
                     value: value.unwrap_or(old_secret.value),
                     note: note.unwrap_or(old_secret.note),
+                    project_ids: match project_id {
+                        Some(id) => Some(vec![id]),
+                        None => match old_secret.project_id {
+                            Some(id) => Some(vec![id]),
+                            None => bail!("Editing a secret requires a project_id."),
+                        },
+                    },
                 })
                 .await?;
             serialize_response(secret, cli.output, color);
@@ -516,12 +548,38 @@ async fn process_commands() -> Result<()> {
         | Commands::Delete {
             cmd: DeleteCommand::Secret { secret_ids },
         } => {
-            client
+            let result = client
                 .secrets()
                 .delete(SecretsDeleteRequest { ids: secret_ids })
                 .await?;
 
-            println!("Secret deleted correctly");
+            let mut secrets_success = 0;
+            let mut secrets_failed: Vec<(Uuid, String)> = Vec::new();
+
+            for secret in result.data.iter() {
+                match &secret.error {
+                    Some(error_message) => {
+                        secrets_failed.push((secret.id, error_message.to_owned()))
+                    }
+                    None => secrets_success += 1,
+                }
+            }
+
+            if secrets_success == 0 || secrets_success > 1 {
+                println!("{} secrets deleted successfully.", secrets_success);
+            } else {
+                println!("{} secret deleted successfully.", secrets_success);
+            }
+
+            if secrets_failed.len() > 1 {
+                println!("{} secrets had errors:", secrets_failed.len());
+            } else if secrets_failed.len() == 1 {
+                println!("{} secret had an error:", secrets_failed.len());
+            }
+
+            for secret in secrets_failed {
+                println!("{}: {}", secret.0, secret.1);
+            }
         }
 
         Commands::Config { .. } => {

languages/csharp/schemas.cs

@@ -436,6 +436,9 @@ public partial class SecretPutRequest
         [JsonProperty("organizationId")]
         public Guid OrganizationId { get; set; }
 
+        [JsonProperty("projectIds")]
+        public Guid[] ProjectIds { get; set; }
+
         [JsonProperty("value")]
         public string Value { get; set; }
     }

languages/js_webassembly/bitwarden_client/schemas.ts

@@ -351,6 +351,7 @@ export interface SecretPutRequest {
      * Organization ID of the secret to modify
      */
     organizationId: string;
+    projectIds?:    string[] | null;
     value:          string;
 }
 
@@ -923,6 +924,7 @@ const typeMap: any = {
         { json: "key", js: "key", typ: "" },
         { json: "note", js: "note", typ: "" },
         { json: "organizationId", js: "organizationId", typ: "" },
+        { json: "projectIds", js: "projectIds", typ: u(undefined, u(a(""), null)) },
         { json: "value", js: "value", typ: "" },
     ], false),
     "SyncRequest": o([

languages/python/BitwardenClient/schemas.py

@@ -479,6 +479,7 @@ class SecretPutRequest:
     """Organization ID of the secret to modify"""
     organization_id: UUID
     value: str
+    project_ids: Optional[List[UUID]] = None
 
     @staticmethod
     def from_dict(obj: Any) -> 'SecretPutRequest':
@@ -488,7 +489,8 @@ def from_dict(obj: Any) -> 'SecretPutRequest':
         note = from_str(obj.get("note"))
         organization_id = UUID(obj.get("organizationId"))
         value = from_str(obj.get("value"))
-        return SecretPutRequest(id, key, note, organization_id, value)
+        project_ids = from_union([from_none, lambda x: from_list(lambda x: UUID(x), x)], obj.get("projectIds"))
+        return SecretPutRequest(id, key, note, organization_id, value, project_ids)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -497,6 +499,8 @@ def to_dict(self) -> dict:
         result["note"] = from_str(self.note)
         result["organizationId"] = str(self.organization_id)
         result["value"] = from_str(self.value)
+        if self.project_ids is not None:
+            result["projectIds"] = from_union([from_none, lambda x: from_list(lambda x: str(x), x)], self.project_ids)
         return result
 
 

support/schemas/bitwarden_json/Command.json

@@ -428,6 +428,16 @@
           "type": "string",
           "format": "uuid"
         },
+        "projectIds": {
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
         "value": {
           "type": "string"
         }