From cae780e0912d63dba05eccc907dbb6b35cc75bd1 Mon Sep 17 00:00:00 2001
From: George Wu <gbw@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:50:20 -0800
Subject: [PATCH] pykanidm: Make a little dry. (#3281)

* pykanidm: Make a little dry
---
 pykanidm/kanidm/__init__.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pykanidm/kanidm/__init__.py b/pykanidm/kanidm/__init__.py
index ece21d27e..e70fb82e8 100644
--- a/pykanidm/kanidm/__init__.py
+++ b/pykanidm/kanidm/__init__.py
@@ -143,7 +143,6 @@ class KanidmClient:
                     self.logger.debug("Setting up SSL context with CA path=%s", self.config.ca_path)
                     self._ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH, cafile=self.config.ca_path)
             else:
-
                 logging.debug("Setting up default SSL context")
                 self._ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH)
 
@@ -527,9 +526,7 @@ class KanidmClient:
         """get an OAuth2 client"""
         endpoint = f"{Endpoints.OAUTH2}/{rs_name}"
         response: ClientResponse[IOauth2Rs] = await self.call_get(endpoint)
-        if response.status_code != 200:
-            raise ValueError(f"Failed to get oauth2 resource server: {response.content}")
-        if response.data is None:
+        if response.status_code != 200 or response.data is None:
             raise ValueError(f"Failed to get oauth2 resource server: {response.content}")
         return RawOAuth2Rs(**response.data).as_oauth2_rs
 
@@ -589,9 +586,7 @@ class KanidmClient:
         """Get a service account"""
         endpoint = f"{Endpoints.SERVICE_ACCOUNT}/{name}"
         response: ClientResponse[IServiceAccount] = await self.call_get(endpoint)
-        if response.status_code != 200:
-            raise ValueError(f"Failed to get service account: {response.content}")
-        if response.data is None:
+        if response.status_code != 200 or response.data is None:
             raise ValueError(f"Failed to get service account: {response.content}")
         return RawServiceAccount(**response.data).as_service_account
 
@@ -678,9 +673,7 @@ class KanidmClient:
         """Get a group"""
         endpoint = f"{Endpoints.GROUP}/{name}"
         response: ClientResponse[IGroup] = await self.call_get(endpoint)
-        if response.status_code != 200:
-            raise ValueError(f"Failed to get group: {response.content}")
-        if response.data is None:
+        if response.status_code != 200 or response.data is None:
             raise ValueError(f"Failed to get group: {response.content}")
         return RawGroup(**response.data).as_group
 
@@ -725,9 +718,7 @@ class KanidmClient:
         """Get a person by name"""
         endpoint = f"{Endpoints.PERSON}/{name}"
         response: ClientResponse[IPerson] = await self.call_get(endpoint)
-        if response.status_code != 200:
-            raise ValueError(f"Failed to get person: {response.content}")
-        if response.data is None:
+        if response.status_code != 200 or response.data is None:
             raise ValueError(f"Failed to get person: {response.content}")
         return RawPerson(**response.data).as_person
 
@@ -778,9 +769,7 @@ class KanidmClient:
             endpoint = f"{endpoint}/{ttl}"
 
         response: ClientResponse[Any] = await self.call_get(endpoint)
-        if response.content is None:
-            raise ValueError(f"Failed to get token: {response.content}")
-        if response.status_code != 200:
+        if response.status_code != 200 or response.content is None:
             raise ValueError(f"Failed to get token: {response.content}")
         token = PersonCredentialResetToken.model_validate(json_lib.loads(response.content))