diff options
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 7 | ||||
| -rw-r--r-- | lib/api/internal.rb | 11 | ||||
| -rw-r--r-- | lib/api/users.rb | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8bce79529e6..412443a2405 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -43,12 +43,9 @@ module API expose :external end - class UserWithAdmin < UserPublic - expose :admin?, as: :is_admin - end - - class UserWithPrivateDetails < UserWithAdmin + class UserWithPrivateDetails < UserPublic expose :private_token + expose :admin?, as: :is_admin end class Email < Grape::Entity diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 479ee16a611..9ec418edea4 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -71,16 +71,11 @@ module API end # - # Discover user by ssh key or user id + # Discover user by ssh key # get "/discover" do - 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 + key = Key.find(params[:key_id]) + present key.user, with: Entities::UserSafe end get "/check" do diff --git a/lib/api/users.rb b/lib/api/users.rb index bfb69d6dc18..7257ecb5b67 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -59,7 +59,7 @@ module API users = UsersFinder.new(current_user, params).execute - entity = current_user.admin? ? Entities::UserWithAdmin : Entities::UserBasic + entity = current_user.admin? ? Entities::UserPublic : Entities::UserBasic present paginate(users), with: entity end |