X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/44ac569d286ce1159f49b2cded184ff0cc4475f5..423ae5f8e048c91c00d7c46c05c7b529cbe2f9c7:/app/controllers/api/permissions_controller.rb diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb index 07685ed68..d7fb92ae6 100644 --- 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 - before_action :check_api_readable before_action :setup_user_auth before_action :set_request_formats around_action :api_call_handle_error, :api_call_timeout @@ -15,10 +14,8 @@ module Api 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 + Oauth.scopes.map { |s| :"allow_#{s.name}" } else [] end