From 52ceb8b23e6dd5d395890516d062339487696bd0 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sun, 22 Mar 2020 14:03:27 +0100 Subject: [PATCH] Prevent exception in toolshed if userid is 'current' and the user is not already logged in (=trans.user is None). Fixes https://sentry.galaxyproject.org/sentry/toolshed/issues/568664/ --- lib/tool_shed/webapp/api/users.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/tool_shed/webapp/api/users.py b/lib/tool_shed/webapp/api/users.py index 1216052904e..bb4b4314552 100644 --- a/lib/tool_shed/webapp/api/users.py +++ b/lib/tool_shed/webapp/api/users.py @@ -106,11 +106,7 @@ class UsersController(BaseAPIController): """ user = None # user is requesting data about themselves - if id == "current" and trans.user: - user = trans.user - else: - user = suc.get_user(trans.app, id) - + user = trans.user if id == 'current' else suc.get_user(trans.app, id) if user is None: user_dict = dict(message='Unable to locate user record for id %s.' % (str(id)), status='error')