Updated user endpoints for internal purposes

Author: kompotkot

bugout/app.py

@@ -48,15 +48,12 @@ def create_user(
         username: str,
         email: str,
         password: str,
-        autogenerated_token: str = None,
         timeout: float = REQUESTS_TIMEOUT,
+        **kwargs: Dict[str, Any],
     ) -> data.BugoutUser:
         self.user.timeout = timeout
         return self.user.create_user(
-            username=username,
-            email=email,
-            password=password,
-            autogenerated_token=autogenerated_token,
+            username=username, email=email, password=password, **kwargs
         )
 
     def get_user(
@@ -78,13 +75,11 @@ def find_user(
         self,
         username: str,
         token: Union[str, uuid.UUID] = None,
-        installation_token: str = None,
         timeout: float = REQUESTS_TIMEOUT,
+        **kwargs: Dict[str, Any],
     ) -> data.BugoutUser:
         self.user.timeout = timeout
-        return self.user.find_user(
-            username=username, token=token, installation_token=installation_token
-        )
+        return self.user.find_user(username=username, token=token, **kwargs)
 
     def confirm_email(
         self,
@@ -531,7 +526,7 @@ def search(
         token: Union[str, uuid.UUID],
         journal_id: Union[str, uuid.UUID],
         timeout: float = REQUESTS_TIMEOUT,
-        **queries: Dict[str, Any]
+        **queries: Dict[str, Any],
     ) -> data.BugoutSearchResults:
         self.journal.timeout = timeout
         return self.journal.search(token=token, journal_id=journal_id, **queries)

bugout/user.py

@@ -37,19 +37,17 @@ def create_user(
         username: str,
         email: str,
         password: str,
-        autogenerated_token: Optional[str] = None,
+        **kwargs: Dict[str, Any],
     ) -> BugoutUser:
         create_user_path = "user"
         data = {
             "username": username,
             "email": email,
             "password": password,
         }
-        headers = None
-        if autogenerated_token is not None:
-            headers = {
-                "x-bugout-installation-token": autogenerated_token,
-            }
+        headers = {}
+        if "headers" in kwargs.keys():
+            headers.update(kwargs["headers"])
         result = self._call(
             method=Method.post, path=create_user_path, headers=headers, data=data
         )
@@ -79,14 +77,14 @@ def find_user(
         self,
         username: str,
         token: Union[str, uuid.UUID] = None,
-        installation_token: str = None,
+        **kwargs: Dict[str, Any],
     ) -> BugoutUser:
         find_user_path = f"user/find?username={username}"
         headers = {}
         if token is not None:
             headers.update({"Authorization": f"Bearer {token}"})
-        if installation_token is not None:
-            headers.update({"x-bugout-installation-token": installation_token})
+        if "headers" in kwargs.keys():
+            headers.update(kwargs["headers"])
         result = self._call(method=Method.get, path=find_user_path, headers=headers)
         return BugoutUser(**result)