Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend userprofile endpoint with all data on the current user from Jupyter Server #510

Merged
merged 8 commits into from
Oct 25, 2023
Merged

Extend userprofile endpoint with all data on the current user from Jupyter Server #510

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0321b05
added all fields on current_user to endpoint
Oct 5, 2023
5e753c2
Logic to calc user initials if user not authed
Oct 10, 2023
f09c91e
flake8 amends
Oct 10, 2023
d6fb671
return empty string if user is not authenticated
Oct 11, 2023
2bbdbf4
review ammends - small refactor
Oct 11, 2023
065ad5e
ammends to initials logic
Oct 20, 2023
1a79546
fix merge conflict
Oct 20, 2023
cae0a91
review amends
Oct 23, 2023
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
30 changes: 22 additions & 8 deletions cylc/uiserver/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,27 @@ def _authorise(
return False


def get_username(handler: 'CylcAppHandler'):
def get_usernames(handler: 'CylcAppHandler'):
markgrahamdawson marked this conversation as resolved.
Show resolved Hide resolved
"""Return the username for the authenticated user.

If the handler is token authenticated, then we return the username of the
account that this server instance is running under.
"""
if is_token_authenticated(handler):
# the bearer of the token has full privileges
return ME
if ('.' in ME):
first_inital = ME.split('.')[0][0].upper()
last_initial = ME.split('.')[1][0].upper()
initials = first_inital + last_initial
else:
initials = ME[0].upper()
return {'name': ME, 'initials': initials, 'username': ME}
else:
return handler.current_user.username
return {
'name': handler.current_user.username,
'initials': '',
'username': handler.current_user.username
markgrahamdawson marked this conversation as resolved.
Show resolved Hide resolved
}


class CylcAppHandler(JupyterHandler):
Expand Down Expand Up @@ -246,9 +256,13 @@ def set_default_headers(self) -> None:
@web.authenticated
# @authorised TODO: I can't think why we would want to authorise this
def get(self):
user_info = {
'name': get_username(self)
}
user_info = dict(self.current_user.__dict__)

user_details = get_usernames(self)

user_info['name'] = user_details['name']
user_info['initials'] = user_details['initials']
user_info['username'] = user_details['username']
markgrahamdawson marked this conversation as resolved.
Show resolved Hide resolved

# add an entry for the workflow owner
# NOTE: when running behind a hub this may be different from the
Expand Down Expand Up @@ -316,7 +330,7 @@ def context(self):
'graphql_params': self.graphql_params,
'request': self.request,
'resolvers': self.resolvers,
'current_user': get_username(self),
'current_user': get_usernames(self)['username'],
}

@web.authenticated # type: ignore[arg-type]
Expand Down Expand Up @@ -384,7 +398,7 @@ def context(self):
return {
'request': self.request,
'resolvers': self.resolvers,
'current_user': get_username(self),
'current_user': get_usernames(self)['username'],
'ops_queue': {},
'sub_statuses': self.sub_statuses
}