Skip to content
Merged
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
26 changes: 13 additions & 13 deletions ayon_api/server_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ def raise_for_status(self, message=None):
raise ServerError(self._data["detail"])
raise ValueError("Response is not available.")

if self.status_code == 401:
raise UnauthorizedError("Missing or invalid authentication token")
try:
self._response.raise_for_status()
except requests.exceptions.HTTPError as exc:
Expand Down Expand Up @@ -915,6 +917,7 @@ def get_info(self):
"""

response = self.get("info")
response.raise_for_status()
return response.data

def get_server_version(self):
Expand Down Expand Up @@ -983,7 +986,9 @@ def _get_user_info(self):

if self._access_token_is_service is not None:
response = self.get("users/me")
return response.data
if response.status == 200:
return response.data
return None

self._access_token_is_service = False
response = self.get("users/me")
Expand Down Expand Up @@ -1031,17 +1036,15 @@ def get_users(self, usernames=None, fields=None):
yield user

def get_user(self, username=None):
output = None
if username is None:
output = self._get_user_info()
else:
response = self.get("users/{}".format(username))
if response.status == 200:
output = response.data
if output is None:
raise UnauthorizedError("User is not authorized.")
return output

if output is None:
raise UnauthorizedError("User is not authorized.")
return output
response = self.get("users/{}".format(username))
response.raise_for_status()
return response.data

def get_headers(self, content_type=None):
if content_type is None:
Expand Down Expand Up @@ -1856,10 +1859,7 @@ def get_attributes_schema(self, use_cache=True):

if self._attributes_schema is None:
result = self.get("attributes")
if result.status_code != 200:
raise UnauthorizedError(
"User must be authorized to receive attributes"
)
result.raise_for_status()
self._attributes_schema = result.data
return copy.deepcopy(self._attributes_schema)

Expand Down