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

[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 6fa47095a16f9c062ba246100bea989ff7dd9ecb..58b02a48941feab848f7466558d2f9d4d31a38e3 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,16 +1,13 @@
 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]
+    before_action -> { authorize(:skip_terms => true) }, :only => [:details]
 
     authorize_resource
 
-    around_action :api_call_handle_error
     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"]
@@ -48,19 +45,5 @@ module Api
         format.json { render :show }
       end
     end
-
-    def gpx_files
-      @traces = current_user.traces.reload
-      render :content_type => "application/xml"
-    end
-
-    private
-
-    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