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

[rails.git] / app / abilities / capability.rb

diff --git a/app/abilities/capability.rb b/app/abilities/capability.rb
index 6aa1c418ca8f0ffbc624b3b38158ba9fc7f5792e..d8f51eefea7562e723fb5a3ac47005a994d77f8a 100644 (file)
--- a/app/abilities/capability.rb
+++ b/app/abilities/capability.rb
@@ -4,16 +4,30 @@ class Capability
   include CanCan::Ability
 
   def initialize(token)
   include CanCan::Ability
 
   def initialize(token)

-    can :create, ChangesetComment if capability?(token, :allow_write_api)

     can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)
     can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)

+    can [:api_read, :api_data], Trace if capability?(token, :allow_read_gpx)
+    can [:api_create, :api_update, :api_delete], Trace if capability?(token, :allow_write_gpx)

     can [:api_details], User if capability?(token, :allow_read_prefs)
     can [:api_gpx_files], User if capability?(token, :allow_read_gpx)
     can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
     can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
 
     can [:api_details], User if capability?(token, :allow_read_prefs)
     can [:api_gpx_files], User if capability?(token, :allow_read_gpx)
     can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
     can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
 

+    if token&.user&.terms_agreed?
+      can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset if capability?(token, :allow_write_api)
+      can :create, ChangesetComment if capability?(token, :allow_write_api)
+      can [:create, :update, :delete], Node if capability?(token, :allow_write_api)
+      can [:create, :update, :delete], Way if capability?(token, :allow_write_api)
+      can [:create, :update, :delete], Relation if capability?(token, :allow_write_api)
+    end
+

     if token&.user&.moderator?
       can [:destroy, :restore], ChangesetComment if capability?(token, :allow_write_api)
       can :destroy, Note if capability?(token, :allow_write_notes)
     if token&.user&.moderator?
       can [:destroy, :restore], ChangesetComment if capability?(token, :allow_write_api)
       can :destroy, Note if capability?(token, :allow_write_notes)

+      if token&.user&.terms_agreed?
+        can :redact, OldNode if capability?(token, :allow_write_api)
+        can :redact, OldWay if capability?(token, :allow_write_api)
+        can :redact, OldRelation if capability?(token, :allow_write_api)
+      end

     end
   end
 
     end
   end