Merge pull request #19 from bugout-dev/humbug-availability

Humbug integration compatibility

Author: zomglings

bugout/__init__.py

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

bugout/app.py

@@ -121,11 +121,14 @@ def delete_user(
         self,
         token: Union[str, uuid.UUID],
         user_id: Union[str, uuid.UUID],
-        password: str,
+        password: Optional[str] = None,
         timeout: float = REQUESTS_TIMEOUT,
+        **kwargs: Dict[str, Any],
     ) -> data.BugoutUser:
         self.user.timeout = timeout
-        return self.user.delete_user(token=token, user_id=user_id, password=password)
+        return self.user.delete_user(
+            token=token, user_id=user_id, password=password, **kwargs
+        )
 
     # Token handlers
     def create_token(
@@ -134,11 +137,22 @@ def create_token(
         self.user.timeout = timeout
         return self.user.create_token(username=username, password=password)
 
+    def create_token_restricted(
+        self,
+        token: Union[str, uuid.UUID],
+        timeout: float = REQUESTS_TIMEOUT,
+    ) -> data.BugoutToken:
+        self.user.timeout = timeout
+        return self.user.create_token_restricted(token=token)
+
     def revoke_token(
-        self, token: Union[str, uuid.UUID], timeout: float = REQUESTS_TIMEOUT
+        self,
+        token: Union[str, uuid.UUID],
+        target_token: Optional[Union[str, uuid.UUID]] = None,
+        timeout: float = REQUESTS_TIMEOUT,
     ) -> uuid.UUID:
         self.user.timeout = timeout
-        return self.user.revoke_token(token=token)
+        return self.user.revoke_token(token=token, target_token=target_token)
 
     def revoke_token_by_id(
         self, token: Union[str, uuid.UUID], timeout: float = REQUESTS_TIMEOUT

bugout/data.py

@@ -57,6 +57,7 @@ class BugoutToken(BaseModel):
     active: bool
     token_type: Optional[str]
     note: Optional[str]
+    restricted: Optional[bool]
     created_at: datetime
     updated_at: datetime
 

bugout/user.py

@@ -142,15 +142,18 @@ def delete_user(
         self,
         token: Union[str, uuid.UUID],
         user_id: Union[str, uuid.UUID],
-        password: str,
+        password: Optional[str] = None,
+        **kwargs: Dict[str, Any],
     ) -> BugoutUser:
         delete_user_path = f"user/{user_id}"
-        data = {
-            "password": password,
-        }
+        data = {}
+        if password is not None:
+            data.update({"password": password})
         headers = {
             "Authorization": f"Bearer {token}",
         }
+        if "headers" in kwargs.keys():
+            headers.update(kwargs["headers"])
         result = self._call(
             method=Method.delete, path=delete_user_path, headers=headers, data=data
         )
@@ -166,13 +169,28 @@ def create_token(self, username: str, password: str) -> BugoutToken:
         result = self._call(method=Method.post, path=create_token_path, data=data)
         return BugoutToken(**result)
 
-    def revoke_token(self, token: Union[str, uuid.UUID]) -> uuid.UUID:
+    def create_token_restricted(self, token: Union[str, uuid.UUID]) -> BugoutToken:
+        create_token_path = "token/restricted"
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        result = self._call(method=Method.post, path=create_token_path, headers=headers)
+        return BugoutToken(**result)
+
+    def revoke_token(
+        self,
+        token: Union[str, uuid.UUID],
+        target_token: Optional[Union[str, uuid.UUID]] = None,
+    ) -> uuid.UUID:
         revoke_token_path = "token"
         headers = {
             "Authorization": f"Bearer {token}",
         }
+        data = {}
+        if target_token is not None:
+            data.update({"target_token": target_token})
         result = self._call(
-            method=Method.delete, path=revoke_token_path, headers=headers
+            method=Method.delete, path=revoke_token_path, headers=headers, data=data
         )
         return result