mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-03 12:37:56 +00:00
8ea21eeefd
# Pull Request Template ## Description This PR includes: 1. Previously, the URL fields accepted any value starting with `https`. Added proper URL validation to ensure valid URLs are entered. 2. Fixed an issue where form save errors displayed `[object Object]` in the toast due to inconsistent error formatting from the backend. Fixes https://linear.app/chatwoot/issue/CW-5389/help-center-bugs ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? ### Loom video https://www.loom.com/share/63ddca2c5e2e45c99b66153ed146524f?sid=fd25331b-6b67-4722-9b36-1213496a0741 ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
111 lines
3.0 KiB
Ruby
111 lines
3.0 KiB
Ruby
class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
|
|
include ::FileTypeHelper
|
|
|
|
before_action :fetch_portal, except: [:index, :create]
|
|
before_action :check_authorization
|
|
before_action :set_current_page, only: [:index]
|
|
|
|
def index
|
|
@portals = Current.account.portals
|
|
end
|
|
|
|
def show
|
|
@all_articles = @portal.articles
|
|
@articles = @all_articles.search(locale: params[:locale])
|
|
end
|
|
|
|
def create
|
|
@portal = Current.account.portals.build(portal_params.merge(live_chat_widget_params))
|
|
@portal.custom_domain = parsed_custom_domain
|
|
@portal.save!
|
|
process_attached_logo
|
|
end
|
|
|
|
def update
|
|
ActiveRecord::Base.transaction do
|
|
@portal.update!(portal_params.merge(live_chat_widget_params)) if params[:portal].present?
|
|
# @portal.custom_domain = parsed_custom_domain
|
|
process_attached_logo if params[:blob_id].present?
|
|
rescue ActiveRecord::RecordInvalid => e
|
|
render_record_invalid(e)
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@portal.destroy!
|
|
head :ok
|
|
end
|
|
|
|
def archive
|
|
@portal.update(archive: true)
|
|
head :ok
|
|
end
|
|
|
|
def logo
|
|
@portal.logo.purge if @portal.logo.attached?
|
|
head :ok
|
|
end
|
|
|
|
def send_instructions
|
|
email = permitted_params[:email]
|
|
return render_could_not_create_error(I18n.t('portals.send_instructions.email_required')) if email.blank?
|
|
return render_could_not_create_error(I18n.t('portals.send_instructions.invalid_email_format')) unless valid_email?(email)
|
|
return render_could_not_create_error(I18n.t('portals.send_instructions.custom_domain_not_configured')) if @portal.custom_domain.blank?
|
|
|
|
PortalInstructionsMailer.send_cname_instructions(
|
|
portal: @portal,
|
|
recipient_email: email
|
|
).deliver_later
|
|
|
|
render json: { message: I18n.t('portals.send_instructions.instructions_sent_successfully') }, status: :ok
|
|
end
|
|
|
|
def process_attached_logo
|
|
blob_id = params[:blob_id]
|
|
blob = ActiveStorage::Blob.find_by(id: blob_id)
|
|
@portal.logo.attach(blob)
|
|
end
|
|
|
|
private
|
|
|
|
def fetch_portal
|
|
@portal = Current.account.portals.find_by(slug: permitted_params[:id])
|
|
end
|
|
|
|
def permitted_params
|
|
params.permit(:id, :email)
|
|
end
|
|
|
|
def portal_params
|
|
params.require(:portal).permit(
|
|
:id, :account_id, :color, :custom_domain, :header_text, :homepage_link,
|
|
:name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
|
|
)
|
|
end
|
|
|
|
def live_chat_widget_params
|
|
permitted_params = params.permit(:inbox_id)
|
|
return {} if permitted_params[:inbox_id].blank?
|
|
|
|
inbox = Inbox.find(permitted_params[:inbox_id])
|
|
return {} unless inbox.web_widget?
|
|
|
|
{ channel_web_widget_id: inbox.channel.id }
|
|
end
|
|
|
|
def set_current_page
|
|
@current_page = params[:page] || 1
|
|
end
|
|
|
|
def parsed_custom_domain
|
|
domain = URI.parse(@portal.custom_domain)
|
|
domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
|
|
end
|
|
|
|
def valid_email?(email)
|
|
ValidEmail2::Address.new(email).valid?
|
|
end
|
|
end
|
|
|
|
Api::V1::Accounts::PortalsController.prepend_mod_with('Api::V1::Accounts::PortalsController')
|