fix and improve ability coverage to account for tokens

[rails.git] / app / models / ability.rb

diff --git a/app/models/ability.rb b/app/models/ability.rb
index c712e3e822dbb6ea35e8f8fd66b35788febb168a..6a61eeff30b75e16690133fddfad0de51e364866 100644 (file)
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,11 +1,25 @@
+# frozen_string_literal: true
+

 class Ability
   include CanCan::Ability
 
 class Ability
   include CanCan::Ability
 

-  def initialize(user)
+  def initialize(user, token)

     can :index, :site
     can :index, :site

+    can [:permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id, :welcome], :site
+
+    can [:list, :rss, :view, :comments], DiaryEntry

 
     if user
 
     if user

-      can :welcome, :site
+      can :weclome, :site
+
+      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+
+      can [:read, :read_one], UserPreference if has_capability?(token, :allow_read_prefs)
+      can [:update, :update_one, :delete_one], UserPreference if has_capability?(token, :allow_write_prefs)
+
+      if user.administrator?
+        can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
+      end

     end
     # Define abilities for the passed in user here. For example:
     #
     end
     # Define abilities for the passed in user here. For example:
     #


@@ -34,4 +48,8 @@ class Ability
     # See the wiki for details:
     # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
   end
     # See the wiki for details:
     # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
   end

+
+  def has_capability?(token, cap)
+    token && token.read_attribute(cap)
+  end

 end
 end