Merge remote-tracking branch 'upstream/pull/5499'

[rails.git] / app / controllers / api / users_controller.rb

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index b4a2efc7c3043fd06d9aee6b7deaaa76dab6f59a..462b4ba3c48f8ae0ea5f37af172e28c79d68fd3d 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,15 +1,30 @@
 module Api
   class UsersController < ApiController
     before_action :disable_terms_redirect, :only => [:details]
 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, :only => [:details]

 
     authorize_resource
 
 
     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]
+    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"]
+
+      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?
 
     def show
       if @user.visible?


@@ -32,37 +47,8 @@ module Api
       end
     end
 
       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"
-    end
-

     private
 
     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.
     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.