fix(api-fields): fix api fields for vaultwarden v1.33.x + add v1.33 to CI tests

Author: Lowaiz

.github/workflows/ci.yml

@@ -13,9 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.10', '3.11', '3.12' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13' ]
         os: [ ubuntu-latest ]
-        vaultwarden-version: [ '1.30.5', '1.31.0' , '1.32.0']
+        vaultwarden-version: [ '1.30.5', '1.31.0' , '1.32.7', '1.33.2' ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

pyproject.toml

@@ -73,7 +73,7 @@ test = "coverage run --source=src/vaultwarden -m unittest discover -p 'test_*.py
 _coverage = ["test", "coverage xml", "coverage report --show-missing"]
 with-coverage = "test"
 [[tool.hatch.envs.test.matrix]]
-python = ["3.10", "3.11", "3.12"]
+python = ["3.10", "3.11", "3.12", "3.13"]
 type = ["default"]
 [tool.hatch.envs.test.overrides]
 matrix.type.scripts = [

src/vaultwarden/clients/vaultwarden.py

@@ -144,7 +144,7 @@ def invite(self, email: str) -> bool:
             self._load_users()
         return res
 
-    def delete(self, identifier: str) -> bool:
+    def delete(self, identifier: str | UUID) -> bool:
         logger.info(f"Deleting {identifier} account")
         res = True
         try:

src/vaultwarden/models/bitwarden.py

@@ -91,6 +91,7 @@ def update_collection(self, collections: list[UUID]):
 class CollectionAccess(BitwardenBaseModel):
     ReadOnly: bool = False
     HidePasswords: bool = False
+    Manage: bool = False
 
 
 class CollectionUser(CollectionAccess):
@@ -154,6 +155,7 @@ def set_users(
         users: list[CollectionUser] | list[UUID],
         default_readonly: bool = False,
         default_hide_passwords: bool = False,
+        default_manage: bool = False,
     ):
         users_payload = []
         if users is not None and len(users) > 0:
@@ -172,6 +174,7 @@ def set_users(
                         "id": str(user_id),
                         "readOnly": default_readonly,
                         "hidePasswords": default_hide_passwords,
+                        "manage": default_manage,
                     }
                     for user_id in users
                 ]
@@ -203,6 +206,7 @@ class OrganizationUserDetails(BitwardenBaseModel):
     Collections: list[UserCollection]
     Groups: list | None = None
     TwoFactorEnabled: bool
+    Permissions:  dict | None  = None
 
     @field_validator("OrganizationId")
     @classmethod
@@ -221,6 +225,7 @@ def add_collections(self, collections: list[UUID]):
                 UserId=self.Id,
                 ReadOnly=False,
                 HidePasswords=False,
+                Manage=False
             )
             user.bitwarden_client = self.api_client
             self.Collections.append(user)
@@ -231,6 +236,7 @@ def add_collections(self, collections: list[UUID]):
                         "CollectionId": True,
                         "ReadOnly": True,
                         "HidePasswords": True,
+                        "Manage": True,
                     }
                 },
                 "Groups": True,
@@ -348,9 +354,13 @@ def invite(
         ) = None,
         access_all: bool = False,
         user_type: OrganizationUserType = OrganizationUserType.User,
+        permissions=None,
         default_readonly: bool = False,
         default_hide_passwords: bool = False,
+        default_manage: bool = False,
     ):
+        if permissions is None:
+            permissions = {}
         collections_payload = []
         if collections is not None and len(collections) > 0:
             for coll in collections:
@@ -378,6 +388,7 @@ def invite(
                             "id": coll_id,
                             "readOnly": default_readonly,
                             "hidePasswords": default_hide_passwords,
+                            "manage": default_manage,
                         }
                     )
 
@@ -387,6 +398,7 @@ def invite(
             "type": user_type,
             "collections": collections_payload,
             "groups": [],
+            "permissions": permissions,
         }
         resp = self.api_client.api_request(
             "POST", f"api/organizations/{self.Id}/users/invite", json=payload

src/vaultwarden/models/enum.py

@@ -13,6 +13,7 @@ class OrganizationUserType(IntEnum):
     Admin = 1
     User = 2
     Manager = 3
+    Custom = 4
 
 
 class CipherType(IntEnum):

tests/e2e/run_tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [[ -z "${VAULTWARDEN_VERSION}" ]]; then
-  VAULTWARDEN_VERSION="1.32.0"
+  VAULTWARDEN_VERSION="1.33.2"
 fi
 
 temp_dir=$(mktemp -d)