Merge pull request #12 from bugout-dev/user_integrations

Handlers for user integrations

Author: zomglings

bugout/__init__.py

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

bugout/app.py

@@ -76,6 +76,18 @@ def get_user_by_id(
         self.user.timeout = timeout
         return self.user.get_user_by_id(token=token, user_id=user_id)
 
+    def find_user(
+        self,
+        username: str,
+        token: Union[str, uuid.UUID] = None,
+        installation_token: str = None,
+        timeout: float = REQUESTS_TIMEOUT,
+    ) -> data.BugoutUser:
+        self.user.timeout = timeout
+        return self.user.find_user(
+            username=username, token=token, installation_token=installation_token
+        )
+
     def confirm_email(
         self,
         token: Union[str, uuid.UUID],
@@ -185,6 +197,16 @@ def get_group(
         self.group.timeout = timeout
         return self.group.get_group(token=token, group_id=group_id)
 
+    def find_group(
+        self,
+        group_id: Optional[Union[str, uuid.UUID]] = None,
+        name: Optional[str] = None,
+        token: Union[str, uuid.UUID] = None,
+        timeout: float = REQUESTS_TIMEOUT,
+    ) -> data.BugoutGroup:
+        self.user.timeout = timeout
+        return self.group.find_group(group_id=group_id, name=name, token=token)
+
     def get_user_groups(
         self, token: Union[str, uuid.UUID], timeout: float = REQUESTS_TIMEOUT
     ) -> data.BugoutUserGroups:

bugout/data.py

@@ -36,12 +36,12 @@ class HolderType(Enum):
 class BugoutUser(BaseModel):
     id: uuid.UUID = Field(alias="user_id")
     username: str
-    email: str
-    normalized_email: str
-    verified: bool
-    autogenerated: bool
-    created_at: datetime
-    updated_at: datetime
+    email: Optional[str]
+    normalized_email: Optional[str]
+    verified: Optional[bool]
+    autogenerated: Optional[bool]
+    created_at: Optional[datetime]
+    updated_at: Optional[datetime]
 
 
 class BugoutUserShort(BaseModel):

bugout/group.py

@@ -47,6 +47,25 @@ def get_group(
         result = self._call(method=Method.get, path=get_group_path, headers=headers)
         return BugoutGroup(**result)
 
+    def find_group(
+        self,
+        group_id: Optional[Union[str, uuid.UUID]] = None,
+        name: Optional[str] = None,
+        token: Union[str, uuid.UUID] = None,
+    ) -> BugoutGroup:
+        find_group_path = f"group/find"
+        if group_id is not None and name is None:
+            find_group_path += f"?group_id={group_id}"
+        elif group_id is None and name is not None:
+            find_group_path += f"?name={name}"
+        elif group_id is not None and name is not None:
+            find_group_path += f"?group_id={group_id}&name={name}"
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        result = self._call(method=Method.get, path=find_group_path, headers=headers)
+        return BugoutGroup(**result)
+
     def get_user_groups(self, token: Union[str, uuid.UUID]) -> BugoutUserGroups:
         get_user_groups_path = "groups"
         headers = {

bugout/user.py

@@ -75,6 +75,21 @@ def get_user_by_id(
         )
         return BugoutUser(**result)
 
+    def find_user(
+        self,
+        username: str,
+        token: Union[str, uuid.UUID] = None,
+        installation_token: str = None,
+    ) -> 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})
+        result = self._call(method=Method.get, path=find_user_path, headers=headers)
+        return BugoutUser(**result)
+
     def confirm_email(
         self, token: Union[str, uuid.UUID], verification_code: str
     ) -> BugoutUser: