moved get_public_key_for_user to bitwarden_client; fix: test when unset env var

Author: Katzenkralle

src/vaultwarden/clients/bitwarden.py

@@ -131,6 +131,12 @@ def _api_request(
         return self._http_client.request(
             method, path, headers=headers, **kwargs
         )
+    
+    def get_public_key_for_user(self, user_id: UUID | None = None) -> str:
+        resp = self.api_request(
+            "GET", f"api/users/{self._sync.Profile.Id if not user_id else user_id}/public-key"
+        )
+        return resp.json().get("publicKey")
 
     def sync(self, force_refresh: bool = False) -> SyncData:
         if self._sync is None or force_refresh:

src/vaultwarden/models/bitwarden.py

@@ -428,7 +428,7 @@ def confirm(
         self,
         new_user: OrganizationUserDetails,
     ):
-        rsa_public_key_new_user = b64decode(self.get_public_key_for_user(new_user.UserId))
+        rsa_public_key_new_user = b64decode(self.api_client.get_public_key_for_user(new_user.UserId))
         org_key_decrypted = self.key()
         key = encrypt_asym(org_key_decrypted, rsa_public_key_new_user)
 
@@ -440,13 +440,6 @@ def confirm(
         )
         self._users = self._get_users()
         return resp
-    
-    def get_public_key_for_user(self, user_id: UUID | str):
-        resp = self.api_client.api_request(
-            "GET", f"api/users/{user_id}/public-key"
-        )
-        resp.raise_for_status()
-        return resp.json().get("publicKey")
 
     def _get_users(self) -> list[OrganizationUserDetails]:
         resp = self.api_client.api_request(

tests/e2e/test_bitwarden.py

@@ -105,7 +105,7 @@ def test_invite_user_than_remove(self):
         resp = self.organization.invite("[email protected]")
         self.assertTrue(resp.is_success)
 
-        if not os.environ.get("VAULTWARDEN_INVITATIONS_ALLOWED", True).lower() in ["true", "1", "yes"]:
+        if not os.environ.get("VAULTWARDEN_INVITATIONS_ALLOWED", "True").lower() in ["true", "1", "yes"]:
             user = self.organization.user_search(
             "[email protected]", force_refresh=True
             )