X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/899fc66a62b036adcfd59f5da80c7fc6f30cd3a8..22946d703a1186d0ec7fb18a663f73855bb49546:/app/controllers/api/users_controller.rb

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index d765b4904..9da9d3226 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,28 +1,16 @@
 module Api
   class UsersController < ApiController
-    layout "site", :except => [:api_details]
-
+    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]
 
-    def show
-      if @user.visible?
-        render :content_type => "text/xml"
-      else
-        head :gone
-      end
-    end
-
-    def details
-      @user = current_user
-      render :action => :show, :content_type => "text/xml"
-    end
+    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"]
@@ -33,15 +21,37 @@ 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
-      doc = OSM::API.new.get_xml_doc
-      current_user.traces.reload.each do |trace|
-        doc.root << trace.to_xml_node
+    def show
+      if @user.visible?
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end
+      else
+        head :gone
       end
-      render :xml => doc.to_s
+    end
+
+    def details
+      @user = current_user
+      # Render the result
+      respond_to do |format|
+        format.xml { render :show }
+        format.json { render :show }
+      end
+    end
+
+    def gpx_files
+      @traces = current_user.traces.reload
+      render :content_type => "application/xml"
     end
 
     private