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

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 074a7f95d8bf0907cb20929c5d34dd05364c31ff..4876380d0dd272e708f0180be8b3df13d3d9c88a 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -8,37 +8,37 @@ class ApiAbility
     can :index, :change
     can :index, :map
     can :show, :permission
     can :index, :change
     can :index, :map
     can :show, :permission

-    can [:search_all, :search_nodes, :search_ways, :search_relations], :search
-    can [:trackpoints], :swf
+    can :show, :version

 
     if Settings.status != "database_offline"
       can [:show, :download, :query], Changeset
 
     if Settings.status != "database_offline"
       can [:show, :download, :query], Changeset

-      can [:index, :create, :comment, :feed, :show, :search], Note
+      can [:index, :create, :feed, :show, :search], Note

       can :index, Tracepoint
       can :index, Tracepoint

-      can [:api_users, :api_read], User
+      can [:index, :show], User

       can [:index, :show], Node
       can [:index, :show, :full, :ways_for_node], Way
       can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
       can [:history, :version], OldNode
       can [:history, :version], OldWay
       can [:history, :version], OldRelation
       can [:index, :show], Node
       can [:index, :show, :full, :ways_for_node], Way
       can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
       can [:history, :version], OldNode
       can [:history, :version], OldWay
       can [:history, :version], OldRelation

+      can [:show], UserBlock

     end
 
     end
 

-    if user
+    if user&.active?

       can :welcome, :site
       can [:revoke, :authorize], :oauth
 
       if Settings.status != "database_offline"
         can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
       can :welcome, :site
       can [:revoke, :authorize], :oauth
 
       if Settings.status != "database_offline"
         can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message

-        can [:close, :reopen], Note
+        can [:comment, :close, :reopen], Note

         can [:new, :create], Report
         can [:create, :show, :update, :destroy, :data], Trace
         can [:new, :create], Report
         can [:create, :show, :update, :destroy, :data], Trace

-        can [:api_details, :api_gpx_files], User
-        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
+        can [:details, :gpx_files], User
+        can [:index, :show, :update, :update_all, :destroy], UserPreference

 
         if user.terms_agreed?
 
         if user.terms_agreed?

-          can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
+          can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset

           can :create, ChangesetComment
           can [:create, :update, :delete], Node
           can [:create, :update, :delete], Way
           can :create, ChangesetComment
           can [:create, :update, :delete], Node
           can [:create, :update, :delete], Way