X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/efa2c20bff4d68cfdaf5fc532ba5eb0711e7cd2d..5047ec403db94b0d371a9a10b56801bc0a3fcf0a:/app/controllers/api/users_controller.rb

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index d97e8774e..58b02a489 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,26 +1,13 @@
 module Api
   class UsersController < ApiController
-    before_action :disable_terms_redirect, :only => [:details]
-    before_action :authorize, :only => [:details, :gpx_files]
+    before_action :setup_user_auth, :only => [:show, :index]
+    before_action -> { authorize(:skip_terms => true) }, :only => [:details]
 
     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
 
-    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
 
     def index
       raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]
@@ -29,31 +16,34 @@ module Api
 
       raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
 
-      @users = User.visible.find(ids)
-
-      render :content_type => "text/xml"
-    end
+      @users = User.visible.where(:id => ids).in_order_of(:id, ids)
 
-    def gpx_files
-      @traces = current_user.traces.reload
-      render :content_type => "application/xml"
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
 
-    private
-
-    ##
-    # ensure that there is a "user" instance variable
-    def lookup_user_by_id
-      @user = User.find(params[:id])
+    def show
+      if @user.visible?
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end
+      else
+        head :gone
+      end
     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.
-      # it's .now so that this doesn't propagate to other pages.
-      flash.now[:skip_terms] = true
+    def details
+      @user = current_user
+      # Render the result
+      respond_to do |format|
+        format.xml { render :show }
+        format.json { render :show }
+      end
     end
   end
 end