-
<%= @portal.name %>
+
<%= @portal.localized_value('name', @locale) %>
- <%= portal.header_text %>
+ <%= portal.localized_value('header_text', @locale) %>
<%= I18n.t('public_portal.hero.sub_title') %>
diff --git a/app/views/public/api/v1/portals/articles/index.html.erb b/app/views/public/api/v1/portals/articles/index.html.erb
index d040bbc24..e4dc9aa87 100644
--- a/app/views/public/api/v1/portals/articles/index.html.erb
+++ b/app/views/public/api/v1/portals/articles/index.html.erb
@@ -6,7 +6,7 @@
class="leading-8 text-slate-800 hover:underline"
href="<%= generate_home_link(@portal.slug, @category.present? ? @category.slug : '', @theme_from_params, @is_plain_layout_enabled) %>"
>
- <%= @portal.name %> <%= I18n.t('public_portal.common.home') %>
+ <%= @portal.localized_value('name', @locale) %> <%= I18n.t('public_portal.common.home') %>
/
/
diff --git a/app/views/public/api/v1/portals/articles/show.html.erb b/app/views/public/api/v1/portals/articles/show.html.erb
index 784817c9c..e35b19009 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -1,5 +1,5 @@
<% content_for :head do %>
-
<%= @article.title %> | <%= @portal.display_title %>
+
<%= @article.title %> | <%= @portal.display_title(@locale) %>
<% if @article.meta["title"].present? %>
">
">
diff --git a/app/views/public/api/v1/portals/categories/_hero.html.erb b/app/views/public/api/v1/portals/categories/_hero.html.erb
index 0c179338d..1b481617e 100644
--- a/app/views/public/api/v1/portals/categories/_hero.html.erb
+++ b/app/views/public/api/v1/portals/categories/_hero.html.erb
@@ -1,7 +1,7 @@
-
<%= portal.header_text %>
+
<%= portal.localized_value('header_text', @locale) %>
<%= I18n.t('public_portal.hero.sub_title') %>
diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index 6657559d0..e7179db73 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -1,6 +1,6 @@
<% content_for :head do %>
-
<%= @category.name %> | <%= @portal.display_title %>
-
+
<%= @category.name %> | <%= @portal.display_title(@locale) %>
+
<% if @category.description.present? %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb b/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb
index c7df0517d..af80d46ac 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb
@@ -5,7 +5,7 @@
- <%= portal.header_text.presence || 'How can we help?' %>
+ <%= portal.localized_value('header_text', @locale).presence || 'How can we help?' %>
<%= I18n.t('public_portal.hero.sub_title') %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_topbar.html.erb b/app/views/public/api/v1/portals/documentation_layout/_topbar.html.erb
index 46d6f3558..00f408d70 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_topbar.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_topbar.html.erb
@@ -11,7 +11,7 @@
<% if portal.logo.present? %>
 %>)
<% end %>
- <%= portal.name %>
+ <%= portal.localized_value('name', locale) %>
<%= I18n.t('public_portal.sidebar.help_center') %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/articles/_meta_head.html.erb b/app/views/public/api/v1/portals/documentation_layout/articles/_meta_head.html.erb
index a236722ae..aeed7ff6c 100644
--- a/app/views/public/api/v1/portals/documentation_layout/articles/_meta_head.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/articles/_meta_head.html.erb
@@ -1,4 +1,4 @@
-
<%= article.title %> | <%= portal.display_title %>
+
<%= article.title %> | <%= portal.display_title(article.locale) %>
<% if article.meta["title"].present? %>
">
">
diff --git a/app/views/public/api/v1/portals/documentation_layout/categories/_meta_head.html.erb b/app/views/public/api/v1/portals/documentation_layout/categories/_meta_head.html.erb
index 7c8dec8d2..ac36496df 100644
--- a/app/views/public/api/v1/portals/documentation_layout/categories/_meta_head.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/categories/_meta_head.html.erb
@@ -1,5 +1,5 @@
-
<%= category.name %> | <%= portal.display_title %>
-
+
<%= category.name %> | <%= portal.display_title(category.locale) %>
+
<% if category.description.present? %>
diff --git a/app/views/public/api/v1/portals/search/index.html+documentation.erb b/app/views/public/api/v1/portals/search/index.html+documentation.erb
index 8577a5f4e..f77517618 100644
--- a/app/views/public/api/v1/portals/search/index.html+documentation.erb
+++ b/app/views/public/api/v1/portals/search/index.html+documentation.erb
@@ -1,5 +1,5 @@
<% content_for :head do %>
-
<%= I18n.t('public_portal.search.results_for', query: @query) %> | <%= @portal.name %>
+
<%= I18n.t('public_portal.search.results_for', query: @query) %> | <%= @portal.localized_value('name', @locale) %>
<% end %>
diff --git a/app/views/public/api/v1/portals/search/index.html.erb b/app/views/public/api/v1/portals/search/index.html.erb
index 82c29775f..b4a1e77ed 100644
--- a/app/views/public/api/v1/portals/search/index.html.erb
+++ b/app/views/public/api/v1/portals/search/index.html.erb
@@ -1,5 +1,5 @@
<% content_for :head do %>
-
<%= I18n.t('public_portal.search.results_for', query: @query) %> | <%= @portal.name %>
+
<%= I18n.t('public_portal.search.results_for', query: @query) %> | <%= @portal.localized_value('name', @locale) %>
<% end %>
<% search_input_class = 'w-full px-4 py-3 border border-slate-200 dark:border-slate-700 rounded-lg bg-white dark:bg-slate-800 text-slate-900 dark:text-slate-100 placeholder-slate-500 dark:placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent' %>
diff --git a/app/views/super_admin/application/_icons.html.erb b/app/views/super_admin/application/_icons.html.erb
index e80d1e164..39253c969 100644
--- a/app/views/super_admin/application/_icons.html.erb
+++ b/app/views/super_admin/application/_icons.html.erb
@@ -128,6 +128,10 @@
+
+
+
+
diff --git a/config/app.yml b/config/app.yml
index fec34cd07..c2494befa 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '4.14.1'
+ version: '4.14.2'
development:
<<: *shared
diff --git a/config/routes.rb b/config/routes.rb
index 351808744..d78831343 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,7 +55,9 @@ Rails.application.routes.draw do
resource :contact_merge, only: [:create]
end
resource :bulk_actions, only: [:create]
- resource :onboarding, only: [:update]
+ resource :onboarding, only: [:update] do
+ get :help_center_generation
+ end
resources :agents, only: [:index, :create, :update, :destroy] do
post :bulk_create, on: :collection
end
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/custom_tools_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/custom_tools_controller.rb
index fab952960..874197870 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/custom_tools_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/custom_tools_controller.rb
@@ -27,8 +27,8 @@ class Api::V1::Accounts::Captain::CustomToolsController < Api::V1::Accounts::Bas
def test
tool = account_custom_tools.new(custom_tool_params)
- result = execute_test_request(tool)
- render json: { status: result.code.to_i, body: result.body.to_s.truncate(500) }
+ body = execute_test_request(tool)
+ render json: { status: 200, body: body.to_s.truncate(500) }
rescue StandardError => e
render json: { error: e.message }, status: :unprocessable_content
end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/onboardings_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/onboardings_controller.rb
new file mode 100644
index 000000000..1311bc3fc
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/onboardings_controller.rb
@@ -0,0 +1,38 @@
+module Enterprise::Api::V1::Accounts::OnboardingsController
+ def help_center_generation
+ @account = Current.account
+ render json: help_center_generation_status
+ end
+
+ private
+
+ def help_center_generation_status
+ generation_id = help_center_generation_id
+ return super if generation_id.blank?
+
+ state = Onboarding::HelpCenterGenerationState.current(generation_id)
+
+ {
+ generation_id: generation_id,
+ state: state,
+ articles_count: articles_count,
+ categories_count: categories_count
+ }
+ end
+
+ def help_center_generation_id
+ @account.custom_attributes['help_center_generation_id']
+ end
+
+ def articles_count
+ onboarding_portal&.articles&.count || 0
+ end
+
+ def categories_count
+ onboarding_portal&.categories&.count || 0
+ end
+
+ def onboarding_portal
+ @onboarding_portal ||= @account.portals.first
+ end
+end
diff --git a/enterprise/app/helpers/captain/chat_generation_recorder.rb b/enterprise/app/helpers/captain/chat_generation_recorder.rb
index cd631fb16..63bcdc276 100644
--- a/enterprise/app/helpers/captain/chat_generation_recorder.rb
+++ b/enterprise/app/helpers/captain/chat_generation_recorder.rb
@@ -10,6 +10,7 @@ module Captain::ChatGenerationRecorder
# Create a generation span with model and token info for Langfuse cost calculation.
# Note: span duration will be near-zero since we create and end it immediately, but token counts are what Langfuse uses for cost calculation.
tracer.in_span("llm.captain.#{feature_name}.generation") do |span|
+ apply_current_langfuse_attributes(span)
set_generation_span_attributes(span, chat, message)
end
rescue StandardError => e
@@ -37,11 +38,23 @@ module Captain::ChatGenerationRecorder
ATTR_GEN_AI_USAGE_INPUT_TOKENS => message.input_tokens,
ATTR_GEN_AI_USAGE_OUTPUT_TOKENS => message.respond_to?(:output_tokens) ? message.output_tokens : nil,
ATTR_LANGFUSE_OBSERVATION_INPUT => format_input_messages(chat),
- ATTR_LANGFUSE_OBSERVATION_OUTPUT => message.respond_to?(:content) ? message.content.to_s : nil
+ ATTR_LANGFUSE_OBSERVATION_OUTPUT => message.respond_to?(:content) ? message.content.to_s : nil,
+ format(ATTR_LANGFUSE_OBSERVATION_METADATA, 'generation_stage') => generation_stage(message)
}
end
def format_input_messages(chat)
chat.messages[0...-1].map { |m| { role: m.role.to_s, content: m.content.to_s } }.to_json
end
+
+ def generation_stage(message)
+ message_has_tool_calls?(message) ? 'tool_call' : 'final_response'
+ end
+
+ def message_has_tool_calls?(message)
+ return false unless message.respond_to?(:tool_calls)
+
+ tool_calls = message.tool_calls
+ tool_calls.respond_to?(:any?) && tool_calls.any?
+ end
end
diff --git a/enterprise/app/jobs/onboarding/help_center_article_generation_job.rb b/enterprise/app/jobs/onboarding/help_center_article_generation_job.rb
index ed561d668..b5f7eb247 100644
--- a/enterprise/app/jobs/onboarding/help_center_article_generation_job.rb
+++ b/enterprise/app/jobs/onboarding/help_center_article_generation_job.rb
@@ -2,10 +2,10 @@ class Onboarding::HelpCenterArticleGenerationJob < ApplicationJob
queue_as :low
retry_on Firecrawl::FirecrawlError, wait: :polynomially_longer, attempts: 3 do |job, error|
- _account_id, _portal_id, user_id, generation_id = job.arguments
+ _account_id, _portal_id, _user_id, generation_id = job.arguments
reason = "firecrawl exhausted: #{error.message}"
Rails.logger.warn "[HelpCenterGenerationJob] gen=#{generation_id} #{reason}"
- job.send(:skip_and_broadcast, user: User.find_by(id: user_id), generation_id: generation_id, reason: reason)
+ job.send(:skip_generation, generation_id: generation_id, reason: reason)
end
def perform(account_id, portal_id, user_id, generation_id)
@@ -19,7 +19,7 @@ class Onboarding::HelpCenterArticleGenerationJob < ApplicationJob
)
rescue Onboarding::HelpCenterErrors::CurationSkipped => e
Rails.logger.info "[HelpCenterGenerationJob] gen=#{generation_id} skipped: #{e.message}"
- skip_and_broadcast(user: User.find_by(id: user_id), generation_id: generation_id, reason: e.message)
+ skip_generation(generation_id: generation_id, reason: e.message)
end
private
@@ -89,15 +89,12 @@ class Onboarding::HelpCenterArticleGenerationJob < ApplicationJob
def enqueue_writer_jobs(account_id:, portal_id:, user_id:, generation_id:, articles:)
articles.each do |article|
Onboarding::HelpCenterArticleWriterJob.perform_later(
- account_id, portal_id, user_id, generation_id, { article: article }
+ account_id, portal_id, user_id, generation_id, article
)
end
end
- def skip_and_broadcast(user:, generation_id:, reason:)
+ def skip_generation(generation_id:, reason:)
Onboarding::HelpCenterGenerationState.skip(generation_id, reason: reason)
- Onboarding::HelpCenterBroadcaster.completed(
- user: user, generation_id: generation_id, status: 'skipped', skip_reason: reason
- )
end
end
diff --git a/enterprise/app/jobs/onboarding/help_center_article_writer_job.rb b/enterprise/app/jobs/onboarding/help_center_article_writer_job.rb
index 2c25b86e9..68c218a19 100644
--- a/enterprise/app/jobs/onboarding/help_center_article_writer_job.rb
+++ b/enterprise/app/jobs/onboarding/help_center_article_writer_job.rb
@@ -9,43 +9,27 @@ class Onboarding::HelpCenterArticleWriterJob < ApplicationJob
job.send(:on_writer_failure, error)
end
- def perform(account_id, portal_id, user_id, generation_id, article_payload)
- user = User.find(user_id)
- payload = article_payload.with_indifferent_access
- article = Onboarding::HelpCenterArticleBuilder.new(
+ def perform(account_id, portal_id, user_id, generation_id, article)
+ Onboarding::HelpCenterArticleBuilder.new(
account: Account.find(account_id),
portal: Portal.find(portal_id),
- user: user,
- article: payload[:article]
+ user: User.find(user_id),
+ article: article
).perform
- finalize(user: user, generation_id: generation_id, article: article)
+ finalize(generation_id: generation_id)
end
private
def on_writer_failure(error)
- user, generation_id = failure_context
+ generation_id = arguments[3]
Rails.logger.warn "[HelpCenterWriterJob] gen=#{generation_id} failed: #{error.class} #{error.message}"
- finalize(user: user, generation_id: generation_id, article: nil)
+ finalize(generation_id: generation_id)
end
- def failure_context
- _account_id, _portal_id, user_id, generation_id = arguments
- [User.find_by(id: user_id), generation_id]
- end
-
- def finalize(user:, generation_id:, article:)
- result = Onboarding::HelpCenterGenerationState.record_article_finished(generation_id)
-
- if article
- Onboarding::HelpCenterBroadcaster.article_generated(
- user: user, generation_id: generation_id, article: article, articles_finished: result[:finished]
- )
- end
- return unless result[:completed]
-
- Onboarding::HelpCenterBroadcaster.completed(user: user, generation_id: generation_id, status: 'completed')
+ def finalize(generation_id:)
+ Onboarding::HelpCenterGenerationState.record_article_finished(generation_id)
rescue Onboarding::HelpCenterGenerationState::Missing => e
Rails.logger.warn "[HelpCenterWriterJob] gen=#{generation_id} #{e.message}"
end
diff --git a/enterprise/app/services/captain/llm/translate_query_service.rb b/enterprise/app/services/captain/llm/translate_query_service.rb
index 93f68b05b..3e05244d3 100644
--- a/enterprise/app/services/captain/llm/translate_query_service.rb
+++ b/enterprise/app/services/captain/llm/translate_query_service.rb
@@ -32,6 +32,10 @@ class Captain::Llm::TranslateQueryService < Captain::BaseTaskService
@llm_credential ||= system_llm_credential
end
+ def counts_toward_usage?
+ false
+ end
+
def query_in_target_language?(query)
detector = CLD3::NNetLanguageIdentifier.new(0, 1000)
result = detector.find_language(query)
diff --git a/enterprise/app/services/captain/tools/firecrawl_service.rb b/enterprise/app/services/captain/tools/firecrawl_service.rb
index bee7219e8..6797634a2 100644
--- a/enterprise/app/services/captain/tools/firecrawl_service.rb
+++ b/enterprise/app/services/captain/tools/firecrawl_service.rb
@@ -1,5 +1,5 @@
class Captain::Tools::FirecrawlService
- BASE_URL = 'https://api.firecrawl.dev/v1'.freeze
+ BASE_URL = 'https://api.firecrawl.dev/v2'.freeze
FIRECRAWL_EXCLUDE_TAGS = %w[iframe .sidebar .cookie-banner [role=navigation] [role=banner] [role=contentinfo]].freeze
def self.configured?
@@ -35,10 +35,10 @@ class Captain::Tools::FirecrawlService
def crawl_payload(url, webhook_url, crawl_limit)
{
url: url,
- maxDepth: 50,
- ignoreSitemap: false,
+ maxDiscoveryDepth: 50,
+ sitemap: 'include',
limit: crawl_limit,
- webhook: webhook_url,
+ webhook: { url: webhook_url },
scrapeOptions: scrape_options
}.to_json
end
@@ -51,7 +51,8 @@ class Captain::Tools::FirecrawlService
{
onlyMainContent: true,
formats: ['markdown'],
- excludeTags: FIRECRAWL_EXCLUDE_TAGS
+ excludeTags: FIRECRAWL_EXCLUDE_TAGS,
+ maxAge: 0
}
end
diff --git a/enterprise/app/services/onboarding/help_center_broadcaster.rb b/enterprise/app/services/onboarding/help_center_broadcaster.rb
deleted file mode 100644
index e12ed4287..000000000
--- a/enterprise/app/services/onboarding/help_center_broadcaster.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module Onboarding::HelpCenterBroadcaster
- ARTICLE_GENERATED = 'help_center.article_generated'.freeze
- GENERATION_COMPLETED = 'help_center.generation_completed'.freeze
-
- module_function
-
- def article_generated(user:, generation_id:, article:, articles_finished:)
- broadcast(user, ARTICLE_GENERATED, {
- generation_id: generation_id,
- article_id: article.id,
- articles_finished: articles_finished
- })
- end
-
- def completed(user:, generation_id:, status:, skip_reason: nil)
- broadcast(user, GENERATION_COMPLETED, {
- generation_id: generation_id,
- status: status,
- skip_reason: skip_reason
- })
- end
-
- def broadcast(user, event, payload)
- token = user&.pubsub_token
- return if token.blank?
-
- ActionCableBroadcastJob.perform_later([token], event, payload)
- end
-end
diff --git a/enterprise/app/services/onboarding/help_center_creation_service.rb b/enterprise/app/services/onboarding/help_center_creation_service.rb
index 7ccd9bff3..9bbf053b5 100644
--- a/enterprise/app/services/onboarding/help_center_creation_service.rb
+++ b/enterprise/app/services/onboarding/help_center_creation_service.rb
@@ -77,6 +77,7 @@ class Onboarding::HelpCenterCreationService
generation_id = SecureRandom.uuid
Onboarding::HelpCenterArticleGenerationJob.perform_later(@account.id, portal.id, @user.id, generation_id)
+ @account.update!(custom_attributes: @account.custom_attributes.merge('help_center_generation_id' => generation_id))
rescue StandardError => e
Rails.logger.error "[HelpCenterCreation] Failed to enqueue article generation for account #{@account.id}: #{e.class} - #{e.message}"
end
diff --git a/enterprise/lib/captain/conversation_completion_service.rb b/enterprise/lib/captain/conversation_completion_service.rb
index aa40e8000..c45559165 100644
--- a/enterprise/lib/captain/conversation_completion_service.rb
+++ b/enterprise/lib/captain/conversation_completion_service.rb
@@ -62,6 +62,10 @@ class Captain::ConversationCompletionService < Captain::BaseTaskService
@llm_credential ||= system_llm_credential
end
+ def counts_toward_usage?
+ false
+ end
+
def event_name
'captain.conversation_completion'
end
diff --git a/enterprise/lib/captain/tools/http_tool.rb b/enterprise/lib/captain/tools/http_tool.rb
index b4593d27f..18ebcf53a 100644
--- a/enterprise/lib/captain/tools/http_tool.rb
+++ b/enterprise/lib/captain/tools/http_tool.rb
@@ -15,8 +15,8 @@ class Captain::Tools::HttpTool < Agents::Tool
url = @custom_tool.build_request_url(params)
body = @custom_tool.build_request_body(params)
- response = execute_http_request(url, body, tool_context)
- @custom_tool.format_response(response.body)
+ response_body = execute_http_request(url, body, tool_context)
+ @custom_tool.format_response(response_body)
rescue StandardError => e
Rails.logger.error("HttpTool execution error for #{@custom_tool.slug}: #{e.class} - #{e.message}")
'An error occurred while executing the request'
@@ -24,89 +24,32 @@ class Captain::Tools::HttpTool < Agents::Tool
private
- PRIVATE_IP_RANGES = [
- IPAddr.new('127.0.0.0/8'), # IPv4 Loopback
- IPAddr.new('10.0.0.0/8'), # IPv4 Private network
- IPAddr.new('172.16.0.0/12'), # IPv4 Private network
- IPAddr.new('192.168.0.0/16'), # IPv4 Private network
- IPAddr.new('169.254.0.0/16'), # IPv4 Link-local
- IPAddr.new('::1'), # IPv6 Loopback
- IPAddr.new('fc00::/7'), # IPv6 Unique local addresses
- IPAddr.new('fe80::/10') # IPv6 Link-local
- ].freeze
-
# Limit response size to prevent memory exhaustion and match LLM token limits
# 1MB of text ≈ 250K tokens, which exceeds most LLM context windows
MAX_RESPONSE_SIZE = 1.megabyte
+ # Route through SafeFetch so custom tool requests share the app's centralized HTTP
+ # fetching (resolution, timeouts, response size limits, and redirect handling).
def execute_http_request(url, body, tool_context)
- uri = URI.parse(url)
+ json_body = body if @custom_tool.http_method == 'POST'
- # Check if resolved IP is private
- check_private_ip!(uri.host)
-
- http = Net::HTTP.new(uri.host, uri.port)
- http.use_ssl = uri.scheme == 'https'
- http.read_timeout = 30
- http.open_timeout = 10
- http.max_retries = 0 # Disable redirects
-
- request = build_http_request(uri, body)
- apply_authentication(request)
- apply_metadata_headers(request, tool_context)
-
- response = http.request(request)
-
- raise "HTTP request failed with status #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
- validate_response!(response)
-
- response
+ response_body = +''
+ SafeFetch.fetch(
+ url,
+ method: @custom_tool.http_method == 'POST' ? :post : :get,
+ body: json_body,
+ headers: request_headers(tool_context, json_body),
+ http_basic_authentication: @custom_tool.build_basic_auth_credentials,
+ max_bytes: MAX_RESPONSE_SIZE,
+ validate_content_type: false
+ ) { |result| response_body = result.tempfile.read }
+ response_body
end
- def check_private_ip!(hostname)
- ip_address = IPAddr.new(Resolv.getaddress(hostname))
-
- raise 'Request blocked: hostname resolves to private IP address' if PRIVATE_IP_RANGES.any? { |range| range.include?(ip_address) }
- rescue Resolv::ResolvError, SocketError => e
- raise "DNS resolution failed: #{e.message}"
- end
-
- def validate_response!(response)
- content_length = response['content-length']&.to_i
- if content_length && content_length > MAX_RESPONSE_SIZE
- raise "Response size #{content_length} bytes exceeds maximum allowed #{MAX_RESPONSE_SIZE} bytes"
- end
-
- return unless response.body && response.body.bytesize > MAX_RESPONSE_SIZE
-
- raise "Response body size #{response.body.bytesize} bytes exceeds maximum allowed #{MAX_RESPONSE_SIZE} bytes"
- end
-
- def build_http_request(uri, body)
- if @custom_tool.http_method == 'POST'
- request = Net::HTTP::Post.new(uri.request_uri)
- if body
- request.body = body
- request['Content-Type'] = 'application/json'
- end
- else
- request = Net::HTTP::Get.new(uri.request_uri)
- end
- request
- end
-
- def apply_authentication(request)
+ def request_headers(tool_context, json_body)
headers = @custom_tool.build_auth_headers
- headers.each { |key, value| request[key] = value }
-
- credentials = @custom_tool.build_basic_auth_credentials
- request.basic_auth(*credentials) if credentials
- end
-
- def apply_metadata_headers(request, tool_context)
- state = tool_context&.state || {}
- metadata_headers = @custom_tool.build_metadata_headers(state)
- metadata_headers.each { |key, value| request[key] = value }
+ headers.merge!(@custom_tool.build_metadata_headers(tool_context&.state || {}))
+ headers['Content-Type'] = 'application/json' if json_body.present?
+ headers
end
end
diff --git a/lib/captain/base_task_service.rb b/lib/captain/base_task_service.rb
index a043d38e2..d382204a5 100644
--- a/lib/captain/base_task_service.rb
+++ b/lib/captain/base_task_service.rb
@@ -150,13 +150,12 @@ class Captain::BaseTaskService
end
# Extension point consulted by the Enterprise quota wrapper. Subclasses
- # whose calls run on the operator's key (e.g. internal/onboarding tasks)
- # should override this to return false. When false, the wrapper neither
- # blocks the call on an exhausted captain_responses quota nor decrements
- # it on success — the call participates in the quota system in neither
- # direction.
+ # whose calls should not consume captain_responses should override this to
+ # return false. When false, the wrapper neither blocks the call on an
+ # exhausted captain_responses quota nor decrements it on success — the call
+ # participates in the quota system in neither direction.
def counts_toward_usage?
- true
+ llm_credential&.dig(:source) != :hook
end
def api_key_configured?
@@ -168,7 +167,15 @@ class Captain::BaseTaskService
end
def llm_credential
- @llm_credential ||= hook_llm_credential || system_llm_credential
+ @llm_credential ||= if use_account_openai_hook?
+ hook_llm_credential || system_llm_credential
+ else
+ system_llm_credential
+ end
+ end
+
+ def use_account_openai_hook?
+ false
end
def hook_llm_credential
diff --git a/lib/captain/csat_utility_analysis_service.rb b/lib/captain/csat_utility_analysis_service.rb
index e04a98a7f..7aab18e6c 100644
--- a/lib/captain/csat_utility_analysis_service.rb
+++ b/lib/captain/csat_utility_analysis_service.rb
@@ -63,4 +63,8 @@ class Captain::CsatUtilityAnalysisService < Captain::BaseTaskService
def event_name
'csat_utility_analysis'
end
+
+ def use_account_openai_hook?
+ true
+ end
end
diff --git a/lib/captain/follow_up_service.rb b/lib/captain/follow_up_service.rb
index f02ba9408..c4c1225be 100644
--- a/lib/captain/follow_up_service.rb
+++ b/lib/captain/follow_up_service.rb
@@ -103,4 +103,8 @@ class Captain::FollowUpService < Captain::BaseTaskService
def event_name
'follow_up'
end
+
+ def use_account_openai_hook?
+ true
+ end
end
diff --git a/lib/captain/label_suggestion_service.rb b/lib/captain/label_suggestion_service.rb
index 02f8bd89a..a0e030963 100644
--- a/lib/captain/label_suggestion_service.rb
+++ b/lib/captain/label_suggestion_service.rb
@@ -87,6 +87,10 @@ class Captain::LabelSuggestionService < Captain::BaseTaskService
'label_suggestion'
end
+ def use_account_openai_hook?
+ true
+ end
+
def build_follow_up_context?
false
end
diff --git a/lib/captain/reply_suggestion_service.rb b/lib/captain/reply_suggestion_service.rb
index 2daf0615c..039bdcf26 100644
--- a/lib/captain/reply_suggestion_service.rb
+++ b/lib/captain/reply_suggestion_service.rb
@@ -37,6 +37,10 @@ class Captain::ReplySuggestionService < Captain::BaseTaskService
def event_name
'reply_suggestion'
end
+
+ def use_account_openai_hook?
+ true
+ end
end
Captain::ReplySuggestionService.prepend_mod_with('Captain::ReplySuggestionService')
diff --git a/lib/captain/rewrite_service.rb b/lib/captain/rewrite_service.rb
index 3a217d3c6..6f880e775 100644
--- a/lib/captain/rewrite_service.rb
+++ b/lib/captain/rewrite_service.rb
@@ -56,4 +56,8 @@ class Captain::RewriteService < Captain::BaseTaskService
def event_name
operation
end
+
+ def use_account_openai_hook?
+ true
+ end
end
diff --git a/lib/captain/summary_service.rb b/lib/captain/summary_service.rb
index 030c0e510..f06aa42ca 100644
--- a/lib/captain/summary_service.rb
+++ b/lib/captain/summary_service.rb
@@ -24,4 +24,8 @@ class Captain::SummaryService < Captain::BaseTaskService
def event_name
'summarize'
end
+
+ def use_account_openai_hook?
+ true
+ end
end
diff --git a/lib/captain/tool_instrumentation.rb b/lib/captain/tool_instrumentation.rb
index 157aab829..3c4a1c76e 100644
--- a/lib/captain/tool_instrumentation.rb
+++ b/lib/captain/tool_instrumentation.rb
@@ -10,12 +10,14 @@ module Captain::ToolInstrumentation
response = nil
executed = false
- tracer.in_span(params[:span_name]) do |span|
- set_tool_session_attributes(span, params)
- response = yield
- executed = true
- span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, response[:message] || response.to_json)
- set_tool_session_error_attributes(span, response) if response.is_a?(Hash)
+ with_propagated_langfuse_attributes(params) do
+ tracer.in_span(params[:span_name]) do |span|
+ set_tool_session_attributes(span, params)
+ response = yield
+ executed = true
+ span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, response[:message] || response.to_json)
+ set_tool_session_error_attributes(span, response) if response.is_a?(Hash)
+ end
end
response
rescue StandardError => e
@@ -24,9 +26,7 @@ module Captain::ToolInstrumentation
end
def set_tool_session_attributes(span, params)
- span.set_attribute(ATTR_LANGFUSE_USER_ID, params[:account_id].to_s) if params[:account_id]
- span.set_attribute(ATTR_LANGFUSE_SESSION_ID, "#{params[:account_id]}_#{params[:conversation_id]}") if params[:conversation_id].present?
- span.set_attribute(ATTR_LANGFUSE_TAGS, [params[:feature_name]].to_json)
+ set_metadata_attributes(span, params)
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:messages].to_json)
end
@@ -43,6 +43,7 @@ module Captain::ToolInstrumentation
return unless message.respond_to?(:role) && message.role.to_s == 'assistant'
tracer.in_span("llm.#{event_name}.generation") do |span|
+ apply_current_langfuse_attributes(span)
span.set_attribute(ATTR_GEN_AI_PROVIDER, 'openai')
span.set_attribute(ATTR_GEN_AI_REQUEST_MODEL, model)
span.set_attribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, message.input_tokens)
diff --git a/lib/custom_markdown_renderer.rb b/lib/custom_markdown_renderer.rb
index 665d4c80c..fa191f5ed 100644
--- a/lib/custom_markdown_renderer.rb
+++ b/lib/custom_markdown_renderer.rb
@@ -9,9 +9,32 @@ class CustomMarkdownRenderer < CommonMarker::HtmlRenderer
@embed_regexes ||= config.transform_values { |embed_config| Regexp.new(embed_config['regex']) }
end
+ # Matches columnResizing({ cellMinWidth: 50 }) in @chatwoot/prosemirror-schema
+ # so cells without an explicit colwidth render the same minimum here as in the editor.
+ TABLE_CELL_MIN_WIDTH_PX = 50
+ COLWIDTHS_COMMENT = //
+
+ # The article editor serializes column widths as a `` HTML
+ # comment immediately before each resized table. Capture it (emitting nothing) so the
+ # next `table` can size itself; any other raw HTML keeps its default rendering.
+ def html(node)
+ match = node.string_content.match(COLWIDTHS_COMMENT)
+ return super unless match
+
+ @pending_colwidths = match[1].split(',').map(&:to_i)
+ end
+
def table(node)
- out('')
- super
+ widths = @pending_colwidths
+ @pending_colwidths = nil
+
+ if sized_widths?(widths)
+ out(table_wrapper_open(widths))
+ out(inject_table_sizing(capture_html { super(node) }, widths))
+ else
+ out('
')
+ super
+ end
out('
')
end
@@ -47,6 +70,61 @@ class CustomMarkdownRenderer < CommonMarker::HtmlRenderer
private
+ def sized_widths?(widths)
+ widths.is_a?(Array) && widths.any? { |w| w.to_i.positive? }
+ end
+
+ def fully_sized?(widths)
+ widths.all? { |w| w.to_i.positive? }
+ end
+
+ # Fully-sized tables hug their exact width so the card doesn't trail empty space;
+ # partial tables stay a plain full-width card so flexible columns can expand.
+ def table_wrapper_open(widths)
+ return '
' unless fully_sized?(widths)
+
+ %(
)
+ end
+
+ # Let the gem render the whole table, then splice a
and sizing style
+ # into the opening tag. Delegating the row/cell/tbody/alignment markup to
+ # super keeps this working across commonmarker upgrades.
+ # `!important` overrides the portal's `[&_table]:!min-w-full` Tailwind rule.
+ def inject_table_sizing(html, widths)
+ opening = %(\n#{colgroup_html(widths)})
+ html.sub(/]*>\n?/, opening)
+ end
+
+ # Capture everything `super` writes by swapping the renderer's output buffer.
+ def capture_html
+ original = @stream
+ @stream = StringIO.new(+'')
+ yield
+ @stream.string
+ ensure
+ @stream = original
+ end
+
+ # Total table width: each column's saved width, or the cell min for unsized ones.
+ def total_width(widths)
+ widths.sum { |w| w.to_i.positive? ? w.to_i : TABLE_CELL_MIN_WIDTH_PX }
+ end
+
+ # Fully sized → lock to the exact total (min-width too, so a narrow saved width
+ # beats the portal's `[&_table]:!min-w-full`). Partial → `max(100%, total)` fills
+ # the container (flexible columns) yet scrolls when the sized columns exceed it.
+ def table_sizing_style(widths)
+ total = total_width(widths)
+ return "table-layout: fixed; min-width: max(100%, #{total}px) !important;" unless fully_sized?(widths)
+
+ "table-layout: fixed; width: #{total}px !important; min-width: #{total}px !important;"
+ end
+
+ def colgroup_html(widths)
+ cols = widths.map { |w| w.to_i.positive? ? %() : '' }
+ "#{cols.join}\n"
+ end
+
def extract_image_width(src)
query = URI.parse(src).query
raw = query && CGI.parse(query)['cw_image_width']&.first
diff --git a/lib/filters/filter_keys.yml b/lib/filters/filter_keys.yml
index 25d0e5196..006a862b2 100644
--- a/lib/filters/filter_keys.yml
+++ b/lib/filters/filter_keys.yml
@@ -44,6 +44,12 @@ conversations:
- "not_equal_to"
- "is_present"
- "is_not_present"
+ contact_id:
+ attribute_type: "standard"
+ data_type: "number"
+ filter_operators:
+ - "equal_to"
+ - "not_equal_to"
priority:
attribute_type: "standard"
data_type: "text"
diff --git a/lib/integrations/llm_instrumentation.rb b/lib/integrations/llm_instrumentation.rb
index 326bb901e..0257f5c3a 100644
--- a/lib/integrations/llm_instrumentation.rb
+++ b/lib/integrations/llm_instrumentation.rb
@@ -29,16 +29,18 @@ module Integrations::LlmInstrumentation
result = nil
executed = false
- tracer.in_span(params[:span_name]) do |span|
- set_metadata_attributes(span, params)
+ with_propagated_langfuse_attributes(params) do
+ tracer.in_span(params[:span_name]) do |span|
+ set_metadata_attributes(span, params)
- # By default, the input and output of a trace are set from the root observation
- span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:messages].to_json)
- result = yield
- executed = true
- span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, result.to_json)
- set_error_attributes(span, result) if result.is_a?(Hash)
- result
+ # By default, the input and output of a trace are set from the root observation
+ span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:messages].to_json)
+ result = yield
+ executed = true
+ span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, result.to_json)
+ set_error_attributes(span, result) if result.is_a?(Hash)
+ result
+ end
end
rescue StandardError => e
ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
@@ -51,6 +53,7 @@ module Integrations::LlmInstrumentation
return yield unless ChatwootApp.otel_enabled?
tracer.in_span(format(TOOL_SPAN_NAME, tool_name)) do |span|
+ apply_current_langfuse_attributes(span)
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_TYPE, 'tool')
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, arguments.to_json)
result = yield
@@ -96,23 +99,6 @@ module Integrations::LlmInstrumentation
end
end
- def instrument_with_span(span_name, params, &)
- result = nil
- executed = false
- tracer.in_span(span_name) do |span|
- track_result = lambda do |r|
- executed = true
- result = r
- end
- yield(span, track_result)
- end
- rescue StandardError => e
- ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
- raise unless executed
-
- result
- end
-
private
def resolve_account(params)
diff --git a/lib/integrations/llm_instrumentation_completion_helpers.rb b/lib/integrations/llm_instrumentation_completion_helpers.rb
index 551d0780f..26af2aae1 100644
--- a/lib/integrations/llm_instrumentation_completion_helpers.rb
+++ b/lib/integrations/llm_instrumentation_completion_helpers.rb
@@ -10,7 +10,6 @@ module Integrations::LlmInstrumentationCompletionHelpers
span.set_attribute(ATTR_GEN_AI_REQUEST_MODEL, params[:model])
span.set_attribute('embedding.input_length', params[:input]&.length || 0)
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:input].to_s)
- set_common_span_metadata(span, params)
end
def set_audio_transcription_span_attributes(span, params)
@@ -18,7 +17,6 @@ module Integrations::LlmInstrumentationCompletionHelpers
span.set_attribute(ATTR_GEN_AI_REQUEST_MODEL, params[:model] || 'whisper-1')
span.set_attribute('audio.duration_seconds', params[:duration]) if params[:duration]
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:file_path].to_s) if params[:file_path]
- set_common_span_metadata(span, params)
end
def set_moderation_span_attributes(span, params)
@@ -26,12 +24,6 @@ module Integrations::LlmInstrumentationCompletionHelpers
span.set_attribute(ATTR_GEN_AI_REQUEST_MODEL, params[:model] || 'text-moderation-latest')
span.set_attribute('moderation.input_length', params[:input]&.length || 0)
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:input].to_s)
- set_common_span_metadata(span, params)
- end
-
- def set_common_span_metadata(span, params)
- span.set_attribute(ATTR_LANGFUSE_USER_ID, params[:account_id].to_s) if params[:account_id]
- span.set_attribute(ATTR_LANGFUSE_TAGS, [params[:feature_name]].to_json) if params[:feature_name]
end
def set_embedding_result_attributes(span, result)
diff --git a/lib/integrations/llm_instrumentation_constants.rb b/lib/integrations/llm_instrumentation_constants.rb
index dfe1e7704..f274d1145 100644
--- a/lib/integrations/llm_instrumentation_constants.rb
+++ b/lib/integrations/llm_instrumentation_constants.rb
@@ -29,4 +29,5 @@ module Integrations::LlmInstrumentationConstants
ATTR_LANGFUSE_OBSERVATION_TYPE = 'langfuse.observation.type'
ATTR_LANGFUSE_OBSERVATION_INPUT = 'langfuse.observation.input'
ATTR_LANGFUSE_OBSERVATION_OUTPUT = 'langfuse.observation.output'
+ ATTR_LANGFUSE_OBSERVATION_METADATA = 'langfuse.observation.metadata.%s'
end
diff --git a/lib/integrations/llm_instrumentation_context.rb b/lib/integrations/llm_instrumentation_context.rb
new file mode 100644
index 000000000..27b1eb2b2
--- /dev/null
+++ b/lib/integrations/llm_instrumentation_context.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Integrations::LlmInstrumentationContext
+ LANGFUSE_ATTRIBUTES_KEY = :llm_instrumentation_langfuse_attributes
+ LANGFUSE_OBSERVATION_METADATA_KEY = :llm_instrumentation_langfuse_observation_metadata_attributes
+
+ private
+
+ def with_propagated_langfuse_attributes(params)
+ previous_attributes = current_langfuse_attributes
+ previous_observation_metadata_attributes = current_observation_metadata_attributes
+ self.current_langfuse_attributes = previous_attributes.merge(propagated_langfuse_attributes(params))
+ self.current_observation_metadata_attributes = previous_observation_metadata_attributes.merge(propagated_observation_metadata_attributes(params))
+
+ yield
+ ensure
+ self.current_langfuse_attributes = previous_attributes
+ self.current_observation_metadata_attributes = previous_observation_metadata_attributes
+ end
+
+ def apply_current_langfuse_attributes(span)
+ set_langfuse_attributes(span, current_langfuse_attributes)
+ set_langfuse_attributes(span, current_observation_metadata_attributes)
+ end
+
+ def current_langfuse_attributes
+ ActiveSupport::IsolatedExecutionState[LANGFUSE_ATTRIBUTES_KEY] || {}
+ end
+
+ def current_langfuse_attributes=(attrs)
+ ActiveSupport::IsolatedExecutionState[LANGFUSE_ATTRIBUTES_KEY] = attrs
+ end
+
+ def current_observation_metadata_attributes
+ ActiveSupport::IsolatedExecutionState[LANGFUSE_OBSERVATION_METADATA_KEY] || {}
+ end
+
+ def current_observation_metadata_attributes=(attrs)
+ ActiveSupport::IsolatedExecutionState[LANGFUSE_OBSERVATION_METADATA_KEY] = attrs
+ end
+end
diff --git a/lib/integrations/llm_instrumentation_helpers.rb b/lib/integrations/llm_instrumentation_helpers.rb
index 129092ed4..debbfaeda 100644
--- a/lib/integrations/llm_instrumentation_helpers.rb
+++ b/lib/integrations/llm_instrumentation_helpers.rb
@@ -2,6 +2,7 @@
module Integrations::LlmInstrumentationHelpers
include Integrations::LlmInstrumentationConstants
+ include Integrations::LlmInstrumentationContext
include Integrations::LlmInstrumentationCompletionHelpers
def determine_provider(model_name)
@@ -51,15 +52,55 @@ module Integrations::LlmInstrumentationHelpers
end
def set_metadata_attributes(span, params)
- session_id = params[:conversation_id].present? ? "#{params[:account_id]}_#{params[:conversation_id]}" : nil
- span.set_attribute(ATTR_LANGFUSE_USER_ID, params[:account_id].to_s) if params[:account_id]
- span.set_attribute(ATTR_LANGFUSE_SESSION_ID, session_id) if session_id.present?
- span.set_attribute(ATTR_LANGFUSE_TAGS, [params[:feature_name]].to_json)
+ set_langfuse_attributes(span, current_langfuse_attributes.merge(propagated_langfuse_attributes(params)))
+ set_langfuse_attributes(span, current_observation_metadata_attributes.merge(propagated_observation_metadata_attributes(params)))
+ end
- return unless params[:metadata].is_a?(Hash)
+ def propagated_langfuse_attributes(params)
+ attrs = {}
+ session_id = params[:conversation_id].present? ? "#{params[:account_id]}_#{params[:conversation_id]}" : nil
+
+ attrs[ATTR_LANGFUSE_USER_ID] = params[:account_id].to_s if params[:account_id]
+ attrs[ATTR_LANGFUSE_SESSION_ID] = session_id if session_id.present?
+ attrs[ATTR_LANGFUSE_TAGS] = [params[:feature_name].to_s] if params[:feature_name].present?
+
+ return attrs unless params[:metadata].is_a?(Hash)
params[:metadata].each do |key, value|
- span.set_attribute(format(ATTR_LANGFUSE_METADATA, key), value.to_s)
+ attrs[format(ATTR_LANGFUSE_METADATA, key)] = value.to_s
+ end
+
+ attrs
+ end
+
+ def propagated_observation_metadata_attributes(params)
+ attrs = {}
+ session_id = params[:conversation_id].present? ? "#{params[:account_id]}_#{params[:conversation_id]}" : nil
+
+ add_observation_metadata(attrs, 'user_id', params[:account_id])
+ add_observation_metadata(attrs, 'account_id', params[:account_id])
+ add_observation_metadata(attrs, 'session_id', session_id)
+ add_observation_metadata(attrs, 'trace_tags', [params[:feature_name]].to_json)
+ add_observation_metadata(attrs, 'feature_name', params[:feature_name])
+
+ return attrs unless params[:metadata].is_a?(Hash)
+
+ params[:metadata].each do |key, value|
+ add_observation_metadata(attrs, key, value)
+ end
+
+ attrs
+ end
+
+ def add_observation_metadata(attrs, key, value)
+ return if value.blank?
+
+ attrs[format(ATTR_LANGFUSE_OBSERVATION_METADATA, key)] = value.to_s
+ end
+
+ def set_langfuse_attributes(span, attrs)
+ attrs.each do |key, value|
+ span.set_attribute(key, value)
end
end
end
diff --git a/lib/integrations/llm_instrumentation_spans.rb b/lib/integrations/llm_instrumentation_spans.rb
index 85ea599f8..2def9749d 100644
--- a/lib/integrations/llm_instrumentation_spans.rb
+++ b/lib/integrations/llm_instrumentation_spans.rb
@@ -39,6 +39,7 @@ module Integrations::LlmInstrumentationSpans
tool_name = tool_call.name.to_s
span = tracer.start_span(format(TOOL_SPAN_NAME, tool_name))
+ apply_current_langfuse_attributes(span)
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_TYPE, 'tool')
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, tool_call.arguments.to_json)
@@ -61,6 +62,24 @@ module Integrations::LlmInstrumentationSpans
Rails.logger.warn "Failed to end tool span: #{e.message}"
end
+ def instrument_with_span(span_name, params, &)
+ result = nil
+ executed = false
+ tracer.in_span(span_name) do |span|
+ set_metadata_attributes(span, params)
+ track_result = lambda do |r|
+ executed = true
+ result = r
+ end
+ yield(span, track_result)
+ end
+ rescue StandardError => e
+ ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
+ raise unless executed
+
+ result
+ end
+
private
def set_llm_turn_request_attributes(span, params)
diff --git a/lib/opentelemetry_config.rb b/lib/opentelemetry_config.rb
index 5ed17e098..32be413d0 100644
--- a/lib/opentelemetry_config.rb
+++ b/lib/opentelemetry_config.rb
@@ -72,7 +72,10 @@ module OpentelemetryConfig
config = {
endpoint: traces_endpoint,
- headers: { 'Authorization' => "Basic #{auth_header}" }
+ headers: {
+ 'Authorization' => "Basic #{auth_header}",
+ 'x-langfuse-ingestion-version' => '4'
+ }
}
config[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
diff --git a/package.json b/package.json
index d8527051d..bc51bbd85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "4.14.1",
+ "version": "4.14.2",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
@@ -34,7 +34,7 @@
"@amplitude/analytics-browser": "^2.11.10",
"@breezystack/lamejs": "^1.2.7",
"@chatwoot/ninja-keys": "1.2.3",
- "@chatwoot/prosemirror-schema": "1.3.17",
+ "@chatwoot/prosemirror-schema": "1.3.19",
"@chatwoot/utils": "^0.0.55",
"@formkit/core": "^1.7.2",
"@formkit/vue": "^1.7.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a4b61061c..68e667953 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,8 +25,8 @@ importers:
specifier: 1.2.3
version: 1.2.3
'@chatwoot/prosemirror-schema':
- specifier: 1.3.17
- version: 1.3.17
+ specifier: 1.3.19
+ version: 1.3.19
'@chatwoot/utils':
specifier: ^0.0.55
version: 0.0.55
@@ -458,8 +458,8 @@ packages:
'@chatwoot/ninja-keys@1.2.3':
resolution: {integrity: sha512-xM8d9P5ikDMZm2WbaCTk/TW5HFauylrU3cJ75fq5je6ixKwyhl/0kZbVN/vbbZN4+AUX/OaSIn6IJbtCgIF67g==}
- '@chatwoot/prosemirror-schema@1.3.17':
- resolution: {integrity: sha512-n78ZfMIzSrylImIN5cjCeEdTJ8ub0JtCybwUlqFyOyLy3ZzAZpOHvCSo+w/KmV4dCgOH2mBmYlxBQ9Rww+e0Rw==}
+ '@chatwoot/prosemirror-schema@1.3.19':
+ resolution: {integrity: sha512-LbATIAeTzclvbIK6WjtrGUO37AtMWkzCJi+s/KpUIp81TORhc0fHnclGT3353AbxeH6dF51/4hFTTsmF+ziqGA==}
'@chatwoot/utils@0.0.55':
resolution: {integrity: sha512-8G6HYQe1ZEYfJEsSYfDVvE+uhf98JDRjtGlpB+bzMko+yltbrk4yACSo/ImC3jSaJ6K8yPTSjJToSRmsQbL2iQ==}
@@ -5128,7 +5128,7 @@ snapshots:
hotkeys-js: 3.8.7
lit: 2.2.6
- '@chatwoot/prosemirror-schema@1.3.17':
+ '@chatwoot/prosemirror-schema@1.3.19':
dependencies:
markdown-it-sup: 2.0.0
prosemirror-commands: 1.7.1
diff --git a/public/audio/dashboard/ringtone.mp3 b/public/audio/dashboard/ringtone.mp3
new file mode 100644
index 000000000..c2af2b6d1
Binary files /dev/null and b/public/audio/dashboard/ringtone.mp3 differ
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 9e03e2587..0fd6ad7bf 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -100,6 +100,35 @@ RSpec.describe 'Inboxes API', type: :request do
expect(JSON.parse(response.body, symbolize_names: true)[:id]).to eq(inbox.id)
end
+ it 'returns reauthorization_required for embedded signup whatsapp channel when reauth required' do
+ whatsapp_channel = create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud', sync_templates: false,
+ validate_provider_config: false)
+ whatsapp_inbox = create(:inbox, channel: whatsapp_channel, account: account)
+ whatsapp_channel.prompt_reauthorization!
+
+ get "/api/v1/accounts/#{account.id}/inboxes/#{whatsapp_inbox.id}",
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body['reauthorization_required']).to be(true)
+ end
+
+ it 'does not flag reauthorization_required for manual whatsapp channel even when reauth required' do
+ whatsapp_channel = create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud', sync_templates: false,
+ validate_provider_config: false)
+ whatsapp_channel.update!(provider_config: whatsapp_channel.provider_config.merge('source' => 'manual'))
+ whatsapp_inbox = create(:inbox, channel: whatsapp_channel, account: account)
+ whatsapp_channel.prompt_reauthorization!
+
+ get "/api/v1/accounts/#{account.id}/inboxes/#{whatsapp_inbox.id}",
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body['reauthorization_required']).to be(false)
+ end
+
it 'returns the inbox if assigned inbox is assigned as agent' do
create(:inbox_member, user: agent, inbox: inbox)
get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}",
diff --git a/spec/controllers/api/v1/accounts/onboardings_controller_spec.rb b/spec/controllers/api/v1/accounts/onboardings_controller_spec.rb
index ec2b4dcaa..6f118624b 100644
--- a/spec/controllers/api/v1/accounts/onboardings_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/onboardings_controller_spec.rb
@@ -111,4 +111,40 @@ RSpec.describe 'Onboarding API', type: :request do
end
end
end
+
+ describe 'GET /api/v1/accounts/{account.id}/onboarding/help_center_generation' do
+ context 'when unauthenticated' do
+ it 'returns unauthorized' do
+ get "/api/v1/accounts/#{account.id}/onboarding/help_center_generation", as: :json
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when authenticated as an agent (non-admin)' do
+ let(:agent) { create(:user, account: account, role: :agent) }
+
+ it 'returns unauthorized' do
+ get "/api/v1/accounts/#{account.id}/onboarding/help_center_generation",
+ headers: agent.create_new_auth_token, as: :json
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when no help center generation has started' do
+ it 'returns not_started with zero counts' do
+ get "/api/v1/accounts/#{account.id}/onboarding/help_center_generation",
+ headers: admin.create_new_auth_token, as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body).to include(
+ 'generation_id' => nil,
+ 'state' => nil,
+ 'articles_count' => 0,
+ 'categories_count' => 0
+ )
+ end
+ end
+ end
end
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index 860791c0e..ccb5d7449 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -173,7 +173,8 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
],
'default_locale' => 'en',
'layout' => 'classic',
- 'social_profiles' => {}
+ 'social_profiles' => {},
+ 'locale_translations' => {}
}
)
end
diff --git a/spec/drops/contact_drop_spec.rb b/spec/drops/contact_drop_spec.rb
index d00a0924d..cd6d1a185 100644
--- a/spec/drops/contact_drop_spec.rb
+++ b/spec/drops/contact_drop_spec.rb
@@ -11,6 +11,11 @@ describe ContactDrop do
expect(subject.first_name).to eq 'John'
end
+ it 'returns the single word (capitalized) as first name when name has only one word' do
+ contact.update!(name: 'john')
+ expect(subject.first_name).to eq 'John'
+ end
+
it('return the capitalized name') do
contact.update!(name: 'john doe')
expect(subject.name).to eq 'John Doe'
diff --git a/spec/drops/user_drop_spec.rb b/spec/drops/user_drop_spec.rb
index 1093ec4a0..34f8f5eaa 100644
--- a/spec/drops/user_drop_spec.rb
+++ b/spec/drops/user_drop_spec.rb
@@ -11,6 +11,11 @@ describe UserDrop do
expect(subject.first_name).to eq 'John'
end
+ it 'returns the single word as first name when name has only one word' do
+ user.update!(name: 'John')
+ expect(subject.first_name).to eq 'John'
+ end
+
it('return the capitalized first name') do
user.update!(name: 'john doe')
expect(subject.first_name).to eq 'John'
diff --git a/spec/enterprise/builders/saml_user_builder_spec.rb b/spec/enterprise/builders/saml_user_builder_spec.rb
index 9ebaf3a55..d3f3cb601 100644
--- a/spec/enterprise/builders/saml_user_builder_spec.rb
+++ b/spec/enterprise/builders/saml_user_builder_spec.rb
@@ -122,8 +122,8 @@ RSpec.describe SamlUserBuilder do
it 'does not add the user to the target account' do
expect do
builder.perform
- rescue SamlUserBuilder::AuthenticationFailed
- nil
+ rescue StandardError => e
+ raise unless e.class.name == 'SamlUserBuilder::AuthenticationFailed' # rubocop:disable Style/ClassEqualityComparison
end.not_to change(AccountUser, :count)
expect(existing_user.reload.accounts).not_to include(account)
end
@@ -131,8 +131,8 @@ RSpec.describe SamlUserBuilder do
it 'does not convert the user provider to saml' do
expect do
builder.perform
- rescue SamlUserBuilder::AuthenticationFailed
- nil
+ rescue StandardError => e
+ raise unless e.class.name == 'SamlUserBuilder::AuthenticationFailed' # rubocop:disable Style/ClassEqualityComparison
end.not_to(change { existing_user.reload.provider })
end
end
diff --git a/spec/enterprise/controllers/api/v1/accounts/onboardings_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/onboardings_controller_spec.rb
new file mode 100644
index 000000000..59d0564fa
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/onboardings_controller_spec.rb
@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Onboarding API', type: :request do
+ let(:account) { create(:account, domain: 'example.com') }
+ let(:admin) { create(:user, account: account, role: :administrator) }
+
+ describe 'GET /api/v1/accounts/{account.id}/onboarding/help_center_generation' do
+ context 'when help center generation is in progress' do
+ let(:generation_id) { 'generation-123' }
+ let!(:portal) { create(:portal, account_id: account.id) }
+ let!(:category) { create(:category, portal: portal, account_id: account.id) }
+
+ before do
+ account.update!(custom_attributes: { 'help_center_generation_id' => generation_id })
+ create(:article, portal: portal, category: category, account_id: account.id, author_id: admin.id)
+ Onboarding::HelpCenterGenerationState.start(generation_id, total: 3)
+ Onboarding::HelpCenterGenerationState.record_article_finished(generation_id)
+ end
+
+ after do
+ Redis::Alfred.delete(Onboarding::HelpCenterGenerationState.key(generation_id))
+ end
+
+ it 'returns Redis state and help center counts' do
+ get "/api/v1/accounts/#{account.id}/onboarding/help_center_generation",
+ headers: admin.create_new_auth_token, as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body).to include(
+ 'generation_id' => generation_id,
+ 'articles_count' => 1,
+ 'categories_count' => 1
+ )
+ expect(response.parsed_body['state']).to include(
+ 'status' => 'generating',
+ 'finished' => '1',
+ 'total' => '3'
+ )
+ end
+ end
+ end
+end
diff --git a/spec/enterprise/jobs/onboarding/help_center_article_generation_job_spec.rb b/spec/enterprise/jobs/onboarding/help_center_article_generation_job_spec.rb
index 62529866d..b281f0c10 100644
--- a/spec/enterprise/jobs/onboarding/help_center_article_generation_job_spec.rb
+++ b/spec/enterprise/jobs/onboarding/help_center_article_generation_job_spec.rb
@@ -53,11 +53,9 @@ RSpec.describe Onboarding::HelpCenterArticleGenerationJob do
admin.id,
generation_id,
hash_including(
- 'article' => hash_including(
- 'title' => 'Hello',
- 'urls' => ['https://x.test/a'],
- 'category_id' => portal.categories.first.id
- )
+ 'title' => 'Hello',
+ 'urls' => ['https://x.test/a'],
+ 'category_id' => portal.categories.first.id
)
)
)
@@ -83,7 +81,7 @@ RSpec.describe Onboarding::HelpCenterArticleGenerationJob do
writer_jobs = enqueued_jobs.select { |job| job['job_class'] == Onboarding::HelpCenterArticleWriterJob.name }
expect(writer_jobs.size).to eq(1)
expect(writer_jobs.first['arguments']).to include(
- hash_including('article' => hash_including('title' => 'Valid'))
+ hash_including('title' => 'Valid')
)
end
end
@@ -106,7 +104,7 @@ RSpec.describe Onboarding::HelpCenterArticleGenerationJob do
writer_jobs = enqueued_jobs.select { |job| job['job_class'] == Onboarding::HelpCenterArticleWriterJob.name }
expect(writer_jobs.size).to eq(1)
expect(writer_jobs.first['arguments']).to include(
- hash_including('article' => hash_including('title' => 'Approved', 'urls' => ['https://x.test/a']))
+ hash_including('title' => 'Approved', 'urls' => ['https://x.test/a'])
)
expect(Onboarding::HelpCenterGenerationState.current(generation_id)).to include('total' => '1')
end
@@ -170,19 +168,4 @@ RSpec.describe Onboarding::HelpCenterArticleGenerationJob do
expect(state['skip_reason']).to include('firecrawl exhausted')
end
end
-
- describe 'broadcasts' do
- it 'broadcasts generation_completed with status: skipped on CurationSkipped' do
- curator = instance_double(Onboarding::HelpCenterCurator)
- allow(curator).to receive(:perform).and_raise(
- Onboarding::HelpCenterErrors::CurationSkipped, 'no website url'
- )
- allow(Onboarding::HelpCenterCurator).to receive(:new).and_return(curator)
-
- payload = hash_including(generation_id: generation_id, status: 'skipped', skip_reason: 'no website url')
- expect { described_class.perform_now(*job_args) }
- .to have_enqueued_job(ActionCableBroadcastJob)
- .with([admin.pubsub_token], 'help_center.generation_completed', payload)
- end
- end
end
diff --git a/spec/enterprise/jobs/onboarding/help_center_article_writer_job_spec.rb b/spec/enterprise/jobs/onboarding/help_center_article_writer_job_spec.rb
index a4db6b1d3..b01ec35e3 100644
--- a/spec/enterprise/jobs/onboarding/help_center_article_writer_job_spec.rb
+++ b/spec/enterprise/jobs/onboarding/help_center_article_writer_job_spec.rb
@@ -6,8 +6,7 @@ RSpec.describe Onboarding::HelpCenterArticleWriterJob do
let!(:admin) { create(:user, account: account, role: :administrator) }
let(:generation_id) { 'generation-123' }
let(:article_spec) { { 'urls' => ['https://x.test/a'], 'title' => 'A', 'category_id' => nil } }
- let(:article_payload) { { 'article' => article_spec } }
- let(:job_args) { [account.id, portal.id, admin.id, generation_id, article_payload] }
+ let(:job_args) { [account.id, portal.id, admin.id, generation_id, article_spec] }
let(:state_key) { Onboarding::HelpCenterGenerationState.key(generation_id) }
before do
@@ -68,16 +67,14 @@ RSpec.describe Onboarding::HelpCenterArticleWriterJob do
expect(Onboarding::HelpCenterGenerationState.current(generation_id)).to include('finished' => '1')
end
- it 'broadcasts completion when the final writer fails with ArticleBuildFailed' do
+ it 'marks generation completed when the final writer fails with ArticleBuildFailed' do
allow(Onboarding::HelpCenterArticleBuilder).to receive(:new).and_raise(
Onboarding::HelpCenterErrors::ArticleBuildFailed, 'no source urls'
)
Onboarding::HelpCenterGenerationState.record_article_finished(generation_id)
- payload = hash_including(generation_id: generation_id, status: 'completed')
- expect { described_class.perform_now(*job_args) }
- .to have_enqueued_job(ActionCableBroadcastJob)
- .with([admin.pubsub_token], 'help_center.generation_completed', payload)
+ described_class.perform_now(*job_args)
+
expect(Onboarding::HelpCenterGenerationState.current(generation_id)).to include(
'status' => 'completed', 'finished' => '2'
)
@@ -105,7 +102,7 @@ RSpec.describe Onboarding::HelpCenterArticleWriterJob do
end
end
- describe 'broadcasts' do
+ describe 'missing state' do
let(:built_article) { instance_double(Article, id: 9876) }
before do
@@ -113,47 +110,10 @@ RSpec.describe Onboarding::HelpCenterArticleWriterJob do
allow(Onboarding::HelpCenterArticleBuilder).to receive(:new).and_return(builder)
end
- it 'broadcasts help_center.article_generated on success' do
- payload = hash_including(generation_id: generation_id, article_id: 9876, articles_finished: 1)
- expect { described_class.perform_now(*job_args) }
- .to have_enqueued_job(ActionCableBroadcastJob)
- .with([admin.pubsub_token], 'help_center.article_generated', payload)
- end
-
- it 'broadcasts help_center.generation_completed when the last writer finishes' do
- described_class.perform_now(*job_args)
- payload = hash_including(generation_id: generation_id, status: 'completed')
-
- expect { described_class.perform_now(*job_args) }
- .to have_enqueued_job(ActionCableBroadcastJob)
- .with([admin.pubsub_token], 'help_center.generation_completed', payload)
- end
-
- it 'does not broadcast article_generated on builder failure' do
- allow(Onboarding::HelpCenterArticleBuilder).to receive(:new).and_raise(
- Onboarding::HelpCenterErrors::ArticleBuildFailed, 'no source urls'
- )
-
- expect { described_class.perform_now(*job_args) }
- .not_to have_enqueued_job(ActionCableBroadcastJob)
- .with(anything, 'help_center.article_generated', anything)
- end
-
- it 'broadcasts generation_completed on late retries past total' do
- described_class.perform_now(*job_args)
- described_class.perform_now(*job_args)
- clear_enqueued_jobs
-
- expect { described_class.perform_now(*job_args) }
- .to have_enqueued_job(ActionCableBroadcastJob)
- .with([admin.pubsub_token], 'help_center.generation_completed', hash_including(generation_id: generation_id))
- end
-
- it 'skips progress broadcasts when state is missing' do
+ it 'does not raise when state is missing' do
Redis::Alfred.delete(state_key)
- expect { described_class.perform_now(*job_args) }
- .not_to have_enqueued_job(ActionCableBroadcastJob)
+ expect { described_class.perform_now(*job_args) }.not_to raise_error
end
end
end
diff --git a/spec/enterprise/lib/captain/base_task_service_spec.rb b/spec/enterprise/lib/captain/base_task_service_spec.rb
index b3dc473eb..fb970f726 100644
--- a/spec/enterprise/lib/captain/base_task_service_spec.rb
+++ b/spec/enterprise/lib/captain/base_task_service_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe Captain::BaseTaskService, type: :model do
before do
allow(account).to receive(:feature_enabled?).and_call_original
allow(account).to receive(:feature_enabled?).with('captain_tasks').and_return(true)
+ allow(Integrations::Openai::KeyValidator).to receive(:valid?).and_return(true)
end
context 'when usage limit is exceeded' do
@@ -111,6 +112,68 @@ RSpec.describe Captain::BaseTaskService, type: :model do
end.to change { account.custom_attributes['captain_responses_usage'].to_i }.by(1)
end
+ context 'when account has its own OpenAI hook key' do
+ before do
+ create(:integrations_hook, :openai, account: account, settings: { 'api_key' => 'customer-own-key' })
+ end
+
+ it 'still increments usage for services that do not opt into BYOK' do
+ expect(account).to receive(:increment_response_usage)
+ service.perform
+ end
+
+ context 'when the captain_responses quota is exhausted on Cloud' do
+ before do
+ allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
+ allow(account).to receive(:usage_limits).and_return({
+ captain: { responses: { current_available: 0 } }
+ })
+ end
+
+ it 'returns usage limit exceeded error for services that do not opt into BYOK' do
+ result = service.perform
+ expect(result[:error]).to eq(I18n.t('captain.copilot_limit'))
+ expect(result[:error_code]).to eq(429)
+ end
+ end
+ end
+
+ context 'when subclass opts into account OpenAI hook usage' do
+ let(:test_service_class) do
+ result = perform_result
+ klass = Class.new(described_class) do
+ define_method(:perform) { result }
+ define_method(:event_name) { 'test_event' }
+ define_method(:use_account_openai_hook?) { true }
+ end
+ klass.prepend(Enterprise::Captain::BaseTaskService)
+ klass
+ end
+
+ before do
+ create(:integrations_hook, :openai, account: account, settings: { 'api_key' => 'customer-own-key' })
+ end
+
+ it 'does not increment usage on a successful result' do
+ expect(account).not_to receive(:increment_response_usage)
+ service.perform
+ end
+
+ context 'when the captain_responses quota is exhausted on Cloud' do
+ before do
+ allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
+ allow(account).to receive(:usage_limits).and_return({
+ captain: { responses: { current_available: 0 } }
+ })
+ end
+
+ it 'bypasses the 429 gate and returns the underlying result' do
+ result = service.perform
+ expect(result).to eq(perform_result)
+ end
+ end
+ end
+
context 'when captain is disabled' do
before do
allow(account).to receive(:feature_enabled?).with('captain_tasks').and_return(false)
diff --git a/spec/enterprise/services/captain/llm/assistant_chat_service_spec.rb b/spec/enterprise/services/captain/llm/assistant_chat_service_spec.rb
index 9d233943e..6b2cc55c8 100644
--- a/spec/enterprise/services/captain/llm/assistant_chat_service_spec.rb
+++ b/spec/enterprise/services/captain/llm/assistant_chat_service_spec.rb
@@ -39,6 +39,30 @@ RSpec.describe Captain::Llm::AssistantChatService do
allow(mock_chat).to receive(:ask).and_return(mock_response)
service.generate_response(message_history: [{ role: 'user', content: 'Hello' }])
end
+
+ it 'marks final response generations for observation-level evaluators' do
+ service = described_class.new(assistant: assistant, conversation: conversation)
+ message = instance_double(RubyLLM::Message, content: 'Final answer', input_tokens: 10, output_tokens: 20, tool_calls: {})
+
+ attributes = service.send(:generation_attributes, mock_chat, message)
+
+ expect(attributes['langfuse.observation.metadata.generation_stage']).to eq('final_response')
+ end
+
+ it 'marks tool call generations separately from final responses' do
+ service = described_class.new(assistant: assistant, conversation: conversation)
+ message = instance_double(
+ RubyLLM::Message,
+ content: '',
+ input_tokens: 10,
+ output_tokens: 20,
+ tool_calls: { 'call_1' => instance_double(RubyLLM::ToolCall) }
+ )
+
+ attributes = service.send(:generation_attributes, mock_chat, message)
+
+ expect(attributes['langfuse.observation.metadata.generation_stage']).to eq('tool_call')
+ end
end
describe 'image analysis' do
diff --git a/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb b/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
index 4d4bc7aaf..9a099fc67 100644
--- a/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
@@ -53,14 +53,15 @@ RSpec.describe Captain::Tools::FirecrawlService do
let(:expected_payload) do
{
url: url,
- maxDepth: 50,
- ignoreSitemap: false,
+ maxDiscoveryDepth: 50,
+ sitemap: 'include',
limit: crawl_limit,
- webhook: webhook_url,
+ webhook: { url: webhook_url },
scrapeOptions: {
onlyMainContent: true,
formats: ['markdown'],
- excludeTags: Captain::Tools::FirecrawlService::FIRECRAWL_EXCLUDE_TAGS
+ excludeTags: Captain::Tools::FirecrawlService::FIRECRAWL_EXCLUDE_TAGS,
+ maxAge: 0
}
}.to_json
end
@@ -74,7 +75,7 @@ RSpec.describe Captain::Tools::FirecrawlService do
context 'when the API call is successful' do
before do
- stub_request(:post, 'https://api.firecrawl.dev/v1/crawl')
+ stub_request(:post, 'https://api.firecrawl.dev/v2/crawl')
.with(
body: expected_payload,
headers: expected_headers
@@ -85,7 +86,7 @@ RSpec.describe Captain::Tools::FirecrawlService do
it 'makes a POST request with correct parameters' do
service.perform(url, webhook_url, crawl_limit)
- expect(WebMock).to have_requested(:post, 'https://api.firecrawl.dev/v1/crawl')
+ expect(WebMock).to have_requested(:post, 'https://api.firecrawl.dev/v2/crawl')
.with(
body: expected_payload,
headers: expected_headers
@@ -95,7 +96,7 @@ RSpec.describe Captain::Tools::FirecrawlService do
it 'uses default crawl limit when not specified' do
default_payload = expected_payload.gsub(crawl_limit.to_s, '10')
- stub_request(:post, 'https://api.firecrawl.dev/v1/crawl')
+ stub_request(:post, 'https://api.firecrawl.dev/v2/crawl')
.with(
body: default_payload,
headers: expected_headers
@@ -104,7 +105,7 @@ RSpec.describe Captain::Tools::FirecrawlService do
service.perform(url, webhook_url)
- expect(WebMock).to have_requested(:post, 'https://api.firecrawl.dev/v1/crawl')
+ expect(WebMock).to have_requested(:post, 'https://api.firecrawl.dev/v2/crawl')
.with(
body: default_payload,
headers: expected_headers
@@ -114,7 +115,7 @@ RSpec.describe Captain::Tools::FirecrawlService do
context 'when the API call fails' do
before do
- stub_request(:post, 'https://api.firecrawl.dev/v1/crawl')
+ stub_request(:post, 'https://api.firecrawl.dev/v2/crawl')
.to_raise(StandardError.new('Connection failed'))
end
@@ -126,14 +127,14 @@ RSpec.describe Captain::Tools::FirecrawlService do
context 'when the API returns an error response' do
before do
- stub_request(:post, 'https://api.firecrawl.dev/v1/crawl')
+ stub_request(:post, 'https://api.firecrawl.dev/v2/crawl')
.to_return(status: 422, body: '{"error": "Invalid URL"}')
end
it 'makes the request but does not raise an error' do
expect { service.perform(url, webhook_url, crawl_limit) }.not_to raise_error
- expect(WebMock).to have_requested(:post, 'https://api.firecrawl.dev/v1/crawl')
+ expect(WebMock).to have_requested(:post, 'https://api.firecrawl.dev/v2/crawl')
.with(
body: expected_payload,
headers: expected_headers
diff --git a/spec/jobs/mutex_application_job_spec.rb b/spec/jobs/mutex_application_job_spec.rb
index 91a56407d..e2c03c55a 100644
--- a/spec/jobs/mutex_application_job_spec.rb
+++ b/spec/jobs/mutex_application_job_spec.rb
@@ -55,4 +55,57 @@ RSpec.describe MutexApplicationJob do
end.to raise_error(StandardError)
end
end
+
+ describe '.retry_on_lock_conflict' do
+ let(:job_class) do
+ Class.new(MutexApplicationJob) do
+ retry_on_lock_conflict wait: 1.second, attempts: 1, on_exhaustion: :process_without_lock
+
+ attr_reader :fallback_args
+
+ def perform(lock_key, _payload)
+ with_lock(lock_key) { raise 'lock should not be acquired' }
+ end
+
+ def process_without_lock(lock_key, payload)
+ @fallback_args = [lock_key, payload]
+ end
+ end
+ end
+
+ let(:payload) { { 'message' => 'hello' } }
+
+ before do
+ stub_const('LockConflictTestJob', job_class)
+ end
+
+ it 'runs the configured handler with the original job arguments when lock retries are exhausted' do
+ allow(lock_manager).to receive(:lock).with(lock_key, Redis::LockManager::LOCK_TIMEOUT).and_return(false)
+
+ job = job_class.new(lock_key, payload)
+
+ expect { job.perform_now }.not_to raise_error
+ expect(job.fallback_args).to eq([lock_key, payload])
+ end
+
+ context 'without an exhaustion handler' do
+ let(:job_class) do
+ Class.new(MutexApplicationJob) do
+ retry_on_lock_conflict wait: 1.second, attempts: 1
+
+ def perform(lock_key)
+ with_lock(lock_key) { raise 'lock should not be acquired' }
+ end
+ end
+ end
+
+ it 'raises the lock acquisition error when retries are exhausted' do
+ allow(lock_manager).to receive(:lock).with(lock_key, Redis::LockManager::LOCK_TIMEOUT).and_return(false)
+
+ expect do
+ job_class.perform_now(lock_key)
+ end.to raise_error(StandardError) { |error| expect(error.class.name).to eq('MutexApplicationJob::LockAcquisitionError') }
+ end
+ end
+ end
end
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
index d82658102..8d1b24b52 100644
--- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb
+++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
@@ -62,6 +62,14 @@ RSpec.describe Webhooks::WhatsappEventsJob do
job.perform_now(params)
end
+ it 'still enqueues for manual channels even when reauthorization required' do
+ channel.update!(provider_config: channel.provider_config.merge('source' => 'manual'))
+ channel.prompt_reauthorization!
+ allow(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new).and_return(process_service)
+ expect(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new)
+ job.perform_now(params)
+ end
+
it 'will not enqueue if channel is not present' do
allow(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new).and_return(process_service)
allow(Whatsapp::IncomingMessageService).to receive(:new).and_return(process_service)
diff --git a/spec/lib/captain/base_task_service_spec.rb b/spec/lib/captain/base_task_service_spec.rb
index 5112e47ed..34c889967 100644
--- a/spec/lib/captain/base_task_service_spec.rb
+++ b/spec/lib/captain/base_task_service_spec.rb
@@ -260,11 +260,12 @@ RSpec.describe Captain::BaseTaskService do
expect(result[:request_messages]).to eq(messages)
end
- it 'does not track exceptions for account hook failures' do
+ it 'tracks exceptions against the system key when an account hook exists' do
create(:integrations_hook, :openai, account: account, settings: { 'api_key' => 'hook-key' })
- expect(Llm::Config).to receive(:with_api_key).with('hook-key', api_base: anything).and_raise(error)
- expect(ChatwootExceptionTracker).not_to receive(:new)
+ expect(Llm::Config).to receive(:with_api_key).with('test-key', api_base: anything).and_raise(error)
+ expect(ChatwootExceptionTracker).to receive(:new).with(error, account: account).and_return(exception_tracker)
+ expect(exception_tracker).to receive(:capture_exception)
result = service.send(:make_api_call, model: model, messages: messages)
@@ -279,11 +280,60 @@ RSpec.describe Captain::BaseTaskService do
before { hook }
+ it 'uses system api key by default' do
+ expect(service.send(:api_key)).to eq('test-key')
+ end
+ end
+
+ context 'when subclass opts into account OpenAI hook usage' do
+ let(:test_service_class) do
+ Class.new(described_class) do
+ def event_name
+ 'test_event'
+ end
+
+ def use_account_openai_hook?
+ true
+ end
+ end
+ end
+
+ before do
+ create(:integrations_hook, account: account, app_id: 'openai', status: 'enabled', settings: { 'api_key' => 'hook-key' })
+ end
+
it 'uses api key from hook' do
expect(service.send(:api_key)).to eq('hook-key')
end
end
+ it 'uses account OpenAI hook for editor task services' do
+ create(:integrations_hook, account: account, app_id: 'openai', status: 'enabled', settings: { 'api_key' => 'hook-key' })
+ user = create(:user, account: account)
+ follow_up_context = {
+ 'event_name' => 'professional',
+ 'original_context' => 'Original text',
+ 'last_response' => 'Last response'
+ }
+
+ editor_services = [
+ Captain::RewriteService.new(account: account, content: 'Text', operation: 'improve', conversation_display_id: conversation.display_id),
+ Captain::SummaryService.new(account: account, conversation_display_id: conversation.display_id),
+ Captain::ReplySuggestionService.new(account: account, conversation_display_id: conversation.display_id, user: user),
+ Captain::LabelSuggestionService.new(account: account, conversation_display_id: conversation.display_id),
+ Captain::FollowUpService.new(
+ account: account,
+ follow_up_context: follow_up_context,
+ user_message: 'Make it shorter',
+ conversation_display_id: conversation.display_id
+ )
+ ]
+
+ editor_services.each do |editor_service|
+ expect(editor_service.send(:api_key)).to eq('hook-key')
+ end
+ end
+
context 'when openai hook is not configured' do
it 'uses system api key' do
expect(service.send(:api_key)).to eq('test-key')
diff --git a/spec/lib/captain/csat_utility_analysis_service_spec.rb b/spec/lib/captain/csat_utility_analysis_service_spec.rb
index e4e980e01..34e0c9ece 100644
--- a/spec/lib/captain/csat_utility_analysis_service_spec.rb
+++ b/spec/lib/captain/csat_utility_analysis_service_spec.rb
@@ -4,6 +4,11 @@ RSpec.describe Captain::CsatUtilityAnalysisService do
let(:account) { create(:account) }
let(:service) { described_class.new(account: account, message: 'Test message', language: 'en', baseline: {}) }
+ before do
+ create(:installation_config, name: 'CAPTAIN_OPEN_AI_API_KEY', value: 'test-key')
+ allow(Integrations::Openai::KeyValidator).to receive(:valid?).and_return(true)
+ end
+
describe '#perform' do
before do
allow(account).to receive(:feature_enabled?).and_call_original
@@ -21,4 +26,22 @@ RSpec.describe Captain::CsatUtilityAnalysisService do
expect(result[:message]).to eq('{"classification":"LIKELY_UTILITY","optimized_message":"Utility-safe message"}')
end
end
+
+ describe '#api_key' do
+ context 'when account has an OpenAI hook key' do
+ before do
+ create(:integrations_hook, :openai, account: account, settings: { 'api_key' => 'customer-own-key' })
+ end
+
+ it 'uses the account hook key' do
+ expect(service.send(:api_key)).to eq('customer-own-key')
+ end
+ end
+
+ context 'when account does not have an OpenAI hook key' do
+ it 'uses the system key' do
+ expect(service.send(:api_key)).to eq('test-key')
+ end
+ end
+ end
end
diff --git a/spec/lib/custom_markdown_renderer_spec.rb b/spec/lib/custom_markdown_renderer_spec.rb
index 28c5e069c..6484f2e6c 100644
--- a/spec/lib/custom_markdown_renderer_spec.rb
+++ b/spec/lib/custom_markdown_renderer_spec.rb
@@ -258,6 +258,59 @@ describe CustomMarkdownRenderer do
end
end
+ describe '#table' do
+ def render_table(markdown)
+ doc = CommonMarker.render_doc(markdown, :DEFAULT, [:table])
+ described_class.new.render(doc)
+ end
+
+ let(:plain_table) { "| A | B |\n| --- | --- |\n| 1 | 2 |\n" }
+
+ it 'renders a table without column widths when no marker is present' do
+ output = render_table(plain_table)
+ expect(output).to include('')
+ expect(output).not_to include('colgroup')
+ expect(output).not_to include('cw-colwidths')
+ end
+
+ context 'when every column has a saved width' do
+ it 'lays the table out at the total width with a sized colgroup' do
+ output = render_table("\n#{plain_table}")
+ # Wrapper hugs the table; min-width is set alongside width so a narrow saved width beats min-w-full.
+ expect(output).to include('')
+ expect(output).to include('
')
+ expect(output).to include('')
+ end
+ end
+
+ context 'when only some columns have a saved width' do
+ it 'fills the container so unsized columns stay flexible, floored at the sized total' do
+ output = render_table("\n#{plain_table}")
+ # max(100%, 200px): fills the container (flexible) but scrolls if the sized columns exceed it.
+ expect(output).to include('table-layout: fixed; min-width: max(100%, 200px) !important;')
+ expect(output).to include('')
+ # No exact-width lock on the wrapper or table — the table must be free to expand.
+ expect(output).to include('')
+ expect(output).to include('width: 400px !important;')
+ expect(output).to include('')
+ expect(output.scan('colgroup').length).to eq(2)
+ end
+
+ it 'does not emit the marker comment into the rendered html' do
+ expect(render_table("\n#{plain_table}")).not_to include('cw-colwidths')
+ end
+ end
+
describe '#image' do
it 'renders width in px with responsive cap and auto height' do
markdown = ''
diff --git a/spec/lib/integrations/llm_instrumentation_spec.rb b/spec/lib/integrations/llm_instrumentation_spec.rb
index 0be62f437..f291cd7b2 100644
--- a/spec/lib/integrations/llm_instrumentation_spec.rb
+++ b/spec/lib/integrations/llm_instrumentation_spec.rb
@@ -144,7 +144,10 @@ RSpec.describe Integrations::LlmInstrumentation do
expect(mock_span).to have_received(:set_attribute).with('langfuse.user.id', '123')
expect(mock_span).to have_received(:set_attribute).with('langfuse.session.id', '123_456')
- expect(mock_span).to have_received(:set_attribute).with('langfuse.trace.tags', '["reply_suggestion"]')
+ expect(mock_span).to have_received(:set_attribute).with('langfuse.trace.tags', ['reply_suggestion'])
+ expect(mock_span).to have_received(:set_attribute).with('langfuse.observation.metadata.user_id', '123')
+ expect(mock_span).to have_received(:set_attribute).with('langfuse.observation.metadata.session_id', '123_456')
+ expect(mock_span).to have_received(:set_attribute).with('langfuse.observation.metadata.feature_name', 'reply_suggestion')
end
it 'sets completion message attributes when result contains message' do
@@ -253,6 +256,76 @@ RSpec.describe Integrations::LlmInstrumentation do
expect(mock_span).to have_received(:set_attribute).with('langfuse.observation.output', result_data.to_json)
end
+ it 'propagates trace attributes as observation metadata to child tool spans' do
+ root_span = instance_double(OpenTelemetry::Trace::Span)
+ tool_span = instance_double(OpenTelemetry::Trace::Span)
+ tool_instance = test_class.new
+ allow(root_span).to receive(:set_attribute)
+ allow(tool_span).to receive(:set_attribute)
+ allow(instance).to receive(:tracer).and_return(mock_tracer)
+ allow(tool_instance).to receive(:tracer).and_return(mock_tracer)
+ allow(mock_tracer).to receive(:in_span).with('llm.test').and_yield(root_span)
+ allow(mock_tracer).to receive(:in_span).with('tool.search').and_yield(tool_span)
+
+ instance.instrument_agent_session(params) do
+ tool_instance.instrument_tool_call('search', { query: 'test' }) { 'tool result' }
+ end
+
+ expect(tool_span).to have_received(:set_attribute).with('langfuse.observation.metadata.user_id', '123')
+ expect(tool_span).to have_received(:set_attribute).with('langfuse.observation.metadata.session_id', '123_456')
+ expect(tool_span).to have_received(:set_attribute).with('langfuse.observation.metadata.feature_name', 'reply_suggestion')
+ end
+
+ it 'keeps inherited session metadata for nested service spans with their own feature tag' do
+ root_span = instance_double(OpenTelemetry::Trace::Span)
+ nested_span = instance_double(OpenTelemetry::Trace::Span)
+ nested_instance = test_class.new
+ nested_params = params.merge(span_name: 'llm.translate_query', conversation_id: nil, feature_name: 'translate_query')
+ allow(root_span).to receive(:set_attribute)
+ allow(nested_span).to receive(:set_attribute)
+ allow(instance).to receive(:tracer).and_return(mock_tracer)
+ allow(nested_instance).to receive(:tracer).and_return(mock_tracer)
+ allow(mock_tracer).to receive(:in_span).with('llm.test').and_yield(root_span)
+ allow(mock_tracer).to receive(:in_span).with('llm.translate_query').and_yield(nested_span)
+
+ instance.instrument_agent_session(params) do
+ nested_instance.instrument_llm_call(nested_params) { 'translated query' }
+ end
+
+ expect(nested_span).to have_received(:set_attribute).with('langfuse.session.id', '123_456')
+ expect(nested_span).to have_received(:set_attribute).with('langfuse.trace.tags', ['translate_query'])
+ expect(nested_span).to have_received(:set_attribute).with('langfuse.observation.metadata.session_id', '123_456')
+ expect(nested_span).to have_received(:set_attribute).with('langfuse.observation.metadata.feature_name', 'translate_query')
+ end
+
+ it 'propagates session metadata to nested embedding spans' do
+ root_span = instance_double(OpenTelemetry::Trace::Span)
+ embedding_span = instance_double(OpenTelemetry::Trace::Span)
+ embedding_instance = test_class.new
+ embedding_params = {
+ span_name: 'llm.captain.embedding',
+ account_id: 123,
+ feature_name: 'embedding',
+ model: 'text-embedding-3-small',
+ input: 'search result'
+ }
+ allow(root_span).to receive(:set_attribute)
+ allow(embedding_span).to receive(:set_attribute)
+ allow(instance).to receive(:tracer).and_return(mock_tracer)
+ allow(embedding_instance).to receive(:tracer).and_return(mock_tracer)
+ allow(mock_tracer).to receive(:in_span).with('llm.test').and_yield(root_span)
+ allow(mock_tracer).to receive(:in_span).with('llm.captain.embedding').and_yield(embedding_span)
+
+ instance.instrument_agent_session(params) do
+ embedding_instance.instrument_embedding_call(embedding_params) { [0.1, 0.2, 0.3] }
+ end
+
+ expect(embedding_span).to have_received(:set_attribute).with('langfuse.session.id', '123_456')
+ expect(embedding_span).to have_received(:set_attribute).with('langfuse.trace.tags', ['embedding'])
+ expect(embedding_span).to have_received(:set_attribute).with('langfuse.observation.metadata.session_id', '123_456')
+ expect(embedding_span).to have_received(:set_attribute).with('langfuse.observation.metadata.feature_name', 'embedding')
+ end
+
# Regression test for Langfuse double-counting bug.
# Setting gen_ai.request.model on parent spans causes Langfuse to classify them as
# GENERATIONs instead of SPANs, resulting in cost being counted multiple times
diff --git a/spec/listeners/agent_bot_listener_spec.rb b/spec/listeners/agent_bot_listener_spec.rb
index 08deeb6c4..e3f9f0402 100644
--- a/spec/listeners/agent_bot_listener_spec.rb
+++ b/spec/listeners/agent_bot_listener_spec.rb
@@ -82,7 +82,7 @@ describe AgentBotListener do
create(:agent_bot_inbox, inbox: inbox, agent_bot: agent_bot)
expect(AgentBots::WebhookJob).to receive(:perform_later).with(
agent_bot.outgoing_url,
- hash_including(event: 'conversation_status_changed', changed_attributes: anything),
+ hash_including(event: 'conversation_status_changed', account: account.webhook_data, changed_attributes: anything),
:agent_bot_webhook,
hash_including(secret: agent_bot.secret)
).once
@@ -158,6 +158,24 @@ describe AgentBotListener do
end
end
+ describe '#conversation_resolved' do
+ let(:event_name) { 'conversation.resolved' }
+ let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
+
+ context 'when agent bot is configured' do
+ it 'sends account details in the conversation payload' do
+ create(:agent_bot_inbox, inbox: inbox, agent_bot: agent_bot)
+ expect(AgentBots::WebhookJob).to receive(:perform_later).with(
+ agent_bot.outgoing_url,
+ hash_including(event: 'conversation_resolved', account: account.webhook_data),
+ :agent_bot_webhook,
+ hash_including(secret: agent_bot.secret)
+ ).once
+ listener.conversation_resolved(event)
+ end
+ end
+ end
+
describe '#webwidget_triggered' do
let(:event_name) { 'webwidget.triggered' }
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index a7a64f175..b63f43c2f 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -101,6 +101,17 @@ describe WebhookListener do
).once
listener.conversation_created(conversation_created_event)
end
+
+ it 'includes account details in the conversation payload' do
+ webhook = create(:webhook, inbox: inbox, account: account)
+ expect(WebhookJob).to receive(:perform_later).with(
+ webhook.url,
+ hash_including(account: account.webhook_data),
+ :account_webhook,
+ hash_including(secret: webhook.secret)
+ ).once
+ listener.conversation_created(conversation_created_event)
+ end
end
context 'when inbox is an API Channel' do
@@ -250,7 +261,7 @@ describe WebhookListener do
context 'when webhook is configured' do
it 'triggers webhook' do
- inbox_data = Inbox::EventDataPresenter.new(inbox).push_data
+ inbox_data = Inbox::EventDataPresenter.new(inbox).webhook_data
webhook = create(:webhook, account: account, subscriptions: ['inbox_created'])
expect(WebhookJob).to receive(:perform_later).with(
webhook.url, inbox_data.merge(event: 'inbox_created'), :account_webhook,
@@ -258,6 +269,17 @@ describe WebhookListener do
).once
listener.inbox_created(inbox_created_event)
end
+
+ it 'includes account details in the inbox payload' do
+ webhook = create(:webhook, account: account, subscriptions: ['inbox_created'])
+ expect(WebhookJob).to receive(:perform_later).with(
+ webhook.url,
+ hash_including(account: account.webhook_data),
+ :account_webhook,
+ hash_including(secret: webhook.secret)
+ ).once
+ listener.inbox_created(inbox_created_event)
+ end
end
end
@@ -287,7 +309,7 @@ describe WebhookListener do
it 'triggers webhook' do
webhook = create(:webhook, account: account, subscriptions: ['inbox_updated'])
- inbox_data = Inbox::EventDataPresenter.new(inbox).push_data
+ inbox_data = Inbox::EventDataPresenter.new(inbox).webhook_data
changed_attributes_data = [{ 'name' => { 'previous_value': 'Inbox 1', 'current_value': inbox.name } }]
expect(WebhookJob).to receive(:perform_later).with(
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index 309a38a65..9a6797aaf 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -99,6 +99,33 @@ RSpec.describe Imap::ImapMailbox do
end
end
+ context 'when a new email contains null bytes' do
+ let(:inbound_mail) do
+ Mail.new.tap do |mail|
+ mail.from = 'email@gmail.com'
+ mail.to = 'imap@gmail.com'
+ mail.subject = "Hello\u0000"
+ mail.message_id = "message\u0000@example.com"
+ mail['In-Reply-To'] = "source\u0000@example.com"
+ mail.references = ["reference\u0000@example.com"]
+ mail.content_type = 'text/plain'
+ mail.body = "Body\u0000 text"
+ end
+ end
+
+ it 'creates sanitized conversation and message records' do
+ expect { class_instance.process(inbound_mail, channel) }.to change(Conversation, :count).by(1)
+
+ message = conversation.messages.last
+
+ expect(conversation.additional_attributes['in_reply_to']).to eq('source@example.com')
+ expect(conversation.additional_attributes['mail_subject']).to eq('Hello')
+ expect(message.source_id).to eq('message@example.com')
+ expect(message.content).to eq('Body text')
+ expect(message.content_attributes.to_json).not_to include('\u0000')
+ end
+ end
+
context 'when a new email with invalid from' do
let(:inbound_mail) { create_inbound_email_from_mail(from: 'invalidemail', to: 'imap@gmail.com', subject: 'Hello!') }
diff --git a/spec/mailboxes/mailbox_helper_spec.rb b/spec/mailboxes/mailbox_helper_spec.rb
index 613040cb3..4b02205ec 100644
--- a/spec/mailboxes/mailbox_helper_spec.rb
+++ b/spec/mailboxes/mailbox_helper_spec.rb
@@ -47,6 +47,31 @@ RSpec.describe MailboxHelper do
helper_instance.send(:create_message)
end
end
+
+ context 'when message data contains null bytes' do
+ let(:mail) do
+ mail = Mail.new
+ mail.from = 'Sender '
+ mail.to = 'Inbox '
+ mail.subject = "Hello\u0000"
+ mail.message_id = "message\u0000@example.com"
+ mail.content_type = 'text/plain'
+ mail.body = "Body\u0000 text"
+ mail
+ end
+
+ it 'creates the message with sanitized values' do
+ helper_instance = mailbox_helper_obj.new(conversation, processed_mail)
+
+ expect { helper_instance.send(:create_message) }.to change(conversation.messages, :count).by(1)
+
+ message = conversation.messages.last
+ expect(message.source_id).to eq('message@example.com')
+ expect(message.content).to eq('Body text')
+ expect(message.content_attributes.dig('email', 'message_id')).to eq('message@example.com')
+ expect(message.content_attributes.to_json).not_to include('\u0000')
+ end
+ end
end
describe '#embed_plain_text_email_with_inline_image' do
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index d062c7d73..20ce60dad 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -67,6 +67,40 @@ RSpec.describe ReplyMailbox do
end
end
+ context 'when new conversation email contains null bytes' do
+ let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+ let(:null_byte_mail) { create_inbound_email_from_mail(from: 'sender@example.com', to: email_channel.email, subject: 'Hello') }
+ let(:mail_with_null_bytes) do
+ Mail.new.tap do |mail|
+ mail.from = 'sender@example.com'
+ mail.to = email_channel.email
+ mail.subject = "Hello\u0000"
+ mail.message_id = "message\u0000@example.com"
+ mail['In-Reply-To'] = "source\u0000@example.com"
+ mail.references = ["reference\u0000@example.com"]
+ mail.content_type = 'text/plain'
+ mail.body = "Body\u0000 text"
+ end
+ end
+
+ before do
+ allow(null_byte_mail).to receive(:mail).and_return(mail_with_null_bytes)
+ end
+
+ it 'creates sanitized conversation and message records' do
+ expect { described_class.receive null_byte_mail }.to change(Conversation, :count).by(1)
+
+ conversation = Conversation.last
+ message = conversation.messages.last
+
+ expect(conversation.additional_attributes['in_reply_to']).to eq('source@example.com')
+ expect(conversation.additional_attributes['mail_subject']).to eq('Hello')
+ expect(message.source_id).to eq('message@example.com')
+ expect(message.content).to eq('Body text')
+ expect(message.content_attributes.to_json).not_to include('\u0000')
+ end
+ end
+
context 'with inline attachments' do
let(:mail_with_inline_images) { create_inbound_email_from_fixture('mail_with_inline_images.eml') }
let(:described_subject) { described_class.receive mail_with_inline_images }
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index 86a2363e9..df4c4f41f 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -462,6 +462,26 @@ RSpec.describe ConversationReplyMailer do
expect(mail.delivery_method.settings.empty?).to be false
expect(mail.delivery_method.settings[:address]).to eq 'smtp.gmail.com'
expect(mail.delivery_method.settings[:port]).to eq 587
+ expect(mail.delivery_method.settings[:open_timeout]).to eq 15
+ expect(mail.delivery_method.settings[:read_timeout]).to eq 30
+ end
+
+ it 'uses configured smtp timeout values' do
+ with_modified_env SMTP_OPEN_TIMEOUT: '10', SMTP_READ_TIMEOUT: '30' do
+ mail = described_class.email_reply(message)
+
+ expect(mail.delivery_method.settings[:open_timeout]).to eq 10
+ expect(mail.delivery_method.settings[:read_timeout]).to eq 30
+ end
+ end
+
+ it 'uses default smtp timeout values when env values are blank' do
+ with_modified_env SMTP_OPEN_TIMEOUT: '', SMTP_READ_TIMEOUT: '' do
+ mail = described_class.email_reply(message)
+
+ expect(mail.delivery_method.settings[:open_timeout]).to eq 15
+ expect(mail.delivery_method.settings[:read_timeout]).to eq 30
+ end
end
it 'renders sender name in the from address' do
diff --git a/spec/models/portal_spec.rb b/spec/models/portal_spec.rb
index 38d9a7da6..c71a458fd 100644
--- a/spec/models/portal_spec.rb
+++ b/spec/models/portal_spec.rb
@@ -60,6 +60,94 @@ RSpec.describe Portal do
portal.update(custom_domain: '')
expect(portal.custom_domain).to be_nil
end
+
+ context 'with locale_translations' do
+ it 'allows valid locale translations' do
+ portal.update(config: { allowed_locales: %w[en es], default_locale: 'en',
+ locale_translations: { 'es' => { 'name' => 'Centro', 'page_title' => 'Título', 'header_text' => 'Hola' } } })
+
+ expect(portal).to be_valid
+ end
+
+ it 'rejects unknown fields within a locale translation' do
+ portal.update(config: { allowed_locales: %w[en es], default_locale: 'en',
+ locale_translations: { 'es' => { 'tagline' => 'nope' } } })
+
+ expect(portal).not_to be_valid
+ end
+
+ it 'retains a locale override after it becomes the default so it can still be edited' do
+ portal.update!(config: { allowed_locales: %w[en es], default_locale: 'en',
+ locale_translations: { 'es' => { 'name' => 'Centro' } } })
+
+ portal.update!(config: { allowed_locales: %w[en es], default_locale: 'es' })
+
+ expect(portal.config['locale_translations']).to eq({ 'es' => { 'name' => 'Centro' } })
+ end
+ end
+ end
+ end
+
+ describe '#localized_value' do
+ let!(:account) { create(:account) }
+ let!(:portal) do
+ create(:portal, account_id: account.id, name: 'Help Center', page_title: 'Help Center | Acme',
+ config: { allowed_locales: %w[en es], default_locale: 'en',
+ locale_translations: { 'es' => { 'name' => 'Centro de ayuda' } } })
+ end
+
+ it 'returns the override for the requested locale' do
+ expect(portal.localized_value('name', 'es')).to eq('Centro de ayuda')
+ end
+
+ it 'falls back to the base column when the locale has no override for the field' do
+ expect(portal.localized_value('page_title', 'es')).to eq('Help Center | Acme')
+ end
+
+ it 'falls back to the base column when the locale has no overrides at all' do
+ expect(portal.localized_value('name', 'fr')).to eq('Help Center')
+ end
+
+ it 'keeps serving the override for a locale that has become the default' do
+ portal.update!(config: { allowed_locales: %w[en es], default_locale: 'es' })
+
+ expect(portal.localized_value('name', 'es')).to eq('Centro de ayuda')
+ end
+
+ it "inherits the default locale's override for a locale without its own" do
+ portal.update!(config: { allowed_locales: %w[en es fr], default_locale: 'es' })
+
+ expect(portal.localized_value('name', 'fr')).to eq('Centro de ayuda')
+ end
+
+ it 'uses the default locale when no locale is given' do
+ expect(portal.localized_value('name')).to eq('Help Center')
+ end
+ end
+
+ describe '#display_title' do
+ let!(:account) { create(:account) }
+
+ it 'prefers the localized page_title' do
+ portal = create(:portal, account_id: account.id, name: 'Help Center', page_title: 'Help Center | Acme',
+ config: { allowed_locales: %w[en es], default_locale: 'en',
+ locale_translations: { 'es' => { 'page_title' => 'Centro | Acme' } } })
+
+ expect(portal.display_title('es')).to eq('Centro | Acme')
+ end
+
+ it 'falls back to the localized name when no page_title is set' do
+ portal = create(:portal, account_id: account.id, name: 'Help Center',
+ config: { allowed_locales: %w[en es], default_locale: 'en',
+ locale_translations: { 'es' => { 'name' => 'Centro de ayuda' } } })
+
+ expect(portal.display_title('es')).to eq('Centro de ayuda')
+ end
+
+ it 'uses the base values for the default locale' do
+ portal = create(:portal, account_id: account.id, name: 'Help Center', page_title: 'Help Center | Acme')
+
+ expect(portal.display_title).to eq('Help Center | Acme')
end
end
end
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index 76fd8f8a8..21cb26c98 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -46,6 +46,10 @@ RSpec.describe Conversations::EventDataPresenter do
end
describe '#webhook_data' do
+ it 'includes account details for webhook consumers' do
+ expect(presenter.webhook_data[:account]).to eq(conversation.account.webhook_data)
+ end
+
it 'normalizes hard-break backslashes in message content' do
message = create(:message, conversation: conversation, account: conversation.account,
message_type: :outgoing, content: "Hello\\\nWorld")
diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb
index 1bf5c219d..fa054b330 100644
--- a/spec/services/conversations/filter_service_spec.rb
+++ b/spec/services/conversations/filter_service_spec.rb
@@ -72,8 +72,8 @@ describe Conversations::FilterService do
it 'filter conversations by additional_attributes and status' do
params[:payload] = payload
result = filter_service.new(params, user_1, account).perform
- conversations = Conversation.where("additional_attributes ->> 'browser_language' IN (?) AND status IN (?)", ['en'], [1, 2])
- expect(result[:count][:all_count]).to be conversations.count
+ conversations = account.conversations.where("additional_attributes ->> 'browser_language' IN (?) AND status IN (?)", ['en'], [1, 2])
+ expect(result[:count][:all_count]).to eq conversations.count
end
it 'filter conversations by priority' do
@@ -133,12 +133,84 @@ describe Conversations::FilterService do
expect(result[:conversations].pluck(:id)).to include(low_priority.id, medium_priority.id)
end
+ it 'filters conversations by contact' do
+ account.conversations.destroy_all
+
+ contact = create(:contact, :with_email, account: account)
+ other_contact = create(:contact, :with_email, account: account)
+ matching_conversation = create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: contact)
+ create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: other_contact)
+
+ params[:payload] = [
+ {
+ attribute_key: 'contact_id',
+ filter_operator: 'equal_to',
+ values: [contact.id],
+ query_operator: nil,
+ custom_attribute_type: ''
+ }.with_indifferent_access
+ ]
+
+ result = filter_service.new(params, user_1, account).perform
+
+ expect(result[:count][:all_count]).to eq 1
+ expect(result[:conversations].pluck(:id)).to contain_exactly(matching_conversation.id)
+ end
+
+ it 'filters conversations using not_equal_to contact operator' do
+ account.conversations.destroy_all
+
+ contact = create(:contact, :with_email, account: account)
+ other_contact = create(:contact, :with_email, account: account)
+ create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: contact)
+ other_conversation = create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: other_contact)
+
+ params[:payload] = [
+ {
+ attribute_key: 'contact_id',
+ filter_operator: 'not_equal_to',
+ values: [contact.id],
+ query_operator: nil,
+ custom_attribute_type: ''
+ }.with_indifferent_access
+ ]
+
+ result = filter_service.new(params, user_1, account).perform
+
+ expect(result[:count][:all_count]).to eq 1
+ expect(result[:conversations].pluck(:id)).to contain_exactly(other_conversation.id)
+ end
+
+ it 'applies inbox permissions when filtering conversations by contact' do
+ account.conversations.destroy_all
+
+ contact = create(:contact, :with_email, account: account)
+ restricted_inbox = create(:inbox, account: account)
+ accessible_conversation = create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: contact)
+ create(:conversation, account: account, inbox: restricted_inbox, contact: contact)
+
+ params[:payload] = [
+ {
+ attribute_key: 'contact_id',
+ filter_operator: 'equal_to',
+ values: [contact.id],
+ query_operator: nil,
+ custom_attribute_type: ''
+ }.with_indifferent_access
+ ]
+
+ result = filter_service.new(params, user_1, account).perform
+
+ expect(result[:count][:all_count]).to eq 1
+ expect(result[:conversations].pluck(:id)).to contain_exactly(accessible_conversation.id)
+ end
+
it 'filter conversations by additional_attributes and status with pagination' do
params[:payload] = payload
params[:page] = 2
result = filter_service.new(params, user_1, account).perform
- conversations = Conversation.where("additional_attributes ->> 'browser_language' IN (?) AND status IN (?)", ['en'], [1, 2])
- expect(result[:count][:all_count]).to be conversations.count
+ conversations = account.conversations.where("additional_attributes ->> 'browser_language' IN (?) AND status IN (?)", ['en'], [1, 2])
+ expect(result[:count][:all_count]).to eq conversations.count
end
it 'filters items with contains filter_operator with values being an array' do
@@ -184,10 +256,10 @@ describe Conversations::FilterService do
custom_attribute_type: 'conversation_attribute' }.with_indifferent_access]
params[:payload] = payload
result = filter_service.new(params, user_1, account).perform
- conversations = Conversation.where(
+ conversations = account.conversations.where(
"custom_attributes ->> 'conversation_type' NOT IN (?) OR custom_attributes ->> 'conversation_type' IS NULL", ['platinum']
)
- expect(result[:count][:all_count]).to be conversations.count
+ expect(result[:count][:all_count]).to eq conversations.count
end
it 'filter conversations by tags' do
@@ -413,8 +485,8 @@ describe Conversations::FilterService do
}.with_indifferent_access
]
result = filter_service.new(params, user_1, account).perform
- expected_count = Conversation.where('created_at > ?', DateTime.parse('2022-01-20')).count
- expect(result[:conversations].length).to be expected_count
+ expected_count = account.conversations.where('created_at > ?', DateTime.parse('2022-01-20')).count
+ expect(result[:conversations].length).to eq expected_count
end
it 'binds created_at comparison values as dates' do
@@ -470,10 +542,10 @@ describe Conversations::FilterService do
}.with_indifferent_access
]
result = filter_service.new(params, user_1, account).perform
- expected_count = Conversation.where("created_at > ? AND custom_attributes->>'conversation_type' = ?", DateTime.parse('2022-01-20'),
- 'platinum').count
+ expected_count = account.conversations.where("created_at > ? AND custom_attributes->>'conversation_type' = ?",
+ DateTime.parse('2022-01-20'), 'platinum').count
- expect(result[:conversations].length).to be expected_count
+ expect(result[:conversations].length).to eq expected_count
end
context 'with x_days_before filter' do
@@ -502,11 +574,11 @@ describe Conversations::FilterService do
}.with_indifferent_access
]
- expected_count = Conversation.where("last_activity_at < ? AND custom_attributes->>'conversation_type' = ?", (Time.zone.today - 3.days),
- 'platinum').count
+ expected_count = account.conversations.where("last_activity_at < ? AND custom_attributes->>'conversation_type' = ?",
+ (Time.zone.today - 3.days), 'platinum').count
result = filter_service.new(params, user_1, account).perform
- expect(result[:conversations].length).to be expected_count
+ expect(result[:conversations].length).to eq expected_count
end
it 'filter by last_activity_at 2_days_before' do
@@ -520,10 +592,10 @@ describe Conversations::FilterService do
}.with_indifferent_access
]
- expected_count = Conversation.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
+ expected_count = account.conversations.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
result = filter_service.new(params, user_1, account).perform
- expect(result[:conversations].length).to be expected_count
+ expect(result[:conversations].length).to eq expected_count
end
end
end
@@ -548,10 +620,10 @@ describe Conversations::FilterService do
}.with_indifferent_access
]
result = filter_service.new(params, user_1, account).perform
- expected_count = Conversation.where('created_at > ?', DateTime.parse('2022-01-20')).count
+ expected_count = account.conversations.where('created_at > ?', DateTime.parse('2022-01-20')).count
expect(Current.account).to be_nil
- expect(result[:conversations].length).to be expected_count
+ expect(result[:conversations].length).to eq expected_count
end
end
end
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index f99b1c469..0a2b6407c 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -73,8 +73,7 @@ describe Facebook::SendOnFacebookService do
expect(bot).to have_received(:deliver).with({
recipient: { id: contact_inbox.source_id },
message: { text: message.content },
- messaging_type: 'MESSAGE_TAG',
- tag: 'ACCOUNT_UPDATE'
+ messaging_type: 'RESPONSE'
}, { page_id: facebook_channel.page_id })
expect(bot).to have_received(:deliver).with({
recipient: { id: contact_inbox.source_id },
@@ -86,17 +85,26 @@ describe Facebook::SendOnFacebookService do
}
}
},
- messaging_type: 'MESSAGE_TAG',
- tag: 'ACCOUNT_UPDATE'
+ messaging_type: 'RESPONSE'
}, { page_id: facebook_channel.page_id })
end
+ it 'sends as a standard RESPONSE without a tag by default' do
+ message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
+ described_class.new(message: message).perform
+ expect(bot).to have_received(:deliver).with(
+ hash_including(messaging_type: 'RESPONSE'),
+ { page_id: facebook_channel.page_id }
+ )
+ expect(bot).not_to have_received(:deliver).with(hash_including(:tag), anything)
+ end
+
it 'sends with HUMAN_AGENT tag when ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT is enabled' do
with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
described_class.new(message: message).perform
expect(bot).to have_received(:deliver).with(
- hash_including(tag: 'HUMAN_AGENT'),
+ hash_including(messaging_type: 'MESSAGE_TAG', tag: 'HUMAN_AGENT'),
{ page_id: facebook_channel.page_id }
)
end
@@ -201,8 +209,7 @@ describe Facebook::SendOnFacebookService do
{ content_type: 'text', payload: 'text 2', title: 'text 2' }
]
},
- messaging_type: 'MESSAGE_TAG',
- tag: 'ACCOUNT_UPDATE'
+ messaging_type: 'RESPONSE'
}, { page_id: facebook_channel.page_id })
end
end
diff --git a/spec/services/imap/fetch_email_service_spec.rb b/spec/services/imap/fetch_email_service_spec.rb
index a40a46343..1f74cf0b7 100644
--- a/spec/services/imap/fetch_email_service_spec.rb
+++ b/spec/services/imap/fetch_email_service_spec.rb
@@ -80,11 +80,11 @@ RSpec.describe Imap::FetchEmailService do
travel_to '26.10.2020 10:00'.to_datetime do
email_object = create_inbound_email_from_fixture('only_text.eml')
email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
- imap_fetch_mail = Net::IMAP::FetchData.new(1, 'RFC822' => eml_content_with_message_id)
+ imap_fetch_mail = Net::IMAP::FetchData.new(1, 'BODY[]' => eml_content_with_message_id)
allow(imap).to receive(:search).with(%w[SINCE 25-Oct-2020]).and_return([1])
allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
- allow(imap).to receive(:fetch).with(1, 'RFC822').and_return([imap_fetch_mail])
+ allow(imap).to receive(:fetch).with(1, 'BODY.PEEK[]').and_return([imap_fetch_mail])
allow(imap).to receive(:logout)
result = described_class.new(channel: imap_email_channel).perform
@@ -93,7 +93,7 @@ RSpec.describe Imap::FetchEmailService do
expect(result[0].message_id).to eq email_object.message_id
expect(imap).to have_received(:search).with(%w[SINCE 25-Oct-2020])
expect(imap).to have_received(:fetch).with([1], 'BODY.PEEK[HEADER]')
- expect(imap).to have_received(:fetch).with(1, 'RFC822')
+ expect(imap).to have_received(:fetch).with(1, 'BODY.PEEK[]')
expect(logger).to have_received(:info).with("[IMAP::FETCH_EMAIL_SERVICE] Fetching mails from #{imap_email_channel.email}, found 1.")
expect(imap).to have_received(:logout)
end
@@ -115,7 +115,7 @@ RSpec.describe Imap::FetchEmailService do
expect(result.length).to eq 0
expect(imap).to have_received(:search).with(%w[SINCE 25-Oct-2020])
expect(imap).to have_received(:fetch).with([1], 'BODY.PEEK[HEADER]')
- expect(imap).not_to have_received(:fetch).with(1, 'RFC822')
+ expect(imap).not_to have_received(:fetch).with(1, 'BODY.PEEK[]')
end
end
@@ -129,12 +129,12 @@ RSpec.describe Imap::FetchEmailService do
Net::IMAP::FetchData.new(seq_num, 'BODY[HEADER]' => eml_content_without_message_id)
end
valid_email_header = Net::IMAP::FetchData.new(valid_message_seq_num, 'BODY[HEADER]' => eml_content_with_message_id)
- imap_fetch_mail = Net::IMAP::FetchData.new(valid_message_seq_num, 'RFC822' => eml_content_with_message_id)
+ imap_fetch_mail = Net::IMAP::FetchData.new(valid_message_seq_num, 'BODY[]' => eml_content_with_message_id)
allow(imap).to receive(:search).with(%w[SINCE 25-Oct-2020]).and_return(empty_message_id_seq_nums + [valid_message_seq_num])
allow(imap).to receive(:fetch).with(empty_message_id_seq_nums, 'BODY.PEEK[HEADER]').and_return(empty_message_id_headers)
allow(imap).to receive(:fetch).with([valid_message_seq_num], 'BODY.PEEK[HEADER]').and_return([valid_email_header])
- allow(imap).to receive(:fetch).with(valid_message_seq_num, 'RFC822').and_return([imap_fetch_mail])
+ allow(imap).to receive(:fetch).with(valid_message_seq_num, 'BODY.PEEK[]').and_return([imap_fetch_mail])
allow(imap).to receive(:logout)
result = described_class.new(channel: imap_email_channel).perform
@@ -143,7 +143,7 @@ RSpec.describe Imap::FetchEmailService do
expect(result[0].message_id).to eq email_object.message_id
expect(imap).to have_received(:fetch).with(empty_message_id_seq_nums, 'BODY.PEEK[HEADER]')
expect(imap).to have_received(:fetch).with([valid_message_seq_num], 'BODY.PEEK[HEADER]')
- expect(imap).to have_received(:fetch).with(valid_message_seq_num, 'RFC822')
+ expect(imap).to have_received(:fetch).with(valid_message_seq_num, 'BODY.PEEK[]')
end
end
end
diff --git a/spec/services/imap/microsoft_fetch_email_service_spec.rb b/spec/services/imap/microsoft_fetch_email_service_spec.rb
index a4a0a62d1..cc20d5b35 100644
--- a/spec/services/imap/microsoft_fetch_email_service_spec.rb
+++ b/spec/services/imap/microsoft_fetch_email_service_spec.rb
@@ -30,11 +30,11 @@ RSpec.describe Imap::MicrosoftFetchEmailService do
travel_to '26.10.2020 10:00'.to_datetime do
email_object = create_inbound_email_from_fixture('only_text.eml')
email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
- imap_fetch_mail = Net::IMAP::FetchData.new(1, 'RFC822' => eml_content_with_message_id)
+ imap_fetch_mail = Net::IMAP::FetchData.new(1, 'BODY[]' => eml_content_with_message_id)
allow(imap).to receive(:search).with(%w[SINCE 25-Oct-2020]).and_return([1])
allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
- allow(imap).to receive(:fetch).with(1, 'RFC822').and_return([imap_fetch_mail])
+ allow(imap).to receive(:fetch).with(1, 'BODY.PEEK[]').and_return([imap_fetch_mail])
allow(imap).to receive(:logout)
result = described_class.new(channel: microsoft_channel).perform
@@ -45,7 +45,7 @@ RSpec.describe Imap::MicrosoftFetchEmailService do
expect(result[0].message_id).to eq email_object.message_id
expect(imap).to have_received(:search).with(%w[SINCE 25-Oct-2020])
expect(imap).to have_received(:fetch).with([1], 'BODY.PEEK[HEADER]')
- expect(imap).to have_received(:fetch).with(1, 'RFC822')
+ expect(imap).to have_received(:fetch).with(1, 'BODY.PEEK[]')
expect(logger).to have_received(:info).with("[IMAP::FETCH_EMAIL_SERVICE] Fetching mails from #{microsoft_channel.email}, found 1.")
end
end
@@ -56,11 +56,11 @@ RSpec.describe Imap::MicrosoftFetchEmailService do
travel_to '26.10.2020 10:00'.to_datetime do
email_object = create_inbound_email_from_fixture('only_text.eml')
email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
- imap_fetch_mail = Net::IMAP::FetchData.new(1, 'RFC822' => eml_content_with_message_id)
+ imap_fetch_mail = Net::IMAP::FetchData.new(1, 'BODY[]' => eml_content_with_message_id)
allow(imap).to receive(:search).with(%w[SINCE 18-Oct-2020]).and_return([1])
allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
- allow(imap).to receive(:fetch).with(1, 'RFC822').and_return([imap_fetch_mail])
+ allow(imap).to receive(:fetch).with(1, 'BODY.PEEK[]').and_return([imap_fetch_mail])
allow(imap).to receive(:logout)
result = described_class.new(channel: microsoft_channel, interval: 8).perform
@@ -71,7 +71,7 @@ RSpec.describe Imap::MicrosoftFetchEmailService do
expect(result[0].message_id).to eq email_object.message_id
expect(imap).to have_received(:search).with(%w[SINCE 18-Oct-2020])
expect(imap).to have_received(:fetch).with([1], 'BODY.PEEK[HEADER]')
- expect(imap).to have_received(:fetch).with(1, 'RFC822')
+ expect(imap).to have_received(:fetch).with(1, 'BODY.PEEK[]')
expect(logger).to have_received(:info).with("[IMAP::FETCH_EMAIL_SERVICE] Fetching mails from #{microsoft_channel.email}, found 1.")
end
end
diff --git a/spec/services/whatsapp/embedded_signup_service_spec.rb b/spec/services/whatsapp/embedded_signup_service_spec.rb
index a20e36ac8..560b1993e 100644
--- a/spec/services/whatsapp/embedded_signup_service_spec.rb
+++ b/spec/services/whatsapp/embedded_signup_service_spec.rb
@@ -36,11 +36,6 @@ describe Whatsapp::EmbeddedSignupService do
.with(params[:waba_id], params[:phone_number_id], access_token).and_return(phone_service)
allow(phone_service).to receive(:perform).and_return(phone_info)
- validation_service = instance_double(Whatsapp::TokenValidationService)
- allow(Whatsapp::TokenValidationService).to receive(:new)
- .with(access_token, params[:waba_id]).and_return(validation_service)
- allow(validation_service).to receive(:perform)
-
channel_creation = instance_double(Whatsapp::ChannelCreationService)
allow(Whatsapp::ChannelCreationService).to receive(:new)
.with(account, { waba_id: params[:waba_id], business_name: 'Test Business' }, phone_info, access_token)
diff --git a/spec/services/whatsapp/token_validation_service_spec.rb b/spec/services/whatsapp/token_validation_service_spec.rb
deleted file mode 100644
index d9cf40257..000000000
--- a/spec/services/whatsapp/token_validation_service_spec.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-require 'rails_helper'
-
-describe Whatsapp::TokenValidationService do
- let(:access_token) { 'test_access_token' }
- let(:waba_id) { 'test_waba_id' }
- let(:service) { described_class.new(access_token, waba_id) }
- let(:api_client) { instance_double(Whatsapp::FacebookApiClient) }
-
- before do
- allow(Whatsapp::FacebookApiClient).to receive(:new).with(access_token).and_return(api_client)
- end
-
- describe '#perform' do
- context 'when token has access to WABA' do
- let(:debug_response) do
- {
- 'data' => {
- 'granular_scopes' => [
- {
- 'scope' => 'whatsapp_business_management',
- 'target_ids' => [waba_id, 'another_waba_id']
- }
- ]
- }
- }
- end
-
- before do
- allow(api_client).to receive(:debug_token).with(access_token).and_return(debug_response)
- end
-
- it 'validates successfully' do
- expect { service.perform }.not_to raise_error
- end
- end
-
- context 'when token does not have access to WABA' do
- let(:debug_response) do
- {
- 'data' => {
- 'granular_scopes' => [
- {
- 'scope' => 'whatsapp_business_management',
- 'target_ids' => ['different_waba_id']
- }
- ]
- }
- }
- end
-
- before do
- allow(api_client).to receive(:debug_token).with(access_token).and_return(debug_response)
- end
-
- it 'raises an error' do
- expect { service.perform }.to raise_error(/Token does not have access to WABA/)
- end
- end
-
- context 'when no WABA scope is found' do
- let(:debug_response) do
- {
- 'data' => {
- 'granular_scopes' => [
- {
- 'scope' => 'some_other_scope',
- 'target_ids' => ['some_id']
- }
- ]
- }
- }
- end
-
- before do
- allow(api_client).to receive(:debug_token).with(access_token).and_return(debug_response)
- end
-
- it 'raises an error' do
- expect { service.perform }.to raise_error('No WABA scope found in token')
- end
- end
-
- context 'when access_token is blank' do
- let(:access_token) { '' }
-
- it 'raises ArgumentError' do
- expect { service.perform }.to raise_error(ArgumentError, 'Access token is required')
- end
- end
-
- context 'when waba_id is blank' do
- let(:waba_id) { '' }
-
- it 'raises ArgumentError' do
- expect { service.perform }.to raise_error(ArgumentError, 'WABA ID is required')
- end
- end
- end
-end