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

[rails.git] / app / controllers / api / permissions_controller.rb

diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb
index 73b84f8edf341933483a9ee68341f9a2ec94b984..d7fb92ae6aebc9531afd7b6a2a159a8812a3b3f0 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -2,8 +2,8 @@ module Api
   class PermissionsController < ApiController
     authorize_resource :class => false
 
   class PermissionsController < ApiController
     authorize_resource :class => false
 

-    before_action :check_api_readable

     before_action :setup_user_auth
     before_action :setup_user_auth

+    before_action :set_request_formats

     around_action :api_call_handle_error, :api_call_timeout
 
     # External apps that use the api are able to query which permissions
     around_action :api_call_handle_error, :api_call_timeout
 
     # External apps that use the api are able to query which permissions


@@ -14,13 +14,16 @@ module Api
     def show
       @permissions = if doorkeeper_token.present?
                        doorkeeper_token.scopes.map { |s| :"allow_#{s}" }
     def show
       @permissions = if doorkeeper_token.present?
                        doorkeeper_token.scopes.map { |s| :"allow_#{s}" }

-                     elsif current_token.present?
-                       ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }

                      elsif current_user
                      elsif current_user

-                       ClientApplication.all_permissions
+                       Oauth.scopes.map { |s| :"allow_#{s.name}" }

                      else
                        []
                      end
                      else
                        []
                      end

+
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
   end
 end
     end
   end
 end