Skip to content

Commit acc2296

Browse files
authored
Merge pull request #169 from ynput/enhancement/get-user-function
Chore: Added get user function
2 parents 2eaf97c + 3de0a2c commit acc2296

File tree

2 files changed

+32
-6
lines changed

2 files changed

+32
-6
lines changed

ayon_api/__init__.py

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
TransferProgress,
44
slugify_string,
55
create_dependency_package_basename,
6+
get_user_by_token,
7+
is_token_valid,
8+
validate_url,
9+
login_to_server,
610
)
711
from .server_api import (
812
RequestTypes,
@@ -230,6 +234,10 @@
230234
"TransferProgress",
231235
"slugify_string",
232236
"create_dependency_package_basename",
237+
"get_user_by_token",
238+
"is_token_valid",
239+
"validate_url",
240+
"login_to_server",
233241

234242
"RequestTypes",
235243
"ServerAPI",

ayon_api/utils.py

+24-6
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,8 @@ def logout_from_server(url, token, timeout=None):
349349
)
350350

351351

352-
def is_token_valid(url, token, timeout=None):
353-
"""Check if token is valid.
354-
355-
Token can be a user token or service api key.
352+
def get_user_by_token(url, token, timeout=None):
353+
"""Get user information by url and token.
356354
357355
Args:
358356
url (str): Server url.
@@ -361,7 +359,7 @@ def is_token_valid(url, token, timeout=None):
361359
'get_default_timeout' is used if not specified.
362360
363361
Returns:
364-
bool: True if token is valid.
362+
Optional[Dict[str, Any]]: User information if url and token are valid.
365363
366364
"""
367365
if timeout is None:
@@ -382,7 +380,27 @@ def is_token_valid(url, token, timeout=None):
382380
timeout=timeout,
383381
)
384382
if response.status_code == 200:
385-
return True
383+
return response.json()
384+
return None
385+
386+
387+
def is_token_valid(url, token, timeout=None):
388+
"""Check if token is valid.
389+
390+
Token can be a user token or service api key.
391+
392+
Args:
393+
url (str): Server url.
394+
token (str): User's token.
395+
timeout (Optional[float]): Timeout for request. Value from
396+
'get_default_timeout' is used if not specified.
397+
398+
Returns:
399+
bool: True if token is valid.
400+
401+
"""
402+
if get_user_by_token(url, token, timeout=timeout):
403+
return True
386404
return False
387405

388406

0 commit comments

Comments
 (0)