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 080ab4a6a..9568709b9 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -2,13 +2,23 @@
<%= @article.title %> | <%= @portal.name %>
<% if @article.meta["title"].present? %>
">
+ ">
+ ">
<% end %>
<% if @article.meta["description"].present? %>
">
+ ">
+ ">
<% end %>
<% if @article.meta["tags"].present? %>
">
<% end %>
+ <% if @og_image_url.present? %>
+
+
+
+
+ <% end %>
<% end %>
<% if !@is_plain_layout_enabled %>
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 3e36b4753..702483355 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -1,7 +1,16 @@
<% content_for :head do %>
<%= @category.name %> | <%= @portal.name %>
+
<% if @category.description.present? %>
+
+
+ <% end %>
+ <% if @og_image_url.present? %>
+
+
+
+
<% end %>
<% end %>
@@ -35,7 +44,7 @@
<%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %>
-
+
<% end %>
<% end %>
diff --git a/config/installation_config.yml b/config/installation_config.yml
index a089a4ea7..58d593502 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -360,3 +360,17 @@
value: 'v22.0'
locked: true
# ------- End of Instagram Channel Related Config ------- #
+
+# ------- OG Image Related Config ------- #
+- name: OG_IMAGE_CDN_URL
+ display_title: 'OG Image CDN URL'
+ description: 'The CDN URL for serving OG images'
+ value: ''
+ locked: false
+- name: OG_IMAGE_CLIENT_REF
+ display_title: 'OG Image Client Reference'
+ description: 'Token used to block unauthorized access to OG images'
+ value: ''
+ locked: false
+ type: secret
+# ------- End of OG Image Related Config ------- #
diff --git a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
index 2454295dc..67ce3a6a9 100644
--- a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
+++ b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
@@ -33,6 +33,7 @@ module Enterprise::SuperAdmin::AppConfigsController
def internal_config_options
%w[CHATWOOT_INBOX_TOKEN CHATWOOT_INBOX_HMAC_KEY ANALYTICS_TOKEN CLEARBIT_API_KEY DASHBOARD_SCRIPTS INACTIVE_WHATSAPP_NUMBERS BLOCKED_EMAIL_DOMAINS
- CAPTAIN_CLOUD_PLAN_LIMITS ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL CHATWOOT_INSTANCE_ADMIN_EMAIL]
+ CAPTAIN_CLOUD_PLAN_LIMITS ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL CHATWOOT_INSTANCE_ADMIN_EMAIL
+ OG_IMAGE_CDN_URL OG_IMAGE_CLIENT_REF]
end
end
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index dfd37138a..241b4c6dd 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -250,12 +250,45 @@ describe PortalHelper do
describe '#thumbnail_bg_color' do
it 'returns the correct color based on username length' do
expect(helper.thumbnail_bg_color('')).to be_in(['#6D95BA', '#A4C3C3', '#E19191'])
- expect(helper.thumbnail_bg_color('Joe')).to eq('#6D95BA') # Length 3, so index is 0
- expect(helper.thumbnail_bg_color('John')).to eq('#A4C3C3') # Length 4, so index is 1
- expect(helper.thumbnail_bg_color('Jane james')).to eq('#A4C3C3') # Length 10, so index is 1
- expect(helper.thumbnail_bg_color('Jane_123')).to eq('#E19191') # Length 8, so index is 2
- expect(helper.thumbnail_bg_color('AlexanderTheGreat')).to eq('#E19191') # Length 17, so index is 2
- expect(helper.thumbnail_bg_color('Reginald John Sans')).to eq('#6D95BA') # Length 18, so index is 0
+ expect(helper.thumbnail_bg_color('Joe')).to eq('#6D95BA')
+ expect(helper.thumbnail_bg_color('John')).to eq('#A4C3C3')
+ expect(helper.thumbnail_bg_color('Jane james')).to eq('#A4C3C3')
+ expect(helper.thumbnail_bg_color('Jane_123')).to eq('#E19191')
+ expect(helper.thumbnail_bg_color('AlexanderTheGreat')).to eq('#E19191')
+ expect(helper.thumbnail_bg_color('Reginald John Sans')).to eq('#6D95BA')
+ end
+ end
+
+ describe '#set_og_image_url' do
+ let(:portal_name) { 'Chatwoot Portal' }
+ let(:title) { 'Welcome to Chatwoot' }
+
+ context 'when CDN URL is present' do
+ before do
+ InstallationConfig.create!(name: 'OG_IMAGE_CDN_URL', value: 'https://cdn.example.com')
+ InstallationConfig.create!(name: 'OG_IMAGE_CLIENT_REF', value: 'client-123')
+ end
+
+ it 'returns the composed OG image URL with correct params' do
+ result = helper.set_og_image_url(portal_name, title)
+ uri = URI.parse(result)
+ expect(uri.path).to eq('/og')
+ params = Rack::Utils.parse_query(uri.query)
+ expect(params['clientRef']).to eq('client-123')
+ expect(params['title']).to eq(title)
+ expect(params['portalName']).to eq(portal_name)
+ end
+ end
+
+ context 'when CDN URL is blank' do
+ before do
+ InstallationConfig.create!(name: 'OG_IMAGE_CDN_URL', value: '')
+ InstallationConfig.create!(name: 'OG_IMAGE_CLIENT_REF', value: 'client-123')
+ end
+
+ it 'returns nil' do
+ expect(helper.set_og_image_url(portal_name, title)).to be_nil
+ end
end
end
end