Replace show and index abilities with read ability

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 9b274ec845d299f2ee6af894e80cb0f3ac0dac3a..36cfee0bbd7c997970d79ead0722b93c0964fc1c 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -4,55 +4,36 @@ class ApiAbility
   include CanCan::Ability
 
   def initialize(user)
   include CanCan::Ability
 
   def initialize(user)

-    can :show, :capability
-    can :index, :change
-    can :index, :map
-    can :show, :permission
-    can :show, :version
+    can :read, [:version, :capability, :permission, :map]

 
     if Settings.status != "database_offline"
 
     if Settings.status != "database_offline"

-      can [:show, :download, :query], Changeset
-      can [:index, :create, :comment, :feed, :show, :search], Note
-      can :index, Tracepoint
-      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
-    end
-
-    if user&.active?
-      can :welcome, :site
-      can [:revoke, :authorize], :oauth
+      can [:read, :download], Changeset
+      can [:read, :create, :feed, :search], Note
+      can :read, Tracepoint
+      can :read, User
+      can :read, Node
+      can [:read, :full, :ways_for_node], Way
+      can [:read, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
+      can [:history, :read], [OldNode, OldWay, OldRelation]
+      can :read, UserBlock

 
 

-      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 [:new, :create], Report
-        can [:create, :show, :update, :destroy, :data], Trace
+      if user&.active?
+        can [:comment, :close, :reopen], Note
+        can [:read, :create, :update, :destroy], Trace

         can [:details, :gpx_files], User
         can [:details, :gpx_files], User

-        can [:index, :show, :update, :update_all, :destroy], UserPreference
+        can [:read, :update, :update_all, :destroy], UserPreference

 
         if user.terms_agreed?
           can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
           can :create, ChangesetComment
 
         if user.terms_agreed?
           can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
           can :create, ChangesetComment

-          can [:create, :update, :delete], Node
-          can [:create, :update, :delete], Way
-          can [:create, :update, :delete], Relation
+          can [:create, :update, :delete], [Node, Way, Relation]

         end
 
         if user.moderator?
           can [:destroy, :restore], ChangesetComment
           can :destroy, Note
 
         end
 
         if user.moderator?
           can [:destroy, :restore], ChangesetComment
           can :destroy, Note
 

-          if user.terms_agreed?
-            can :redact, OldNode
-            can :redact, OldWay
-            can :redact, OldRelation
-          end
+          can :redact, [OldNode, OldWay, OldRelation] if user.terms_agreed?

         end
       end
     end
         end
       end
     end