Policy updates

zooniverse · Nov 29, 2023 · 2dccd27 · 2dccd27
1 parent 1a7ef04
commit 2dccd27
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
@@ -77,6 +77,10 @@ def has_role?(role)
       true
     end
 
+    def confirmed?
+      !!user.confirmed_at
+    end
+
     def of_posting_age?
       return true unless ENV['POSTING_AGE_REQUIREMENT']
 

diff --git a/app/policies/comment_policy.rb b/app/policies/comment_policy.rb
@@ -11,18 +11,18 @@ def show?
 
   def create?
     if Array.wrap(record).compact.any? { |c| c.discussion.board.section == 'zooniverse' }
-      logged_in? && !locked? && writable? && of_posting_age?
+      logged_in? && !locked? && writable? && confirmed? && of_posting_age?
     else
-      logged_in? && !locked? && writable?
+      logged_in? && !locked? && writable? && confirmed?
     end
   end
 
   def update?
-    owner? && !deleted? && !locked? && writable?
+    owner? && !deleted? && !locked? && writable? && confirmed?
   end
 
   def destroy?
-    owner? && !deleted? && !locked? && writable?
+    owner? && !deleted? && !locked? && writable? && confirmed?
   end
 
   def move?

diff --git a/app/policies/conversation_policy.rb b/app/policies/conversation_policy.rb
@@ -1,22 +1,22 @@
 class ConversationPolicy < ApplicationPolicy
   def index?
-    logged_in?
+    logged_in? && confirmed?
   end
 
   def show?
-    moderator? || admin? || participant?
+    (moderator? || admin? || participant?) && confirmed?
   end
 
   def create?
-    logged_in?
+    logged_in? && confirmed?
   end
 
   def update?
     false
   end
 
   def destroy?
-    participant?
+    participant? && confirmed?
   end
 
   class Scope < Scope

diff --git a/app/policies/discussion_policy.rb b/app/policies/discussion_policy.rb
@@ -11,9 +11,9 @@ def show?
 
   def create?
     if Array.wrap(record).compact.any? { |d| d.board.section == 'zooniverse' }
-      writable? && of_posting_age?
+      writable? && confirmed? && of_posting_age?
     else
-      writable?
+      writable? && confirmed?
     end
   end
 

diff --git a/app/policies/message_policy.rb b/app/policies/message_policy.rb
@@ -1,14 +1,14 @@
 class MessagePolicy < ApplicationPolicy
   def index?
-    logged_in?
+    logged_in? && confirmed?
   end
 
   def show?
-    moderator? || admin? || participant?
+    (moderator? || admin? || participant?) && confirmed?
   end
 
   def create?
-    participant?
+    participant? && confirmed?
   end
 
   def update?