Stop using session flash to communicate with callbacks

[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 a452cb9301ead6467f3c8ed6852156c55ba71e56..58b02a48941feab848f7466558d2f9d4d31a38e3 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,16 +1,29 @@
 module Api
   class UsersController < ApiController
 module Api
   class UsersController < ApiController

-    before_action :disable_terms_redirect, :only => [:details]

     before_action :setup_user_auth, :only => [:show, :index]
     before_action :setup_user_auth, :only => [:show, :index]

-    before_action :authorize, :only => [:details, :gpx_files]
+    before_action -> { authorize(:skip_terms => true) }, :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,43 +45,5 @@ module Api
         format.json { render :show }
       end
     end
         format.json { render :show }
       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
-
-    ##
-    # 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.
-      # it's .now so that this doesn't propagate to other pages.
-      flash.now[:skip_terms] = true
-    end

   end
 end
   end
 end