JSON output, handle Accept header

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 511748d8d6775ab4d3b1080ae1398a7d2b7404e8..7599568af225e2d35e1f16cd3fa58e531353cb6d 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,6 +3,13 @@ class ApiController < ApplicationController
 
   private
 
+  # Set format to xml unless client requires a specific format
+  def default_format_xml
+    unless params[:format]
+      request.format = "xml" unless request.format.symbol == :json
+    end
+  end
+
   def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
     # make the current_user object from any auth sources we have
     setup_user_auth
@@ -12,7 +19,16 @@ class ApiController < ApplicationController
       # no auth, the user does not exist or the password was wrong
       response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
       render :plain => errormessage, :status => :unauthorized
-      return false
+      false
+    end
+  end
+
+  def current_ability
+    # Use capabilities from the oauth token if it exists and is a valid access token
+    if Authenticator.new(self, [:token]).allow?
+      ApiAbility.new(nil).merge(ApiCapability.new(current_token))
+    else
+      ApiAbility.new(current_user)
     end
   end
 
@@ -32,7 +48,7 @@ class ApiController < ApplicationController
 
   def gpx_status
     status = database_status
-    status = :offline if status == :online && Settings.status == "gpx_offline"
+    status = "offline" if status == "online" && Settings.status == "gpx_offline"
     status
   end