X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..0babf982564e1dd1e096cbae09d62436729f703a:/app/controllers/api/users_controller.rb?ds=sidebyside diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index b4a2efc7c..e9f42e12b 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -1,16 +1,31 @@ module Api class UsersController < ApiController before_action :disable_terms_redirect, :only => [:details] + before_action :setup_user_auth, :only => [:show, :index] before_action :authorize, :only => [:details, :gpx_files] authorize_resource - before_action :check_api_readable - around_action :api_call_handle_error - before_action :lookup_user_by_id, :only => [:show] + load_resource :only => :show before_action :set_request_formats, :except => [:gpx_files] + def index + raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"] + + ids = params["users"].split(",").collect(&:to_i) + + raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty? + + @users = User.visible.where(:id => ids).in_order_of(:id, ids) + + # Render the result + respond_to do |format| + format.xml + format.json + end + end + def show if @user.visible? # Render the result @@ -32,22 +47,6 @@ module Api end end - def index - raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"] - - ids = params["users"].split(",").collect(&:to_i) - - raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty? - - @users = User.visible.find(ids) - - # Render the result - respond_to do |format| - format.xml - format.json - end - end - def gpx_files @traces = current_user.traces.reload render :content_type => "application/xml" @@ -55,14 +54,6 @@ module Api private - ## - # ensure that there is a "user" instance variable - def lookup_user_by_id - @user = User.find(params[:id]) - end - - ## - # def disable_terms_redirect # this is necessary otherwise going to the user terms page, when # having not agreed already would cause an infinite redirect loop.