diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue
index 1ffbf0c18..7615328ca 100644
--- a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue
@@ -141,7 +141,6 @@ const handleUpdateCompany = async () => {
:src="avatarSource"
:size="72"
:allow-upload="!isAvatarBusy"
- rounded-full
hide-offline-status
@upload="handleAvatarUpload"
@delete="handleAvatarDelete"
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index ba887b46f..50af6f0c0 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -124,10 +124,9 @@ const handleAvatarHover = isHovered => {
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleContentDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleContentDialog.vue
new file mode 100644
index 000000000..11d38f2a2
--- /dev/null
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleContentDialog.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleList.vue
index 62c644655..66d389ead 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleList.vue
@@ -1,5 +1,7 @@
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js b/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
index 63a592375..4603da83b 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
@@ -73,6 +73,12 @@ const getValueFromConversation = (conversation, attributeKey) => {
return conversation.display_id || conversation.id;
case 'assignee_id':
return conversation.meta?.assignee?.id;
+ case 'contact_id':
+ return (
+ conversation.meta?.sender?.id ||
+ conversation.contact?.id ||
+ conversation.contact_id
+ );
case 'inbox_id':
return conversation.inbox_id;
case 'team_id':
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js b/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
index adcf5c96f..7b20b94e1 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
@@ -244,6 +244,32 @@ describe('filterHelpers', () => {
expect(matchesFilters(conversation, filters)).toBe(false);
});
+ it('should match conversation with equal_to operator for contact_id', () => {
+ const conversation = { meta: { sender: { id: 42 } } };
+ const filters = [
+ {
+ attribute_key: 'contact_id',
+ filter_operator: 'equal_to',
+ values: { id: 42, name: 'Jane Doe' },
+ query_operator: 'and',
+ },
+ ];
+ expect(matchesFilters(conversation, filters)).toBe(true);
+ });
+
+ it('should match conversation with saved contact_id filter values', () => {
+ const conversation = { meta: { sender: { id: 42 } } };
+ const filters = [
+ {
+ attribute_key: 'contact_id',
+ filter_operator: 'equal_to',
+ values: [42],
+ query_operator: 'and',
+ },
+ ];
+ expect(matchesFilters(conversation, filters)).toBe(true);
+ });
+
// Standard attribute tests - priority
it('should match conversation with equal_to operator for priority', () => {
const conversation = { priority: 'urgent' };
diff --git a/app/javascript/dashboard/store/modules/customViews.js b/app/javascript/dashboard/store/modules/customViews.js
index a69bc2c17..388388e0f 100644
--- a/app/javascript/dashboard/store/modules/customViews.js
+++ b/app/javascript/dashboard/store/modules/customViews.js
@@ -15,6 +15,12 @@ const FILTER_KEYS = {
[VIEW_TYPES.CONTACT]: VIEW_TYPES.CONTACT,
};
+// a folder's contact_id filter stores only the id, extract it so the
+// contact can be fetched and its name shown in the edit folder modal
+const getFolderContactId = folder =>
+ folder?.query?.payload?.find(filter => filter.attribute_key === 'contact_id')
+ ?.values?.[0];
+
export const state = {
[VIEW_TYPES.CONVERSATION]: {
records: [],
@@ -47,6 +53,9 @@ export const getters = {
getActiveConversationFolder(_state) {
return _state.activeConversationFolder;
},
+ getActiveFolderContactId(_state) {
+ return getFolderContactId(_state.activeConversationFolder);
+ },
};
export const actions = {
@@ -104,8 +113,11 @@ export const actions = {
commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: false });
}
},
- setActiveConversationFolder({ commit }, data) {
+ setActiveConversationFolder({ commit, dispatch }, data) {
commit(types.SET_ACTIVE_CONVERSATION_FOLDER, data);
+ // prefetch the contact of a contact filter so the UI can show its name
+ const contactId = getFolderContactId(data);
+ if (contactId) dispatch('contacts/show', { id: contactId }, { root: true });
},
};
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
index f303eb5b6..a09dda17f 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
@@ -1,7 +1,11 @@
import axios from 'axios';
-import { actions } from '../../customViews';
import * as types from '../../../mutation-types';
-import { customViewList, updateCustomViewList } from './fixtures';
+import { actions } from '../../customViews';
+import {
+ contactFilterView,
+ customViewList,
+ updateCustomViewList,
+} from './fixtures';
const commit = vi.fn();
global.axios = axios;
@@ -106,5 +110,27 @@ describe('#actions', () => {
[types.default.SET_ACTIVE_CONVERSATION_FOLDER, customViewList[0]],
]);
});
+
+ it('prefetches the contact of a contact filter', async () => {
+ const dispatch = vi.fn();
+ await actions.setActiveConversationFolder(
+ { commit, dispatch },
+ contactFilterView
+ );
+ expect(dispatch).toHaveBeenCalledWith(
+ 'contacts/show',
+ { id: 42 },
+ { root: true }
+ );
+ });
+
+ it('does not prefetch without a contact filter', async () => {
+ const dispatch = vi.fn();
+ await actions.setActiveConversationFolder(
+ { commit, dispatch },
+ customViewList[0]
+ );
+ expect(dispatch).not.toHaveBeenCalled();
+ });
});
});
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
index c244467ed..6b0d06acf 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
@@ -15,6 +15,21 @@ export const contactViewList = [
},
];
+export const contactFilterView = {
+ name: 'Contact view',
+ filter_type: 0,
+ query: {
+ payload: [
+ {
+ attribute_key: 'contact_id',
+ filter_operator: 'equal_to',
+ values: [42],
+ query_operator: null,
+ },
+ ],
+ },
+};
+
export const customViewList = [
{
name: 'Custom view',
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
index 709abc7a0..9d40ccf28 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
@@ -1,5 +1,5 @@
import { getters } from '../../customViews';
-import { contactViewList, customViewList } from './fixtures';
+import { contactFilterView, contactViewList, customViewList } from './fixtures';
describe('#getters', () => {
it('getCustomViewsByFilterType', () => {
@@ -43,4 +43,20 @@ describe('#getters', () => {
customViewList[0]
);
});
+
+ it('getActiveFolderContactId', () => {
+ expect(
+ getters.getActiveFolderContactId({
+ activeConversationFolder: contactFilterView,
+ })
+ ).toEqual(42);
+ });
+
+ it('getActiveFolderContactId returns undefined without a contact filter', () => {
+ expect(
+ getters.getActiveFolderContactId({
+ activeConversationFolder: customViewList[0],
+ })
+ ).toBeUndefined();
+ });
});
diff --git a/app/javascript/shared/helpers/MessageFormatter.js b/app/javascript/shared/helpers/MessageFormatter.js
index eb8fecf01..85ce67bc6 100644
--- a/app/javascript/shared/helpers/MessageFormatter.js
+++ b/app/javascript/shared/helpers/MessageFormatter.js
@@ -63,6 +63,13 @@ const createMarkdownInstance = (linkify = true) => {
});
};
+// Help center article tables persist column widths as an internal
+// `` comment before the table. It exists only for the
+// editor's markdown round-trip and must never surface as text — markdown-it runs
+// with `html: false`, which would otherwise escape it into a visible comment in
+// rendered/plain output (e.g. dashboard search snippets). Strip it on the way in.
+const COLWIDTHS_MARKER_REGEX = /\r?\n?/g;
+
const TWITTER_USERNAME_REGEX = /(^|[^@\w])@(\w{1,15})\b/g;
const TWITTER_USERNAME_REPLACEMENT = '$1[@$2](http://twitter.com/$2)';
const TWITTER_HASH_REGEX = /(^|\s)#(\w+)/g;
@@ -75,7 +82,7 @@ class MessageFormatter {
isAPrivateNote = false,
linkify = true
) {
- this.message = message || '';
+ this.message = (message || '').replace(COLWIDTHS_MARKER_REGEX, '');
this.isAPrivateNote = isAPrivateNote;
this.isATweet = isATweet;
this.linkify = linkify;
diff --git a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
index 12b84085c..3350399eb 100644
--- a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
+++ b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
@@ -126,6 +126,16 @@ describe('#MessageFormatter', () => {
});
});
+ describe('help center table colwidth marker', () => {
+ it('strips the internal colwidths marker from rendered output', () => {
+ const message =
+ '\n| A | B |\n| --- | --- |\n| 1 | 2 |';
+ const formatter = new MessageFormatter(message);
+ expect(formatter.formattedMessage).not.toContain('cw-colwidths');
+ expect(formatter.plainText).not.toContain('cw-colwidths');
+ });
+ });
+
describe('#sanitize', () => {
it('sanitizes markup and removes all unnecessary elements', () => {
const message =
diff --git a/app/jobs/mutex_application_job.rb b/app/jobs/mutex_application_job.rb
index 58c7cbf36..4143eab2a 100644
--- a/app/jobs/mutex_application_job.rb
+++ b/app/jobs/mutex_application_job.rb
@@ -14,6 +14,19 @@
class MutexApplicationJob < ApplicationJob
class LockAcquisitionError < StandardError; end
+ def self.retry_on_lock_conflict(wait:, attempts:, on_exhaustion: :raise)
+ retry_on LockAcquisitionError, wait: wait, attempts: attempts do |job, error|
+ raise error if on_exhaustion == :raise
+
+ job.public_send(on_exhaustion, *job.arguments)
+ end
+ end
+
+ # Redis::LockManager#unlock is not owner-checked. If a job runs past the TTL,
+ # Redis can expire the key, a newer job can acquire it, and the older job can
+ # then delete the newer job's lock on unlock. Current mutex users treat locks as
+ # short race dampeners, so this is acceptable for now. Future iterations should
+ # move Redis::LockManager to token-checked unlocks.
def with_lock(lock_key, timeout = Redis::LockManager::LOCK_TIMEOUT)
lock_manager = Redis::LockManager.new
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index 6383daff8..c27363127 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -1,6 +1,14 @@
class Webhooks::InstagramEventsJob < MutexApplicationJob
queue_as :default
- retry_on LockAcquisitionError, wait: 1.second, attempts: 8
+ # This lock is only a short race dampener for first-message conversation creation.
+ # ContactInbox creation is already protected by a unique index, but conversation
+ # lookup is `find active conversation || create`, so concurrent first messages from
+ # the same IG contact can create duplicate conversations.
+ #
+ # ActiveJob retries are not FIFO, so a longer retry window does not preserve message
+ # order. Use deterministic backoff so the final attempt happens after the 3s lock TTL,
+ # then process without the lock instead of dropping the webhook.
+ retry_on_lock_conflict wait: ->(executions) { executions.seconds }, attempts: 3, on_exhaustion: :process_without_lock
# @return [Array] We will support further events like reaction or seen in future
SUPPORTED_EVENTS = [:message, :read].freeze
@@ -9,11 +17,19 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
@entries = entries
key = format(::Redis::Alfred::IG_MESSAGE_MUTEX, sender_id: contact_instagram_id, ig_account_id: ig_account_id)
- with_lock(key) do
+ # Keep the lock TTL just long enough for the first job to fetch profile data and
+ # create the contact/conversation. A longer TTL would add user-visible latency for
+ # hot contacts without giving us ordering guarantees.
+ with_lock(key, 3.seconds) do
process_entries(entries)
end
end
+ def process_without_lock(entries)
+ Rails.logger.warn("[#{self.class.name}] Processing without lock after lock retry exhaustion")
+ process_entries(entries)
+ end
+
# https://developers.facebook.com/docs/messenger-platform/instagram/features/webhook
def process_entries(entries)
entries.each do |entry|
diff --git a/app/jobs/webhooks/whatsapp_events_job.rb b/app/jobs/webhooks/whatsapp_events_job.rb
index f904b3723..14429e61c 100644
--- a/app/jobs/webhooks/whatsapp_events_job.rb
+++ b/app/jobs/webhooks/whatsapp_events_job.rb
@@ -126,12 +126,17 @@ class Webhooks::WhatsappEventsJob < MutexApplicationJob
def channel_is_inactive?(channel)
return true if channel.blank?
- return true if channel.reauthorization_required?
+ # Only skip for embedded signup when reauth is required; manual flow uses API keys and should still receive webhooks
+ return true if channel.reauthorization_required? && embedded_signup_channel?(channel)
return true unless channel.account.active?
false
end
+ def embedded_signup_channel?(channel)
+ (channel.provider_config || {}).to_h['source'] == 'embedded_signup'
+ end
+
def find_channel_by_url_param(params)
return unless params[:phone_number]
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 835d03661..c64b36ca0 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -68,7 +68,7 @@ class WebhookListener < BaseListener
def inbox_created(event)
inbox, account = extract_inbox_and_account(event)
- inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).push_data
+ inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).webhook_data
payload = inbox_webhook_data.merge(event: __method__.to_s)
deliver_account_webhooks(payload, account)
end
@@ -78,7 +78,7 @@ class WebhookListener < BaseListener
changed_attributes = extract_changed_attributes(event)
return if changed_attributes.blank?
- inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).push_data
+ inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).webhook_data
payload = inbox_webhook_data.merge(event: __method__.to_s, changed_attributes: changed_attributes)
deliver_account_webhooks(payload, account)
end
diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index 27bc88e06..25b8f4d85 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -65,11 +65,10 @@ class Imap::ImapMailbox
end
def in_reply_to
- @processed_mail.in_reply_to
+ sanitize_mailbox_value(@processed_mail.in_reply_to)
end
def find_conversation_by_references
- references = Array.wrap(@inbound_mail.references)
references.each do |message_id|
match = FALLBACK_CONVERSATION_PATTERN.match(message_id)
@@ -80,8 +79,6 @@ class Imap::ImapMailbox
def find_message_by_references
message_to_return = nil
- references = Array.wrap(@inbound_mail.references)
-
references.each do |message_id|
message = @inbox.messages.find_by(source_id: message_id)
message_to_return = message if message.present?
@@ -100,7 +97,7 @@ class Imap::ImapMailbox
source: 'email',
in_reply_to: in_reply_to,
auto_reply: @processed_mail.auto_reply?,
- mail_subject: @processed_mail.subject,
+ mail_subject: sanitize_mailbox_value(@processed_mail.subject),
initiated_at: {
timestamp: Time.now.utc
}
@@ -110,7 +107,7 @@ class Imap::ImapMailbox
end
def find_or_create_contact
- @contact = @inbox.contacts.from_email(@processed_mail.original_sender)
+ @contact = @inbox.contacts.from_email(original_sender_email)
if @contact.present?
@contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
else
@@ -119,6 +116,14 @@ class Imap::ImapMailbox
end
def identify_contact_name
- processed_mail.sender_name || processed_mail.from.first.split('@').first
+ sanitize_mailbox_value(processed_mail.sender_name || processed_mail.from.first.split('@').first)
+ end
+
+ def original_sender_email
+ sanitize_mailbox_value(@processed_mail.original_sender)
+ end
+
+ def references
+ sanitize_mailbox_value(Array.wrap(@inbound_mail.references))
end
end
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index edabfd4ce..fd3e0fb16 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -1,27 +1,16 @@
module MailboxHelper
include MailboxInlineAttachmentHelper
+ include MailboxSanitizer
include ::FileTypeHelper
private
def create_message
Rails.logger.info "[MailboxHelper] Creating message #{processed_mail.message_id}"
- return if @conversation.messages.find_by(source_id: processed_mail.message_id).present?
+ source_id = sanitize_mailbox_value(processed_mail.message_id)
+ return if @conversation.messages.find_by(source_id: source_id).present?
- @message = @conversation.messages.create!(
- account_id: @conversation.account_id,
- sender: @conversation.contact,
- content: mail_content&.truncate(150_000),
- inbox_id: @conversation.inbox_id,
- message_type: 'incoming',
- content_type: 'incoming_email',
- source_id: processed_mail.message_id,
- content_attributes: {
- email: processed_mail.serialized_data,
- cc_email: processed_mail.cc,
- bcc_email: processed_mail.bcc
- }
- )
+ @message = @conversation.messages.create!(sanitized_message_attributes(source_id))
end
def add_attachments_to_message
@@ -101,13 +90,16 @@ module MailboxHelper
end
def create_contact
+ sender_email = sanitize_mailbox_value(processed_mail.original_sender)
+ message_id = sanitize_mailbox_value(processed_mail.message_id)
+
@contact_inbox = ::ContactInboxWithContactBuilder.new(
- source_id: processed_mail.original_sender,
+ source_id: sender_email,
inbox: @inbox,
contact_attributes: {
- name: identify_contact_name,
- email: processed_mail.original_sender,
- additional_attributes: { source_id: "email:#{processed_mail.message_id}" }
+ name: sanitize_mailbox_value(identify_contact_name),
+ email: sender_email,
+ additional_attributes: { source_id: "email:#{message_id}" }
}
).perform
diff --git a/app/mailboxes/mailbox_sanitizer.rb b/app/mailboxes/mailbox_sanitizer.rb
new file mode 100644
index 000000000..b78bb1258
--- /dev/null
+++ b/app/mailboxes/mailbox_sanitizer.rb
@@ -0,0 +1,34 @@
+module MailboxSanitizer
+ NULL_BYTE = "\u0000".freeze
+
+ private
+
+ def sanitized_message_attributes(source_id)
+ {
+ account_id: @conversation.account_id,
+ sender: @conversation.contact,
+ content: sanitize_mailbox_value(mail_content)&.truncate(150_000),
+ inbox_id: @conversation.inbox_id,
+ message_type: 'incoming',
+ content_type: 'incoming_email',
+ source_id: source_id,
+ content_attributes: sanitized_content_attributes
+ }
+ end
+
+ def sanitized_content_attributes
+ sanitize_mailbox_value(
+ email: processed_mail.serialized_data,
+ cc_email: processed_mail.cc,
+ bcc_email: processed_mail.bcc
+ )
+ end
+
+ def sanitize_mailbox_value(value)
+ return value.delete(NULL_BYTE) if value.is_a?(String)
+ return value.map { |item| sanitize_mailbox_value(item) } if value.is_a?(Array)
+ return value.transform_values { |item| sanitize_mailbox_value(item) } if value.is_a?(Hash)
+
+ value
+ end
+end
diff --git a/app/models/concerns/portal_config_schema.rb b/app/models/concerns/portal_config_schema.rb
new file mode 100644
index 000000000..de338b830
--- /dev/null
+++ b/app/models/concerns/portal_config_schema.rb
@@ -0,0 +1,35 @@
+module PortalConfigSchema
+ extend ActiveSupport::Concern
+
+ # Per-locale overrides for portal level fields. Any locale present in
+ # `allowed_locales` may carry its own `name`, `page_title` and `header_text`.
+ # Missing values fall back to the default locale and finally to the base column.
+ LOCALE_TRANSLATION_SCHEMA = {
+ 'type' => 'object',
+ 'properties' => {
+ 'name' => { 'type' => %w[string null] },
+ 'page_title' => { 'type' => %w[string null] },
+ 'header_text' => { 'type' => %w[string null] }
+ },
+ 'additionalProperties' => false
+ }.freeze
+
+ CONFIG_PARAMS_SCHEMA = {
+ 'type' => 'object',
+ 'properties' => {
+ 'allowed_locales' => { 'type' => %w[array null], 'items' => { 'type' => 'string' } },
+ 'default_locale' => { 'type' => %w[string null] },
+ 'draft_locales' => { 'type' => %w[array null], 'items' => { 'type' => 'string' } },
+ 'layout' => { 'type' => %w[string null], 'enum' => ['classic', 'documentation', nil] },
+ # TODO: unused reserved key; remove with a migration that scrubs it from existing portals' config
+ 'website_token' => { 'type' => %w[string null] },
+ 'social_profiles' => { 'type' => %w[object null] },
+ 'locale_translations' => {
+ 'type' => %w[object null],
+ 'additionalProperties' => LOCALE_TRANSLATION_SCHEMA
+ }
+ },
+ 'required' => [],
+ 'additionalProperties' => true
+ }.to_json.freeze
+end
diff --git a/app/models/portal.rb b/app/models/portal.rb
index 37665a15c..9d2da6965 100644
--- a/app/models/portal.rb
+++ b/app/models/portal.rb
@@ -26,6 +26,7 @@
#
class Portal < ApplicationRecord
include Rails.application.routes.url_helpers
+ include PortalConfigSchema
DEFAULT_COLOR = '#1f93ff'.freeze
@@ -43,11 +44,16 @@ class Portal < ApplicationRecord
validates :slug, presence: true, uniqueness: true
validates :custom_domain, uniqueness: true, allow_nil: true
validates :color, format: { with: /\A#(?:\h{3}|\h{6})\z/ }, allow_blank: true
- validate :config_json_format
+ before_validation :normalize_config
+ validate :validate_config
+ validates_with JsonSchemaValidator,
+ schema: PortalConfigSchema::CONFIG_PARAMS_SCHEMA,
+ attribute_resolver: ->(record) { record.config }
scope :active, -> { where(archived: false) }
- CONFIG_JSON_KEYS = %w[allowed_locales default_locale draft_locales website_token social_profiles layout].freeze
+ # TODO: 'website_token' is an unused reserved key; remove with a migration that scrubs it from existing portals' config
+ CONFIG_JSON_KEYS = %w[allowed_locales default_locale draft_locales website_token social_profiles layout locale_translations].freeze
def file_base_data
{
@@ -91,8 +97,18 @@ class Portal < ApplicationRecord
self[:color].presence || DEFAULT_COLOR
end
- def display_title
- page_title.presence || name
+ def display_title(locale = default_locale)
+ localized_value('page_title', locale).presence || localized_value('name', locale)
+ end
+
+ # Resolves a portal level field for a locale, falling back to the default
+ # locale's value (its override or the base column) when the locale has no
+ # override of its own.
+ def localized_value(field, locale = default_locale)
+ translations = config_value('locale_translations') || {}
+ translations.dig(locale.to_s, field).presence ||
+ translations.dig(default_locale, field).presence ||
+ self[field]
end
def layout
@@ -105,11 +121,14 @@ class Portal < ApplicationRecord
private
- def config_json_format
+ def normalize_config
self.config = persisted_config.merge((config || {}).deep_stringify_keys)
config['allowed_locales'] = allowed_locale_codes
config['default_locale'] = default_locale
config['draft_locales'] = draft_locale_codes
+ end
+
+ def validate_config
denied_keys = config.keys - CONFIG_JSON_KEYS
errors.add(:config, "in portal on #{denied_keys.join(',')} is not supported.") if denied_keys.any?
errors.add(:config, 'default locale cannot be drafted.') if draft_locale?(default_locale)
diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index ae0e69608..4dfa10abe 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -23,7 +23,10 @@ class Conversations::EventDataPresenter < SimpleDelegator
# Like #push_data but with message text normalized for external integrations (webhooks).
def webhook_data
- push_data.merge(messages: webhook_push_messages)
+ push_data.merge(
+ account: account.webhook_data,
+ messages: webhook_push_messages
+ )
end
private
diff --git a/app/presenters/inbox/event_data_presenter.rb b/app/presenters/inbox/event_data_presenter.rb
index a408424ae..7f832bb5a 100644
--- a/app/presenters/inbox/event_data_presenter.rb
+++ b/app/presenters/inbox/event_data_presenter.rb
@@ -32,4 +32,8 @@ class Inbox::EventDataPresenter < SimpleDelegator
channel: channel
}
end
+
+ def webhook_data
+ push_data.merge(account: account.webhook_data)
+ end
end
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index baf72ef6e..0b2f45590 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -45,12 +45,12 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
end
def fb_text_message_params
- {
+ params = {
recipient: { id: contact.get_source_id(inbox.id) },
- message: fb_text_message_payload,
- messaging_type: 'MESSAGE_TAG',
- tag: message_tag
+ message: fb_text_message_payload
}
+
+ merge_human_agent_tag(params)
end
def fb_text_message_payload
@@ -79,7 +79,7 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
end
def fb_attachment_message_params(attachment)
- {
+ params = {
recipient: { id: contact.get_source_id(inbox.id) },
message: {
attachment: {
@@ -88,14 +88,21 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
url: attachment.download_url
}
}
- },
- messaging_type: 'MESSAGE_TAG',
- tag: message_tag
+ }
}
+
+ merge_human_agent_tag(params)
end
- def message_tag
- @message_tag ||= GlobalConfigService.load('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT', nil) ? 'HUMAN_AGENT' : 'ACCOUNT_UPDATE'
+ def merge_human_agent_tag(params)
+ unless GlobalConfigService.load('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT', nil)
+ params[:messaging_type] = 'RESPONSE'
+ return params
+ end
+
+ params[:messaging_type] = 'MESSAGE_TAG'
+ params[:tag] = 'HUMAN_AGENT'
+ params
end
def attachment_type(attachment)
@@ -104,11 +111,6 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
'file'
end
- def sent_first_outgoing_message_after_24_hours?
- # we can send max 1 message after 24 hour window
- conversation.messages.outgoing.where('id > ?', conversation.last_incoming_message.id).count == 1
- end
-
def handle_facebook_error(exception)
# Refer: https://github.com/jgorset/facebook-messenger/blob/64fe1f5cef4c1e3fca295b205037f64dfebdbcab/lib/facebook/messenger/error.rb
return unless exception.to_s.include?('The session has been invalidated') || exception.to_s.include?('Error validating access token')
diff --git a/app/services/mailbox/conversation_finder_strategies/base_strategy.rb b/app/services/mailbox/conversation_finder_strategies/base_strategy.rb
index c1e738805..fd61fd9e0 100644
--- a/app/services/mailbox/conversation_finder_strategies/base_strategy.rb
+++ b/app/services/mailbox/conversation_finder_strategies/base_strategy.rb
@@ -1,4 +1,6 @@
class Mailbox::ConversationFinderStrategies::BaseStrategy
+ include MailboxSanitizer
+
attr_reader :mail
def initialize(mail)
diff --git a/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb b/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb
index b14f851f5..e3d8270f1 100644
--- a/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb
+++ b/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb
@@ -14,7 +14,7 @@ class Mailbox::ConversationFinderStrategies::InReplyToStrategy < Mailbox::Conver
def find
return nil if mail.in_reply_to.blank?
- in_reply_to_addresses = Array.wrap(mail.in_reply_to)
+ in_reply_to_addresses = sanitize_mailbox_value(Array.wrap(mail.in_reply_to))
in_reply_to_addresses.each do |in_reply_to|
# Try extracting UUID from patterns
diff --git a/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb b/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb
index a21fcebe5..f9f5c3cf8 100644
--- a/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb
+++ b/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb
@@ -45,11 +45,11 @@ class Mailbox::ConversationFinderStrategies::NewConversationStrategy < Mailbox::
end
def original_sender_email
- @processed_mail.original_sender&.downcase
+ sanitize_mailbox_value(@processed_mail.original_sender)&.downcase
end
def identify_contact_name
- @processed_mail.sender_name || @processed_mail.from.first.split('@').first
+ sanitize_mailbox_value(@processed_mail.sender_name || @processed_mail.from.first.split('@').first)
end
def build_conversation
@@ -63,7 +63,7 @@ class Mailbox::ConversationFinderStrategies::NewConversationStrategy < Mailbox::
in_reply_to: in_reply_to,
source: 'email',
auto_reply: @processed_mail.auto_reply?,
- mail_subject: @processed_mail.subject,
+ mail_subject: sanitize_mailbox_value(@processed_mail.subject),
initiated_at: {
timestamp: Time.now.utc
}
@@ -72,7 +72,7 @@ class Mailbox::ConversationFinderStrategies::NewConversationStrategy < Mailbox::
end
def in_reply_to
- mail['In-Reply-To'].try(:value)
+ sanitize_mailbox_value(mail['In-Reply-To'].try(:value))
end
def find_conversation_by_in_reply_to
diff --git a/app/services/mailbox/conversation_finder_strategies/references_strategy.rb b/app/services/mailbox/conversation_finder_strategies/references_strategy.rb
index 86a0aa3c5..4420c5c7d 100644
--- a/app/services/mailbox/conversation_finder_strategies/references_strategy.rb
+++ b/app/services/mailbox/conversation_finder_strategies/references_strategy.rb
@@ -21,7 +21,7 @@ class Mailbox::ConversationFinderStrategies::ReferencesStrategy < Mailbox::Conve
return nil if mail.references.blank?
return nil unless @channel # No valid channel found
- references = Array.wrap(mail.references)
+ references = sanitize_mailbox_value(Array.wrap(mail.references))
references.each do |reference|
conversation = find_conversation_from_reference(reference)
diff --git a/app/views/api/v1/accounts/portals/_portal.json.jbuilder b/app/views/api/v1/accounts/portals/_portal.json.jbuilder
index 08b3e8b36..93626ee36 100644
--- a/app/views/api/v1/accounts/portals/_portal.json.jbuilder
+++ b/app/views/api/v1/accounts/portals/_portal.json.jbuilder
@@ -18,6 +18,7 @@ json.config do
json.default_locale portal.default_locale
json.layout portal.layout
json.social_profiles portal.social_profiles
+ json.locale_translations portal.config['locale_translations'] || {}
end
if portal.channel_web_widget
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 0ae0745cd..b34bbe95b 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -130,7 +130,11 @@ json.bot_name resource.channel.try(:bot_name) if resource.telegram?
if resource.whatsapp?
json.message_templates resource.channel.try(:message_templates)
json.provider_config resource.channel.try(:provider_config) if Current.account_user&.administrator?
- json.reauthorization_required resource.channel.try(:reauthorization_required?)
+ # Only show reauthorization for embedded signup; manual flow uses API keys, not OAuth
+ json.reauthorization_required(
+ (resource.channel.try(:provider_config) || {}).to_h['source'] == 'embedded_signup' &&
+ resource.channel.try(:reauthorization_required?)
+ )
end
## Voice attributes for TwilioSms
diff --git a/app/views/layouts/_portal_head.html.erb b/app/views/layouts/_portal_head.html.erb
index 882064d52..64e24a150 100644
--- a/app/views/layouts/_portal_head.html.erb
+++ b/app/views/layouts/_portal_head.html.erb
@@ -16,7 +16,7 @@
<% if content_for?(:head) %>
<%= yield(:head) %>
<% else %>
-