mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pykanidm: Make a little dry. (#3281)

Browse source 
* pykanidm: Make a little dry
This commit is contained in:
George Wu 2024-12-08 20:50:20 -08:00 committed by GitHub
parent 5dfbf7ca79
commit cae780e091
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pykanidm/kanidm/__init__.py
View file

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