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

[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 d97e8774ecd7a5641f8cc94e301c9fef0ad3386d..9da9d32266fd9860f0577626ffdd4c73d1ecf66f 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,26 +1,16 @@
 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]
 
     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"]
@@ -31,7 +21,32 @@ 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 show
+      if @user.visible?
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end
+      else
+        head :gone
+      end
+    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