diff --git a/config/application.rb b/config/application.rb
index 95dbb4c2d..751377c07 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -25,7 +25,7 @@ module DocuSeal
config.active_storage.routes_prefix = ''
- config.active_storage.draw_routes = ENV['MULTITENANT'] != 'true'
+ config.active_storage.draw_routes = false
config.active_storage.analyzers = []
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 716067fe5..9d0cff52e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -166,7 +166,14 @@ Rails.application.configure do
current_user = controller.instance_variable_get(:@current_user)
- os = DetectBrowserDevice.os(controller.request.user_agent) if ENV['MULTITENANT'] == 'true'
+ if ENV['MULTITENANT'] == 'true'
+ os =
+ if defined?(controller.browser_os)
+ controller.browser_os
+ else
+ DetectBrowserDevice.os(controller.request.user_agent)
+ end
+ end
{
host: controller.request.host,
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index be1236ac9..a1a545398 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -63,26 +63,8 @@ end
ActiveStorage::LogSubscriber.detach_from(:active_storage) if Rails.env.production?
Rails.configuration.to_prepare do
- ActiveStorage::DiskController.after_action do
- response.set_header('cache-control', 'public, max-age=31536000') if action_name == 'show'
- end
-
- ActiveStorage::Blobs::ProxyController.before_action do
- response.set_header('Access-Control-Allow-Origin', '*')
- response.set_header('Access-Control-Allow-Methods', 'GET')
- response.set_header('Access-Control-Allow-Headers', '*')
- response.set_header('Access-Control-Max-Age', '1728000')
- end
-
- ActiveStorage::Blobs::RedirectController.before_action do
- response.set_header('Access-Control-Allow-Origin', '*')
- response.set_header('Access-Control-Allow-Methods', 'GET')
- response.set_header('Access-Control-Allow-Headers', '*')
- response.set_header('Access-Control-Max-Age', '1728000')
- end
-
- ActiveStorage::DirectUploadsController.before_action do
- head :forbidden
+ ActiveStorage::DiskController.after_action(only: :show) do
+ response.set_header('cache-control', 'public, max-age=31536000')
end
LoadActiveStorageConfigs.call
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 55ae36830..53543e3cc 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -830,6 +830,8 @@ en: &en
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html:
Click here to update your payment details and clear the invoice to ensure uninterrupted service.
overdue_payment: Overdue Payment
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Your Pro Plan has been suspended due to unpaid invoices. You can update your payment details to settle the invoice and continue using DocuSeal or cancel your subscription.
+ get_the_docuseal_app_for_a_better_mobile_experience: Get the DocuSeal app for a better mobile experience.
+ install_app: Install app
manage_subscription: Manage Subscription
docuseal_version_security_release_is_available: "DocuSeal v%{version} security release is available."
click_here_to_view_the_instructions_and_update_your_app_html: '
Click here to view the instructions and update your app.'
@@ -1046,10 +1048,12 @@ en: &en
link: Link
mcp: MCP
self: Sign Yourself
+ error: Error
submission_event_names:
send_email_to_html: '
Email sent to %{submitter_name}'
bounce_email_html: '
Email bounced %{submitter_name}'
complaint_email_html: '
Spam complaint %{submitter_name}'
+ fail_sms_to_html: '
SMS failed to %{submitter_name}'
send_reminder_email_to_html: '
Reminder email sent to %{submitter_name}'
send_sms_to_html: '
SMS sent to %{submitter_name}'
send_2fa_sms_to_html: '
Verification SMS sent to %{submitter_name}'
@@ -1988,6 +1992,8 @@ es: &es
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '
Haz clic aquí para actualizar tus datos de pago y liquidar la factura para garantizar un servicio ininterrumpido.'
overdue_payment: Pago Atrasado
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Tu plan Pro ha sido suspendido debido a facturas impagas. Puedes actualizar tus datos de pago para liquidar la factura y seguir usando DocuSeal o cancelar tu suscripción.
+ get_the_docuseal_app_for_a_better_mobile_experience: Descarga la app de DocuSeal para una mejor experiencia móvil.
+ install_app: Instalar app
manage_subscription: Gestionar Suscripción
docuseal_version_security_release_is_available: "La versión de seguridad DocuSeal v%{version} está disponible."
click_here_to_view_the_instructions_and_update_your_app_html: '
Haz clic aquí para ver las instrucciones y actualizar tu aplicación.'
@@ -2196,10 +2202,12 @@ es: &es
link: Enlace
mcp: MCP
self: Firma tú mismo
+ error: Error
submission_event_names:
send_email_to_html: '
Correo electrónico enviado a %{submitter_name}'
bounce_email_html: '
Correo electrónico rebotado %{submitter_name}'
complaint_email_html: '
Queja de spam %{submitter_name}'
+ fail_sms_to_html: '
SMS fallido a %{submitter_name}'
send_reminder_email_to_html: '
Correo de recordatorio enviado a %{submitter_name}'
send_sms_to_html: '
SMS enviado a %{submitter_name}'
send_2fa_sms_to_html: '
SMS de verificación enviado a %{submitter_name}'
@@ -3152,6 +3160,8 @@ it: &it
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '
Fai clic qui per aggiornare i tuoi dati di pagamento e saldare la fattura per garantire un servizio ininterrotto.'
overdue_payment: Pagamento Scaduto
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Il tuo piano Pro è stato sospeso a causa di fatture non pagate. Puoi aggiornare i tuoi dati di pagamento per saldare la fattura e continuare a utilizzare DocuSeal o annullare l'abbonamento.
+ get_the_docuseal_app_for_a_better_mobile_experience: Scarica l'app DocuSeal per un'esperienza mobile migliore.
+ install_app: Installa app
manage_subscription: Gestisci Abbonamento
docuseal_version_security_release_is_available: "È disponibile il rilascio di sicurezza DocuSeal v%{version}."
click_here_to_view_the_instructions_and_update_your_app_html: '
Fai clic qui per vedere le istruzioni e aggiornare la tua app.'
@@ -3360,10 +3370,12 @@ it: &it
link: Link
mcp: MCP
self: Firma te stesso
+ error: Errore
submission_event_names:
send_email_to_html: '
Email inviata a %{submitter_name}'
bounce_email_html: '
Email respinta %{submitter_name}'
complaint_email_html: '
Segnalazione spam %{submitter_name}'
+ fail_sms_to_html: '
SMS non consegnato a %{submitter_name}'
send_reminder_email_to_html: '
E-mail di promemoria inviata a %{submitter_name}'
send_sms_to_html: '
SMS inviato a %{submitter_name}'
send_2fa_sms_to_html: '
SMS di verifica inviato a %{submitter_name}'
@@ -4302,6 +4314,8 @@ fr: &fr
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html:
Cliquez ici pour mettre à jour vos informations de paiement et régler la facture afin de garantir la continuité du service.
overdue_payment: Paiement en retard
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: "Votre offre Pro a été suspendue en raison de factures impayées.\nVous pouvez mettre à jour vos informations de paiement pour régler la facture et continuer à utiliser DocuSeal, ou annuler votre abonnement."
+ get_the_docuseal_app_for_a_better_mobile_experience: Téléchargez l’application DocuSeal pour une meilleure expérience mobile.
+ install_app: Installer l’application
manage_subscription: Gérer l’abonnement
docuseal_version_security_release_is_available: "La mise à jour de sécurité DocuSeal v%{version} est disponible."
click_here_to_view_the_instructions_and_update_your_app_html: '
Cliquez ici pour voir les instructions et mettre à jour votre application.'
@@ -4507,10 +4521,12 @@ fr: &fr
link: Lien
mcp: MCP
self: Signer vous-même
+ error: Erreur
submission_event_names:
send_email_to_html: "
E‑mail envoyé à %{submitter_name}"
bounce_email_html: "
E‑mail rejeté %{submitter_name}"
complaint_email_html: "
Plainte spam %{submitter_name}"
+ fail_sms_to_html: "
SMS non distribué à %{submitter_name}"
send_reminder_email_to_html: "
E‑mail de rappel envoyé à %{submitter_name}"
send_sms_to_html: "
SMS envoyé à %{submitter_name}"
send_2fa_sms_to_html: "
SMS de vérification envoyé à %{submitter_name}"
@@ -5462,6 +5478,8 @@ pt: &pt
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '
Clique aqui para atualizar seus dados de pagamento e quitar a fatura para garantir um serviço ininterrupto.'
overdue_payment: Pagamento Atrasado
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Seu plano Pro foi suspenso devido a faturas não pagas. Você pode atualizar seus dados de pagamento para quitar a fatura e continuar usando o DocuSeal ou cancelar sua assinatura.
+ get_the_docuseal_app_for_a_better_mobile_experience: Baixe o app DocuSeal para uma melhor experiência no celular.
+ install_app: Instalar app
manage_subscription: Gerenciar Assinatura
docuseal_version_security_release_is_available: "A versão de segurança DocuSeal v%{version} está disponível."
click_here_to_view_the_instructions_and_update_your_app_html: '
Clique aqui para ver as instruções e atualizar seu aplicativo.'
@@ -5670,10 +5688,12 @@ pt: &pt
link: Link
mcp: MCP
self: Assine você mesmo
+ error: Erro
submission_event_names:
send_email_to_html: '
Email enviado para %{submitter_name}'
bounce_email_html: '
Email não entregue %{submitter_name}'
complaint_email_html: '
Reclamação de spam %{submitter_name}'
+ fail_sms_to_html: '
SMS não entregue para %{submitter_name}'
send_reminder_email_to_html: '
Email de lembrete enviado para %{submitter_name}'
send_sms_to_html: '
SMS enviado para %{submitter_name}'
send_2fa_sms_to_html: '
SMS de verificação enviado para %{submitter_name}'
@@ -6625,6 +6645,8 @@ de: &de
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '
Klicken Sie hier, um Ihre Zahlungsdaten zu aktualisieren und die Rechnung zu begleichen, um einen unterbrechungsfreien Service sicherzustellen.'
overdue_payment: Überfällige Zahlung
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Ihr Pro-Plan wurde aufgrund unbezahlter Rechnungen ausgesetzt. Sie können Ihre Zahlungsdaten aktualisieren, um die Rechnung zu begleichen und DocuSeal weiterhin zu nutzen, oder Ihr Abonnement kündigen.
+ get_the_docuseal_app_for_a_better_mobile_experience: Holen Sie sich die DocuSeal-App für ein besseres mobiles Erlebnis.
+ install_app: App installieren
manage_subscription: Abonnement verwalten
docuseal_version_security_release_is_available: "Das Sicherheitsupdate DocuSeal v%{version} ist verfügbar."
click_here_to_view_the_instructions_and_update_your_app_html: '
Klicken Sie hier, um die Anleitung anzuzeigen und Ihre App zu aktualisieren.'
@@ -6833,10 +6855,12 @@ de: &de
link: Link
mcp: MCP
self: Selbst unterschreiben
+ error: Fehler
submission_event_names:
send_email_to_html: '
E-Mail gesendet an %{submitter_name}'
bounce_email_html: '
E-Mail unzustellbar %{submitter_name}'
complaint_email_html: '
Spam-Beschwerde %{submitter_name}'
+ fail_sms_to_html: '
SMS unzustellbar an %{submitter_name}'
send_reminder_email_to_html: '
Erinnerungs-E-Mail gesendet an %{submitter_name}'
send_sms_to_html: '
SMS gesendet an %{submitter_name}'
send_2fa_sms_to_html: '
Verifizierungs-SMS gesendet an %{submitter_name}'
@@ -8316,6 +8340,8 @@ nl: &nl
click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html:
Klik hier om uw betaalgegevens bij te werken en de factuur te voldoen om ononderbroken service te garanderen.
overdue_payment: Achterstallige betaling
your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Uw Pro-abonnement is opgeschort vanwege onbetaalde facturen. U kunt uw betaalgegevens bijwerken om de factuur te voldoen en DocuSeal te blijven gebruiken of uw abonnement opzeggen.
+ get_the_docuseal_app_for_a_better_mobile_experience: Download de DocuSeal-app voor een betere mobiele ervaring.
+ install_app: App installeren
manage_subscription: Abonnement beheren
docuseal_version_security_release_is_available: "Beveiligingsupdate DocuSeal v%{version} is beschikbaar."
click_here_to_view_the_instructions_and_update_your_app_html: '
Klik hier om de instructies te bekijken en uw app bij te werken.'
@@ -8520,10 +8546,12 @@ nl: &nl
link: Link
mcp: MCP
self: Zelf ondertekenen
+ error: Fout
submission_event_names:
send_email_to_html: "
E-mail verzonden naar %{submitter_name}"
bounce_email_html: "
E-mail geretourneerd %{submitter_name}"
complaint_email_html: "
Spamklacht %{submitter_name}"
+ fail_sms_to_html: "
SMS niet afgeleverd naar %{submitter_name}"
send_reminder_email_to_html: "
Herinneringsmail verzonden naar %{submitter_name}"
send_sms_to_html: "
SMS verzonden naar %{submitter_name}"
send_2fa_sms_to_html: "
Verificatie-SMS verzonden naar %{submitter_name}"
diff --git a/config/routes.rb b/config/routes.rb
index 812581ae1..70d51f6c6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -125,12 +125,12 @@ Rails.application.routes.draw do
resource :blobs_proxy, only: %i[show], path: '/blobs_proxy/:signed_uuid/*filename',
controller: 'api/active_storage_blobs_proxy'
- if Docuseal.multitenant?
- get '/disk/:encoded_key/*filename' => 'active_storage/disk#show', as: :rails_disk_service if Rails.env.local?
-
- ActiveSupport.run_load_hooks(:multitenant_routes, self)
+ if !Docuseal.multitenant? || Rails.env.local?
+ get '/disk/:encoded_key/*filename' => 'active_storage/disk#show', as: :rails_disk_service
end
+ ActiveSupport.run_load_hooks(:multitenant_routes, self) if Docuseal.multitenant?
+
resources :start_form, only: %i[show update], path: 'd', param: 'slug' do
get :completed
end
diff --git a/lib/detect_browser_device.rb b/lib/detect_browser_device.rb
index bebbe39f7..f20a5a134 100644
--- a/lib/detect_browser_device.rb
+++ b/lib/detect_browser_device.rb
@@ -26,6 +26,9 @@ module DetectBrowserDevice
Silk
/ix
+ IOS_APP_USER_AGENT_REGEXP = /Hotwire Native iOS/
+ ANDROID_APP_USER_AGENT_REGEXP = /Hotwire Native Android/
+
WINDOWS_USER_AGENT_REGEXP = /
Windows|
Win64 |
@@ -63,6 +66,42 @@ module DetectBrowserDevice
NetBSD
/ix
+ SEARCH_BOT_USER_AGENT_REGEXP = /
+ Googlebot |
+ Google-InspectionTool|
+ Storebot-Google |
+ AdsBot-Google |
+ Mediapartners-Google |
+ bingbot |
+ BingPreview |
+ adidxbot |
+ msnbot |
+ Slurp |
+ DuckDuckBot |
+ Baiduspider |
+ YandexBot |
+ YandexImages |
+ Applebot |
+ PetalBot |
+ SeznamBot |
+ Sogou |
+ Exabot |
+ Qwantify |
+ YisouSpider |
+ Bytespider |
+ AhrefsBot |
+ SemrushBot |
+ MJ12bot |
+ DotBot |
+ GPTBot |
+ OAI-SearchBot |
+ ClaudeBot |
+ Claude-SearchBot |
+ PerplexityBot |
+ CCBot |
+ Amazonbot
+ /ix
+
SDK_USER_AGENT_REGEXP = /\ADocuSeal (?
Ruby|Python|PHP|Java|C#|JS|Go|CLI) v/i
def call(user_agent)
@@ -74,6 +113,10 @@ module DetectBrowserDevice
'desktop'
end
+ def search_bot?(user_agent)
+ SEARCH_BOT_USER_AGENT_REGEXP.match?(user_agent.to_s)
+ end
+
def os(user_agent)
return if user_agent.blank?
@@ -82,6 +125,8 @@ module DetectBrowserDevice
return sdk.downcase if sdk
case user_agent
+ when IOS_APP_USER_AGENT_REGEXP then 'iosapp'
+ when ANDROID_APP_USER_AGENT_REGEXP then 'andapp'
when WINDOWS_USER_AGENT_REGEXP then 'windows'
when ANDROID_USER_AGENT_REGEXP then 'android'
when IOS_USER_AGENT_REGEXP then 'ios'
diff --git a/lib/docuseal.rb b/lib/docuseal.rb
index ffb31cdb8..81ac6da12 100644
--- a/lib/docuseal.rb
+++ b/lib/docuseal.rb
@@ -11,6 +11,8 @@ module Docuseal
TWITTER_URL = 'https://twitter.com/docusealco'
TWITTER_HANDLE = '@docusealco'
CHATGPT_URL = "#{PRODUCT_URL}/chat".freeze
+ APP_STORE_URL = 'https://apps.apple.com/us/app/docuseal-e-signature/id6823564236'
+ GOOGLE_PLAY_URL = 'https://play.google.com/store/apps/details?id=com.docuseal.app'
SUPPORT_EMAIL = 'support@docuseal.com'
HOST = ENV.fetch('HOST', 'localhost')
AATL_CERT_NAME = 'docuseal_aatl'
diff --git a/lib/filename_utils.rb b/lib/filename_utils.rb
index 7fceca4a1..40728e5ed 100644
--- a/lib/filename_utils.rb
+++ b/lib/filename_utils.rb
@@ -18,4 +18,8 @@ module FilenameUtils
def dangerous_extension(filename)
ActiveStorage::Filename.wrap(filename).sanitized[DANGEROUS_EXTENSIONS_REGEXP, 1]&.downcase
end
+
+ def basename(filename)
+ File.basename(filename, File.extname(filename))
+ end
end
diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index 9b01bdd55..0fe383044 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -469,7 +469,7 @@ module Submissions
end
events_data = submission.submission_events.sort_by(&:event_timestamp).filter_map do |event|
- next if event.event_type.in?(%w[bounce_email complaint_email])
+ next if event.event_type.in?(%w[bounce_email complaint_email fail_sms])
submitter = submission.submitters.find { |e| e.id == event.submitter_id }
versions = submitter_versions_index[submitter.id] || []
diff --git a/lib/submitters.rb b/lib/submitters.rb
index 8f2578f52..e0ac5e449 100644
--- a/lib/submitters.rb
+++ b/lib/submitters.rb
@@ -232,7 +232,7 @@ module Submitters
def build_document_filename(submitter, blob, filename_format)
return blob.filename.to_s if filename_format.blank?
- filename = filename_format.gsub('{document.name}', blob.filename.base)
+ filename = filename_format.gsub('{document.name}', FilenameUtils.basename(blob[:filename]))
filename = ReplaceEmailVariables.call(filename, submitter:)
filename = filename.gsub(' - {submission.status}') do
diff --git a/lib/submitters/serialize_for_api.rb b/lib/submitters/serialize_for_api.rb
index db76b3c82..f24ff4fb5 100644
--- a/lib/submitters/serialize_for_api.rb
+++ b/lib/submitters/serialize_for_api.rb
@@ -8,6 +8,13 @@ module Submitters
methods: %i[status application_key]
}.freeze
+ EVENT_DATA_KEYS = {
+ 'decline_form' => %w[reason],
+ 'complete_verification' => %w[firstname lastname method country idcode],
+ 'fail_kba' => %w[issues],
+ 'fail_sms' => %w[status error_code]
+ }.freeze
+
module_function
def call(submitter, with_template: false, with_events: false, with_documents: true, with_urls: false,
@@ -55,7 +62,7 @@ module Submitters
def serialize_events(events)
events.map do |event|
event.as_json(only: %i[id submitter_id event_type event_timestamp])
- .merge('data' => event.data.slice('reason', 'firstname', 'lastname', 'method', 'country', 'idcode'))
+ .merge('data' => event.data.slice(*EVENT_DATA_KEYS[event.event_type]))
end
end
end
diff --git a/lib/submitters/serialize_for_webhook.rb b/lib/submitters/serialize_for_webhook.rb
index a7f207d7c..2582b6f99 100644
--- a/lib/submitters/serialize_for_webhook.rb
+++ b/lib/submitters/serialize_for_webhook.rb
@@ -104,7 +104,10 @@ module Submitters
def build_documents_array(submitter, expires_at: nil)
submitter.documents.map do |attachment|
- { 'name' => attachment.filename.base, 'url' => rails_storage_proxy_url(attachment, expires_at:) }
+ {
+ 'name' => FilenameUtils.basename(attachment.blob[:filename]),
+ 'url' => rails_storage_proxy_url(attachment, expires_at:)
+ }
end
end
diff --git a/lib/templates/create_document_crop.rb b/lib/templates/create_document_crop.rb
index 213e8711a..bd9da350c 100644
--- a/lib/templates/create_document_crop.rb
+++ b/lib/templates/create_document_crop.rb
@@ -26,7 +26,7 @@ module Templates
def create_document!(template, attachment, data, scan)
blob = ActiveStorage::Blob.create_and_upload!(
io: StringIO.new(data),
- filename: "#{attachment.filename.base}.#{scan ? 'png' : 'jpg'}",
+ filename: "#{FilenameUtils.basename(attachment.blob[:filename])}.#{scan ? 'png' : 'jpg'}",
metadata: { identified: true, analyzed: true },
content_type: scan ? 'image/png' : 'image/jpeg'
)
diff --git a/lib/templates/modify_documents.rb b/lib/templates/modify_documents.rb
index c038c62e2..c1b0f72e7 100644
--- a/lib/templates/modify_documents.rb
+++ b/lib/templates/modify_documents.rb
@@ -52,7 +52,7 @@ module Templates
schema_item =
template.schema.find { |item| item['attachment_uuid'] == entry['attachment_uuid'] } ||
{ 'attachment_uuid' => entry['attachment_uuid'],
- 'name' => attachments_index[entry['attachment_uuid']].filename.base }
+ 'name' => FilenameUtils.basename(attachments_index[entry['attachment_uuid']].blob[:filename]) }
next if entry['pages'].blank?
@@ -270,7 +270,7 @@ module Templates
blob = ActiveStorage::Blob.create_and_upload!(
io: StringIO.new(data),
- filename: "#{attachment.filename.base}#{extension}",
+ filename: "#{FilenameUtils.basename(attachment.blob[:filename])}#{extension}",
metadata: { identified: true, analyzed: true },
content_type:
)
@@ -439,7 +439,7 @@ module Templates
blob = ActiveStorage::Blob.create_and_upload!(
io: StringIO.new(data),
- filename: "#{old_attachment.filename.base}.pdf",
+ filename: "#{FilenameUtils.basename(old_attachment.blob[:filename])}.pdf",
metadata: { identified: true, analyzed: true,
pdf: { annotations: }.compact_blank, sha256: }.compact_blank,
content_type: Templates::ProcessDocument::PDF_CONTENT_TYPE
diff --git a/lib/templates/replace_attachments.rb b/lib/templates/replace_attachments.rb
index 208894e40..90acce509 100644
--- a/lib/templates/replace_attachments.rb
+++ b/lib/templates/replace_attachments.rb
@@ -12,7 +12,10 @@ module Templates
documents.each_with_index do |document, index|
replaced_document_schema = template.schema[index]
- template.schema[index] = { attachment_uuid: document.uuid, name: document.filename.base }
+ template.schema[index] = {
+ attachment_uuid: document.uuid,
+ name: FilenameUtils.basename(document.blob[:filename])
+ }
if replaced_document_schema
template.fields.each do |field|