Merge branch 'pull/3472'

[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..a452cb9301ead6467f3c8ed6852156c55ba71e56 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,6 +1,7 @@
 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 :setup_user_auth, :only => [:show, :index]

     before_action :authorize, :only => [:details, :gpx_files]
 
     authorize_resource
     before_action :authorize, :only => [:details, :gpx_files]
 
     authorize_resource


@@ -9,9 +10,15 @@ module Api
     around_action :api_call_handle_error
     before_action :lookup_user_by_id, :only => [:show]
 
     around_action :api_call_handle_error
     before_action :lookup_user_by_id, :only => [:show]
 

+    before_action :set_request_formats, :except => [:gpx_files]
+

     def show
       if @user.visible?
     def show
       if @user.visible?

-        render :content_type => "text/xml"
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -19,7 +26,11 @@ module Api
 
     def details
       @user = current_user
 
     def details
       @user = current_user

-      render :action => :show, :content_type => "text/xml"
+      # Render the result
+      respond_to do |format|
+        format.xml { render :show }
+        format.json { render :show }
+      end

     end
 
     def index
     end
 
     def index


@@ -31,7 +42,11 @@ module Api
 
       @users = User.visible.find(ids)
 
 
       @users = User.visible.find(ids)
 

-      render :content_type => "text/xml"
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     def gpx_files
     end
 
     def gpx_files