Merge branch '28517-discover-by-userid' into 'master'

Allow discover by userid - issue 28517

Closes #28517

See merge request !12314
This commit is contained in:
Douwe Maan 2017-06-20 17:07:25 +00:00
commit 026455cf3a
1 changed files with 8 additions and 3 deletions

View File

@ -71,11 +71,16 @@ module API
end
#
# Discover user by ssh key
# Discover user by ssh key or user id
#
get "/discover" do
key = Key.find(params[:key_id])
present key.user, with: Entities::UserSafe
if params[:key_id]
key = Key.find(params[:key_id])
user = key.user
elsif params[:user_id]
user = User.find_by(id: params[:user_id])
end
present user, with: Entities::UserSafe
end
get "/check" do