Merge branch 'pull/5228'

[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 07685ed6806546e58a795f7cdb74ba61774e9be5..637aa36a0342caf017254f3baa3203c7b0d235e0 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -2,7 +2,6 @@ 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 :set_request_formats
     around_action :api_call_handle_error, :api_call_timeout
     before_action :setup_user_auth
     before_action :set_request_formats
     around_action :api_call_handle_error, :api_call_timeout


@@ -10,15 +9,10 @@ module Api
     # 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.
     # 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 show
       @permissions = if doorkeeper_token.present?
                        doorkeeper_token.scopes.map { |s| :"allow_#{s}" }
     # * unauthenticated users have no permissions, so the list will be empty.
     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
-                       ClientApplication.all_permissions

                      else
                        []
                      end
                      else
                        []
                      end