Skip to content

Commit

Permalink
Fix: Conversation filter permissions (#3908)
Browse files Browse the repository at this point in the history
  • Loading branch information
sojan-official committed Feb 4, 2022
1 parent cf10f3d commit 9454c6b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/finders/conversation_finder.rb
Expand Up @@ -55,7 +55,7 @@ def set_up

def set_inboxes
@inbox_ids = if params[:inbox_id]
current_account.inboxes.where(id: params[:inbox_id])
@current_user.assigned_inboxes.where(id: params[:inbox_id])
else
@current_user.assigned_inboxes.pluck(:id)
end
Expand Down
28 changes: 28 additions & 0 deletions spec/finders/conversation_finder_spec.rb
Expand Up @@ -6,7 +6,9 @@
let!(:account) { create(:account) }
let!(:user_1) { create(:user, account: account) }
let!(:user_2) { create(:user, account: account) }
let!(:admin) { create(:user, account: account, role: :administrator) }
let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
let!(:restricted_inbox) { create(:inbox, account: account) }

before do
create(:inbox_member, user: user_1, inbox: inbox)
Expand All @@ -30,6 +32,32 @@
end
end

context 'with inbox' do
let!(:restricted_conversation) { create(:conversation, account: account, inbox_id: restricted_inbox.id) }

it 'returns conversation from any inbox if its admin' do
params = { inbox_id: restricted_inbox.id }
result = described_class.new(admin, params).perform

expect(result[:conversations].map(&:id)).to include(restricted_conversation.id)
end

it 'returns conversation from inbox if agent is its member' do
params = { inbox_id: restricted_inbox.id }
create(:inbox_member, user: user_1, inbox: restricted_inbox)
result = described_class.new(user_1, params).perform

expect(result[:conversations].map(&:id)).to include(restricted_conversation.id)
end

it 'does not return conversations from inboxes where agent is not a member' do
params = { inbox_id: restricted_inbox.id }
result = described_class.new(user_1, params).perform

expect(result[:conversations].map(&:id)).not_to include(restricted_conversation.id)
end
end

context 'with assignee_type all' do
let(:params) { { assignee_type: 'all' } }

Expand Down

0 comments on commit 9454c6b

Please sign in to comment.