Fix padding

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 002bd73b881fef24dfe07acbd40581a161665ff9..5e75c731e9be85a1cbded6614815e4b688b54a3c 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -2,6 +2,7 @@ class ApiController < ApplicationController
 
   skip_before_filter :verify_authenticity_token
   before_filter :check_api_readable, :except => [:capabilities]
 
   skip_before_filter :verify_authenticity_token
   before_filter :check_api_readable, :except => [:capabilities]

+  before_filter :setup_user_auth, :only => [:permissions]

   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 


@@ -284,9 +285,30 @@ class ApiController < ApplicationController
     timeout = XML::Node.new 'timeout'
     timeout['seconds'] = API_TIMEOUT.to_s
     api << timeout
     timeout = XML::Node.new 'timeout'
     timeout['seconds'] = API_TIMEOUT.to_s
     api << timeout

-    
+    status = XML::Node.new 'status'
+    status['database'] = database_status.to_s
+    status['api'] = api_status.to_s
+    status['gpx'] = gpx_status.to_s
+    api << status
+

     doc.root << api
 
     render :text => doc.to_s, :content_type => "text/xml"
   end
     doc.root << api
 
     render :text => doc.to_s, :content_type => "text/xml"
   end

+
+  # External apps that use the api are able to query which permissions
+  # they have. This currently returns a list of permissions granted to the current user:
+  # * if authenticated via OAuth, this list will contain all permissions granted by the user to the access_token.
+  # * if authenticated via basic auth all permissions are granted, so the list will contain all permissions.
+  # * unauthenticated users have no permissions, so the list will be empty.
+  def permissions
+    @permissions = case
+                   when current_token.present?
+                     ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
+                   when @user
+                     ClientApplication.all_permissions
+                   else
+                     []
+                   end
+  end

 end
 end