From e8756907039de8fa9f3a2c571c987982d716bc54 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Mon, 25 Apr 2016 11:05:13 -0400 Subject: [PATCH] add TS API to check current user --- lib/galaxy/webapps/tool_shed/api/users.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/tool_shed/api/users.py b/lib/galaxy/webapps/tool_shed/api/users.py index c16c03917e2..274c135cb7d 100644 --- a/lib/galaxy/webapps/tool_shed/api/users.py +++ b/lib/galaxy/webapps/tool_shed/api/users.py @@ -95,12 +95,18 @@ class UsersController( BaseAPIController ): def show( self, trans, id, **kwd ): """ GET /api/users/{encoded_user_id} + GET /api/users/current Returns a dictionary of information about a user. :param id: the encoded id of the User object. """ - # Example URL: http://localhost:9009/api/users/f9cad7b01a472135 - user = suc.get_user( trans.app, id ) + 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 ) + if user is None: user_dict = dict( message='Unable to locate user record for id %s.' % ( str( id ) ), status='error' )