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

Allow discover by userid - issue 28517 Closes #28517 See merge request !12314

Merge branch '28517-discover-by-userid' into 'master'
026455cf · Douwe Maan · 4f03adf2 · 02ad2841 · 026455cf
Commit 026455cf authored Jun 20, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

internal.rb lib/api/internal.rb +8 -3

No files found.
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -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