Merge pull request #43 from bugout-dev/auth-type-for-journal-permissions

Auth type for journal permissions

Author: kompotkot

bugout/__init__.py

@@ -7,7 +7,7 @@
 
 __email__ = "engineering@bugout.dev"
 __license__ = "MIT"
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 
 __all__ = (
     "__author__",

bugout/app.py

@@ -424,10 +424,16 @@ def get_journal_permissions(
         journal_id: Union[str, uuid.UUID],
         holder_ids: Optional[List[Union[str, uuid.UUID]]] = None,
         timeout: float = REQUESTS_TIMEOUT,
+        auth_type: str = data.AuthType.bearer.name,
+        **kwargs: Dict[str, Any],
     ) -> data.BugoutJournalPermissions:
         self.journal.timeout = timeout
         return self.journal.get_journal_permissions(
-            token=token, journal_id=journal_id, holder_ids=holder_ids
+            token=token,
+            journal_id=journal_id,
+            holder_ids=holder_ids,
+            auth_type=data.AuthType[auth_type],
+            **kwargs,
         )
 
     def get_journal_scopes(
@@ -447,6 +453,8 @@ def update_journal_scopes(
         holder_id: Union[str, uuid.UUID],
         permission_list: List[str],
         timeout: float = REQUESTS_TIMEOUT,
+        auth_type: str = data.AuthType.bearer.name,
+        **kwargs: Dict[str, Any],
     ) -> data.BugoutJournalScopeSpecs:
         self.journal.timeout = timeout
         return self.journal.update_journal_scopes(
@@ -455,6 +463,8 @@ def update_journal_scopes(
             holder_type=data.HolderType(holder_type),
             holder_id=holder_id,
             permission_list=permission_list,
+            auth_type=data.AuthType[auth_type],
+            **kwargs,
         )
 
     def delete_journal_scopes(
@@ -465,6 +475,8 @@ def delete_journal_scopes(
         holder_id: Union[str, uuid.UUID],
         permission_list: List[str],
         timeout: float = REQUESTS_TIMEOUT,
+        auth_type: str = data.AuthType.bearer.name,
+        **kwargs: Dict[str, Any],
     ) -> data.BugoutJournalScopeSpecs:
         self.journal.timeout = timeout
         return self.journal.delete_journal_scopes(
@@ -473,6 +485,8 @@ def delete_journal_scopes(
             holder_type=data.HolderType(holder_type),
             holder_id=holder_id,
             permission_list=permission_list,
+            auth_type=data.AuthType[auth_type],
+            **kwargs,
         )
 
     # Journal handlers

bugout/journal.py

@@ -81,11 +81,15 @@ def get_journal_permissions(
         token: Union[str, uuid.UUID],
         journal_id: Union[str, uuid.UUID],
         holder_ids: Optional[List[Union[str, uuid.UUID]]] = None,
+        auth_type: AuthType = AuthType.bearer,
+        **kwargs: Dict[str, Any],
     ) -> BugoutJournalPermissions:
         journal_scopes_path = f"journals/{journal_id}/permissions"
         headers = {
-            "Authorization": f"Bearer {token}",
+            "Authorization": f"{auth_type.value} {token}",
         }
+        if "headers" in kwargs.keys():
+            headers.update(kwargs["headers"])
         query_params = {}
         if holder_ids is not None:
             holder_ids_string = [str(holder_id) for holder_id in holder_ids]
@@ -118,6 +122,8 @@ def update_journal_scopes(
         holder_type: HolderType,
         holder_id: Union[str, uuid.UUID],
         permission_list: List[str],
+        auth_type: AuthType = AuthType.bearer,
+        **kwargs: Dict[str, Any],
     ) -> BugoutJournalScopeSpecs:
         journal_scopes_path = f"journals/{journal_id}/scopes"
         json = {
@@ -126,8 +132,10 @@ def update_journal_scopes(
             "permission_list": permission_list,
         }
         headers = {
-            "Authorization": f"Bearer {token}",
+            "Authorization": f"{auth_type.value} {token}",
         }
+        if "headers" in kwargs.keys():
+            headers.update(kwargs["headers"])
         result = self._call(
             method=Method.post, path=journal_scopes_path, headers=headers, json=json
         )
@@ -140,6 +148,8 @@ def delete_journal_scopes(
         holder_type: HolderType,
         holder_id: Union[str, uuid.UUID],
         permission_list: List[str],
+        auth_type: AuthType = AuthType.bearer,
+        **kwargs: Dict[str, Any],
     ) -> BugoutJournalScopeSpecs:
         journal_scopes_path = f"journals/{journal_id}/scopes"
         json = {
@@ -148,8 +158,10 @@ def delete_journal_scopes(
             "permission_list": permission_list,
         }
         headers = {
-            "Authorization": f"Bearer {token}",
+            "Authorization": f"{auth_type.value} {token}",
         }
+        if "headers" in kwargs.keys():
+            headers.update(kwargs["headers"])
         result = self._call(
             method=Method.delete, path=journal_scopes_path, headers=headers, json=json
         )