X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bb07e29ec7c178757f3c94eea84935a554d812d..87ea9fcb021b9b67a79d35cb719a064a34a7784d:/app/controllers/api/permissions_controller.rb?ds=sidebyside diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb index 15f381267..73b84f8ed 100644 --- a/app/controllers/api/permissions_controller.rb +++ b/app/controllers/api/permissions_controller.rb @@ -1,7 +1,5 @@ module Api class PermissionsController < ApiController - before_action :api_deny_access_handler - authorize_resource :class => false before_action :check_api_readable @@ -14,7 +12,9 @@ module Api # * 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 current_token.present? + @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