bitwarden-sdk 0.1.0__cp39-none-win_amd64.whl → 1.0.0__cp39-none-win_amd64.whl

bitwarden_sdk/__init__.py

@@ -1,6 +1,6 @@
 """The official Bitwarden client library for Python."""
 
-__version__ = "0.1.0"
+__version__ = "1.0.0"
 
 from .bitwarden_client import *
 from .schemas import *

bitwarden_sdk/bitwarden_client.py

@@ -2,7 +2,16 @@ import json
 from typing import Any, List, Optional
 from uuid import UUID
 import bitwarden_py
-from .schemas import ClientSettings, Command, ResponseForSecretIdentifiersResponse, ResponseForSecretResponse, ResponseForSecretsDeleteResponse, SecretCreateRequest, SecretGetRequest, SecretIdentifiersRequest, SecretIdentifiersResponse, SecretPutRequest, SecretResponse, SecretsCommand, SecretsDeleteRequest, SecretsDeleteResponse, AccessTokenLoginRequest, AccessTokenLoginResponse, ResponseForAccessTokenLoginResponse, ResponseForProjectResponse, ProjectsCommand, ProjectCreateRequest, ProjectGetRequest, ProjectPutRequest, ProjectsListRequest, ResponseForProjectsResponse, ResponseForProjectsDeleteResponse, ProjectsDeleteRequest
+
+from .schemas import (ClientSettings, Command, ResponseForSecretIdentifiersResponse, ResponseForSecretResponse,
+                      ResponseForSecretsResponse, ResponseForSecretsDeleteResponse, SecretCreateRequest,
+                      SecretGetRequest, SecretsGetRequest, SecretIdentifiersRequest, SecretPutRequest,
+                      SecretsCommand, SecretsDeleteRequest, SecretsSyncRequest, AccessTokenLoginRequest,
+                      ResponseForSecretsSyncResponse, ResponseForAccessTokenLoginResponse,
+                      ResponseForProjectResponse, ProjectsCommand, ProjectCreateRequest, ProjectGetRequest,
+                      ProjectPutRequest, ProjectsListRequest, ResponseForProjectsResponse,
+                      ResponseForProjectsDeleteResponse, ProjectsDeleteRequest)
+
 
 class BitwardenClient:
     def __init__(self, settings: ClientSettings = None):
@@ -12,11 +21,8 @@ class BitwardenClient:
             settings_json = json.dumps(settings.to_dict())
             self.inner = bitwarden_py.BitwardenClient(settings_json)
 
-    def access_token_login(self, access_token: str,
-                           state_file_path: str = None):
-        self._run_command(
-            Command(access_token_login=AccessTokenLoginRequest(access_token, state_file_path))
-        )
+    def auth(self):
+        return AuthClient(self)
 
     def secrets(self):
         return SecretsClient(self)
@@ -30,9 +36,22 @@ class BitwardenClient:
 
         if response["success"] == False:
             raise Exception(response["errorMessage"])
-        
+
         return response
 
+
+class AuthClient:
+    def __init__(self, client: BitwardenClient):
+        self.client = client
+
+    def login_access_token(self, access_token: str,
+                           state_file: str = None) -> ResponseForAccessTokenLoginResponse:
+        result = self.client._run_command(
+            Command(login_access_token=AccessTokenLoginRequest(access_token, state_file))
+        )
+        return ResponseForAccessTokenLoginResponse.from_dict(result)
+
+
 class SecretsClient:
     def __init__(self, client: BitwardenClient):
         self.client = client
@@ -43,12 +62,24 @@ class SecretsClient:
         )
         return ResponseForSecretResponse.from_dict(result)
 
-    def create(self, key: str,
-               note: str,
-               organization_id: str,
-               value: str,
-               project_ids: Optional[List[UUID]] = None
-               ) -> ResponseForSecretResponse:
+    def get_by_ids(self, ids: List[UUID]) -> ResponseForSecretsResponse:
+        result = self.client._run_command(
+            Command(secrets=SecretsCommand(
+                get_by_ids=SecretsGetRequest(ids))
+            ))
+        return ResponseForSecretsResponse.from_dict(result)
+
+    def create(
+            self,
+            organization_id: UUID,
+            key: str,
+            value: str,
+            note: Optional[str],
+            project_ids: Optional[List[UUID]] = None,
+    ) -> ResponseForSecretResponse:
+        if note is None:
+            # secrets api does not accept empty notes
+            note = ""
         result = self.client._run_command(
             Command(secrets=SecretsCommand(
                 create=SecretCreateRequest(key, note, organization_id, value, project_ids)))
@@ -62,13 +93,18 @@ class SecretsClient:
         )
         return ResponseForSecretIdentifiersResponse.from_dict(result)
 
-    def update(self, id: str,
-               key: str,
-               note: str,
-               organization_id: str,
-               value: str,
-               project_ids: Optional[List[UUID]] = None
-               ) -> ResponseForSecretResponse:
+    def update(
+            self,
+            organization_id: str,
+            id: str,
+            key: str,
+            value: str,
+            note: Optional[str],
+            project_ids: Optional[List[UUID]] = None,
+    ) -> ResponseForSecretResponse:
+        if note is None:
+            # secrets api does not accept empty notes
+            note = ""
         result = self.client._run_command(
             Command(secrets=SecretsCommand(update=SecretPutRequest(
                 id, key, note, organization_id, value, project_ids)))
@@ -81,6 +117,13 @@ class SecretsClient:
         )
         return ResponseForSecretsDeleteResponse.from_dict(result)
 
+    def sync(self, organization_id: str, last_synced_date: Optional[str]) -> ResponseForSecretsSyncResponse:
+        result = self.client._run_command(
+            Command(secrets=SecretsCommand(sync=SecretsSyncRequest(organization_id, last_synced_date)))
+        )
+        return ResponseForSecretsSyncResponse.from_dict(result)
+
+
 class ProjectsClient:
     def __init__(self, client: BitwardenClient):
         self.client = client
@@ -92,8 +135,8 @@ class ProjectsClient:
         return ResponseForProjectResponse.from_dict(result)
 
     def create(self,
-               name: str,
                organization_id: str,
+               name: str,
                ) -> ResponseForProjectResponse:
         result = self.client._run_command(
             Command(projects=ProjectsCommand(
@@ -108,10 +151,12 @@ class ProjectsClient:
         )
         return ResponseForProjectsResponse.from_dict(result)
 
-    def update(self, id: str,
-               name: str,
-               organization_id: str,
-               ) -> ResponseForProjectResponse:
+    def update(
+            self,
+            organization_id: str,
+            id: str,
+            name: str,
+    ) -> ResponseForProjectResponse:
         result = self.client._run_command(
             Command(projects=ProjectsCommand(update=ProjectPutRequest(
                 id, name, organization_id)))