If a user declines a feed invitation, they can be invited again

Fixes CV2-3802.
meedan · Nov 24, 2023 · 3b2bb35 · 3b2bb35
1 parent 4ad2855
commit 3b2bb35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -85,7 +85,7 @@ def editor_perms
       obj.annotation.team&.id == @context_team.id
     end
     can [:create, :update, :read, :destroy], [Account, Source, TiplineNewsletter, TiplineResource, Feed, FeedTeam], :team_id => @context_team.id
-    can [:create, :update, :destroy], FeedInvitation, { feed: { team_id: @context_team.id } }
+    can [:create, :update], FeedInvitation, { feed: { team_id: @context_team.id } }
     can :destroy, FeedTeam do |obj|
       obj.team.id == @context_team.id || obj.feed.team.id == @context_team.id
     end

diff --git a/app/models/feed_invitation.rb b/app/models/feed_invitation.rb
@@ -18,7 +18,8 @@ def accept!(team_id)
   end
 
   def reject!
-    self.update_column(:state, :rejected)
+    # self.update_column(:state, :rejected)
+    self.destroy!
   end
 
   private

diff --git a/lib/check_basic_abilities.rb b/lib/check_basic_abilities.rb
@@ -125,8 +125,8 @@ def extra_perms_for_all_users
       !(@user.cached_teams & obj.feed.team_ids).empty?
     end
 
-    can :read, FeedInvitation do |obj|
-      @user.email == obj.email || @user.id == obj.user_id
+    can [:read, :destroy], FeedInvitation do |obj|
+      @user.email == obj.email || @user.id == obj.user_id || TeamUser.where(user_id: @user.id, team_id: obj.feed.team_id, role: 'admin').exists?
     end
   end