for groups on org collections

maxlaverse · Sep 29, 2024 · 3622772 · 3622772
1 parent d6497b8
commit 3622772
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/bitwarden/bwcli/client.go b/internal/bitwarden/bwcli/client.go
@@ -84,6 +84,7 @@ func DisableRetryBackoff() Options {
 }
 
 func (c *client) CreateObject(ctx context.Context, obj models.Object) (*models.Object, error) {
+	obj.Groups = []interface{}{}
 	objEncoded, err := c.encode(obj)
 	if err != nil {
 		return nil, err
@@ -97,7 +98,6 @@ func (c *client) CreateObject(ctx context.Context, obj models.Object) (*models.O
 
 	if obj.Object == models.ObjectTypeOrgCollection {
 		args = append(args, "--organizationid", obj.OrganizationID)
-		obj.Groups = []interface{}{}
 	}
 
 	out, err := c.cmdWithSession(args...).Run(ctx)

diff --git a/internal/bitwarden/bwcli/client_test.go b/internal/bitwarden/bwcli/client_test.go
@@ -42,7 +42,7 @@ func TestListObjects(t *testing.T) {
 	defer removeMocks(t)
 
 	b := NewClient("dummy")
-	_, err := b.ListObjects(context.Background(), "item", bitwarden.WithFolderID("folder-id"), bitwarden.WithCollectionID("collection-id"), bitwarden.WithSearch("search"))
+	_, err := b.ListObjects(context.Background(), models.ObjectTypeItem, bitwarden.WithFolderID("folder-id"), bitwarden.WithCollectionID("collection-id"), bitwarden.WithSearch("search"))
 
 	assert.NoError(t, err)
 	if assert.Len(t, commandsExecuted(), 1) {
@@ -87,7 +87,7 @@ func TestErrorContainsCommand(t *testing.T) {
 	defer removeMocks(t)
 
 	b := NewClient("dummy")
-	_, err := b.ListObjects(context.Background(), "org-collection", bitwarden.WithSearch("search"))
+	_, err := b.ListObjects(context.Background(), models.ObjectTypeOrgCollection, bitwarden.WithSearch("search"))
 
 	if assert.Error(t, err) {
 		assert.ErrorContains(t, err, "unable to parse result of 'list org-collections', error: 'unexpected end of JSON input', output: ''")