6c67eb9ba0
Agents with limited custom roles were receiving notifications (creation, assignment, mentions, new messages, SLA) for conversations they couldn't actually open. For example, an agent whose custom role only grants `conversation_unassigned_manage` was getting notified about conversations assigned to other agents. Notifications now go through the same `ConversationPolicy#show?` check that gates the conversation view itself, so an agent only gets notified for conversations they're permitted to see. Administrators and agents without custom roles are unaffected. --------- Co-authored-by: Sojan Jose <sojan@pepalo.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
55 lines
1.9 KiB
Ruby
55 lines
1.9 KiB
Ruby
class NotificationBuilder
|
|
pattr_initialize [:notification_type!, :user!, :account!, :primary_actor!, :secondary_actor]
|
|
|
|
def perform
|
|
build_notification
|
|
end
|
|
|
|
private
|
|
|
|
def current_user
|
|
Current.user
|
|
end
|
|
|
|
def user_subscribed_to_notification?
|
|
notification_setting = user.notification_settings.find_by(account_id: account.id)
|
|
# added for the case where an assignee might be removed from the account but remains in conversation
|
|
return false if notification_setting.blank?
|
|
|
|
return true if notification_setting.public_send("email_#{notification_type}?")
|
|
return true if notification_setting.public_send("push_#{notification_type}?")
|
|
|
|
false
|
|
end
|
|
|
|
def build_notification
|
|
# Create conversation_creation notification only if user is subscribed to it
|
|
return if notification_type == 'conversation_creation' && !user_subscribed_to_notification?
|
|
# skip notifications for blocked conversations except for user mentions
|
|
return if primary_actor.contact.blocked? && notification_type != 'conversation_mention'
|
|
# respect conversation access (inbox/team membership and custom-role permissions)
|
|
return unless user_can_access_conversation?
|
|
|
|
user.notifications.create!(
|
|
notification_type: notification_type,
|
|
account: account,
|
|
primary_actor: primary_actor,
|
|
# secondary_actor is secondary_actor if present, else current_user
|
|
secondary_actor: secondary_actor || current_user
|
|
)
|
|
end
|
|
|
|
def user_can_access_conversation?
|
|
conversation = primary_actor.is_a?(Conversation) ? primary_actor : primary_actor.try(:conversation)
|
|
return true if conversation.blank?
|
|
|
|
account_user = AccountUser.find_by(account_id: account.id, user_id: user.id)
|
|
return false if account_user.blank?
|
|
|
|
ConversationPolicy.new(
|
|
{ user: user, account: account, account_user: account_user },
|
|
conversation
|
|
).show?
|
|
end
|
|
end
|