X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3a43f9fe0421afdf74d2f570ee8987a4022519cf..e409e83b4886ce918c64f5c4cd7fa30cbc1ba14f:/app/controllers/api/users_controller.rb?ds=inline diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index d97e8774e..d4baf4a82 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -1,17 +1,24 @@ module Api class UsersController < ApiController + before_action :check_api_readable 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] + before_action :set_request_formats, :except => [:gpx_files] + def show if @user.visible? - render :content_type => "text/xml" + # Render the result + respond_to do |format| + format.xml + format.json + end else head :gone end @@ -19,7 +26,11 @@ module Api def details @user = current_user - render :action => :show, :content_type => "text/xml" + # Render the result + respond_to do |format| + format.xml { render :show } + format.json { render :show } + end end def index @@ -31,7 +42,11 @@ module Api @users = User.visible.find(ids) - render :content_type => "text/xml" + # Render the result + respond_to do |format| + format.xml + format.json + end end def gpx_files