Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions privx_api/api_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def get_api_proxy_status(self) -> PrivXAPIResponse:
PrivXAPIResponse
"""
response_status, data = self._http_get(UrlEnum.API_PROXY.STATUS)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_api_proxy_configuration(self) -> PrivXAPIResponse:
"""
Expand All @@ -26,7 +26,7 @@ def get_api_proxy_configuration(self) -> PrivXAPIResponse:
PrivXAPIResponse
"""
response_status, data = self._http_get(UrlEnum.API_PROXY.CONFIGURATION)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def create_api_target(self, api_target: dict) -> PrivXAPIResponse:
"""
Expand All @@ -39,7 +39,7 @@ def create_api_target(self, api_target: dict) -> PrivXAPIResponse:
UrlEnum.API_PROXY.API_TARGETS,
body=api_target,
)
return PrivXAPIResponse(response_status, HTTPStatus.CREATED, data)
return self._api_response(response_status, HTTPStatus.CREATED, data)

def get_api_targets(
self,
Expand All @@ -66,7 +66,7 @@ def get_api_targets(
UrlEnum.API_PROXY.API_TARGETS,
query_params=query_params,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_api_target(self, api_target_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -79,7 +79,7 @@ def get_api_target(self, api_target_id: str) -> PrivXAPIResponse:
UrlEnum.API_PROXY.API_TARGET,
path_params={"api_target_id": api_target_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def update_api_target(
self,
Expand All @@ -97,7 +97,7 @@ def update_api_target(
path_params={"api_target_id": api_target_id},
body=api_target,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def delete_api_target(self, api_target_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -110,7 +110,7 @@ def delete_api_target(self, api_target_id: str) -> PrivXAPIResponse:
UrlEnum.API_PROXY.API_TARGET,
path_params={"api_target_id": api_target_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def search_api_targets(
self,
Expand Down Expand Up @@ -139,7 +139,7 @@ def search_api_targets(
query_params=query_params,
body=get_value(search_payload, dict()),
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_api_target_tags(
self,
Expand All @@ -162,7 +162,7 @@ def get_api_target_tags(
UrlEnum.API_PROXY.API_TARGET_TAGS,
query_params=query_params,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def create_current_user_client_credential(
self,
Expand All @@ -178,7 +178,7 @@ def create_current_user_client_credential(
UrlEnum.API_PROXY.CURRENT_CLIENT_CREDENTIALS,
body=credential,
)
return PrivXAPIResponse(response_status, HTTPStatus.CREATED, data)
return self._api_response(response_status, HTTPStatus.CREATED, data)

def get_current_user_client_credentials(
self,
Expand All @@ -203,7 +203,7 @@ def get_current_user_client_credentials(
UrlEnum.API_PROXY.CURRENT_CLIENT_CREDENTIALS,
query_params=query_params,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_current_user_client_credential(
self,
Expand All @@ -219,7 +219,7 @@ def get_current_user_client_credential(
UrlEnum.API_PROXY.CURRENT_CLIENT_CREDENTIAL,
path_params={"credential_id": credential_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def update_current_user_client_credential(
self,
Expand All @@ -237,7 +237,7 @@ def update_current_user_client_credential(
path_params={"credential_id": credential_id},
body=credential,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def delete_current_user_client_credential(
self,
Expand All @@ -253,7 +253,7 @@ def delete_current_user_client_credential(
UrlEnum.API_PROXY.CURRENT_CLIENT_CREDENTIAL,
path_params={"credential_id": credential_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_current_user_client_credential_secret(
self,
Expand All @@ -269,7 +269,7 @@ def get_current_user_client_credential_secret(
UrlEnum.API_PROXY.CURRENT_CLIENT_CREDENTIAL_SECRET,
path_params={"credential_id": credential_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def create_user_client_credential(
self,
Expand All @@ -287,7 +287,7 @@ def create_user_client_credential(
path_params={"user_id": user_id},
body=credential,
)
return PrivXAPIResponse(response_status, HTTPStatus.CREATED, data)
return self._api_response(response_status, HTTPStatus.CREATED, data)

def get_user_client_credentials(
self,
Expand All @@ -314,7 +314,7 @@ def get_user_client_credentials(
path_params={"user_id": user_id},
query_params=query_params,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_user_client_credential(
self,
Expand All @@ -331,7 +331,7 @@ def get_user_client_credential(
UrlEnum.API_PROXY.USER_CLIENT_CREDENTIAL,
path_params={"user_id": user_id, "credential_id": credential_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def update_user_client_credential(
self,
Expand All @@ -350,7 +350,7 @@ def update_user_client_credential(
path_params={"user_id": user_id, "credential_id": credential_id},
body=credential,
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def delete_user_client_credential(
self,
Expand All @@ -367,7 +367,7 @@ def delete_user_client_credential(
UrlEnum.API_PROXY.USER_CLIENT_CREDENTIAL,
path_params={"user_id": user_id, "credential_id": credential_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_user_client_credential_secret(
self,
Expand All @@ -384,4 +384,4 @@ def get_user_client_credential_secret(
UrlEnum.API_PROXY.USER_CLIENT_CREDENTIAL_SECRET,
path_params={"user_id": user_id, "credential_id": credential_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)
28 changes: 14 additions & 14 deletions privx_api/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def get_auth_service_status(self) -> PrivXAPIResponse:
PrivXAPIResponse
"""
response_status, data = self._http_get(UrlEnum.AUTH.STATUS)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_idp_client(self, idp_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -43,7 +43,7 @@ def get_idp_client(self, idp_id: str) -> PrivXAPIResponse:
UrlEnum.AUTH.IDP_CLIENT,
path_params={"idp_id": idp_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def create_idp_client(self, idp_client: dict) -> PrivXAPIResponse:
"""
Expand All @@ -55,7 +55,7 @@ def create_idp_client(self, idp_client: dict) -> PrivXAPIResponse:
response_status, data = self._http_post(
UrlEnum.AUTH.IDP_CLIENTS, body=idp_client
)
return PrivXAPIResponse(response_status, HTTPStatus.CREATED, data)
return self._api_response(response_status, HTTPStatus.CREATED, data)

def update_idp_client(self, idp_id: str, idp_client: dict) -> PrivXAPIResponse:
"""
Expand All @@ -67,7 +67,7 @@ def update_idp_client(self, idp_id: str, idp_client: dict) -> PrivXAPIResponse:
response_status, data = self._http_put(
UrlEnum.AUTH.IDP_CLIENT, path_params={"idp_id": idp_id}, body=idp_client
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def delete_idp_client(self, idp_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -79,7 +79,7 @@ def delete_idp_client(self, idp_id: str) -> PrivXAPIResponse:
response_status, data = self._http_delete(
UrlEnum.AUTH.IDP_CLIENT, path_params={"idp_id": idp_id}
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def regenerate_idp_client_config(self, idp_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -92,7 +92,7 @@ def regenerate_idp_client_config(self, idp_id: str) -> PrivXAPIResponse:
response_status, data = self._http_post(
UrlEnum.AUTH.REGENERATE_IDP_CLIENT, path_params={"idp_id": idp_id}
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_user_sessions(
self,
Expand All @@ -117,7 +117,7 @@ def get_user_sessions(
query_params=search_params,
path_params={"user_id": user_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_source_sessions(
self,
Expand All @@ -142,7 +142,7 @@ def get_source_sessions(
query_params=search_params,
path_params={"source_id": source_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def search_sessions(
self,
Expand All @@ -167,7 +167,7 @@ def search_sessions(
query_params=search_params,
body=get_value(search_payload, dict()),
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def terminate_session(self, session_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -180,7 +180,7 @@ def terminate_session(self, session_id: str) -> PrivXAPIResponse:
UrlEnum.AUTH.TERMINATE_SESSION,
path_params={"session_id": session_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def terminate_user_sessions(self, user_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -193,7 +193,7 @@ def terminate_user_sessions(self, user_id: str) -> PrivXAPIResponse:
UrlEnum.AUTH.TERMINATE_USER_SESSIONS,
path_params={"user_id": user_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def logout(self) -> PrivXAPIResponse:
"""
Expand All @@ -203,7 +203,7 @@ def logout(self) -> PrivXAPIResponse:
PrivXAPIResponse
"""
response_status, data = self._http_post(UrlEnum.AUTH.LOGOUT)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def get_user_mobile_devices(self, user_id: str) -> PrivXAPIResponse:
"""
Expand All @@ -216,7 +216,7 @@ def get_user_mobile_devices(self, user_id: str) -> PrivXAPIResponse:
UrlEnum.AUTH.MGW_USER_DEVICES,
path_params={"user_id": user_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)

def unpair_user_mobile_device(
self, user_id: str, device_id: str
Expand All @@ -231,4 +231,4 @@ def unpair_user_mobile_device(
UrlEnum.AUTH.MGW_USER_DEVICES_UNPAIR,
path_params={"user_id": user_id, "device_id": device_id},
)
return PrivXAPIResponse(response_status, HTTPStatus.OK, data)
return self._api_response(response_status, HTTPStatus.OK, data)
Loading