cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove nil ApiCapability user branch

Browse source
This commit is contained in:
Anton Khorev 2024-09-05 23:21:24 +03:00
parent ccc70fb914
commit e7fb89c8d0
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/abilities/api_capability.rb
View file

@ -5,7 +5,7 @@ class ApiCapability
def initialize(token) def initialize(token)
if Settings.status != "database_offline" if Settings.status != "database_offline"
user = (User.find(token.resource_owner_id) if token.respond_to?(:resource_owner_id)) user = User.find(token.resource_owner_id)
if user&.active? if user&.active?
can [:create, :comment, :close, :reopen], Note if scope?(token, :write_notes) can [:create, :comment, :close, :reopen], Note if scope?(token, :write_notes)

6
test/abilities/api_capability_test.rb
View file

@ -88,12 +88,6 @@ end
class UserApiCapabilityTest < ActiveSupport::TestCase class UserApiCapabilityTest < ActiveSupport::TestCase
test "user preferences" do test "user preferences" do
# a user with no tokens
capability = ApiCapability.new nil
[:index, :show, :update_all, :update, :destroy].each do |act|
assert capability.cannot? act, UserPreference
end
# A user with empty tokens # A user with empty tokens
token = create(:oauth_access_token) token = create(:oauth_access_token)
capability = ApiCapability.new token capability = ApiCapability.new token