replace filename slashes

master^2
Pete Matsyburka 2 weeks ago
parent 307036eae6
commit 781da32a07

@ -63,7 +63,7 @@ class TemplatesUploadsController < ApplicationController
tempfile.write(DownloadUtils.call(params[:url], validate: true).body) tempfile.write(DownloadUtils.call(params[:url], validate: true).body)
tempfile.rewind tempfile.rewind
filename = URI.decode_www_form_component(params[:filename]) if params[:filename].present? filename = URI.decode_www_form_component(params[:filename]).tr('/', '-') if params[:filename].present?
filename ||= File.basename(URI.decode_www_form_component(params[:url])) filename ||= File.basename(URI.decode_www_form_component(params[:url]))
file = ActionDispatch::Http::UploadedFile.new( file = ActionDispatch::Http::UploadedFile.new(

@ -62,7 +62,7 @@ module Submissions
ActiveStorage::Attachment.create!( ActiveStorage::Attachment.create!(
blob: ActiveStorage::Blob.create_and_upload!( blob: ActiveStorage::Blob.create_and_upload!(
io: io.tap(&:rewind), filename: "#{I18n.t('audit_log')} - " \ io: io.tap(&:rewind), filename: "#{I18n.t('audit_log')} - " \
"#{submission.name || submission.template&.name}.pdf" "#{submission.name || submission.template&.name}.pdf".tr('/', '-')
), ),
name: 'audit_trail', name: 'audit_trail',
record: submission record: submission

@ -37,7 +37,7 @@ module Submissions
ActiveStorage::Attachment.create!( ActiveStorage::Attachment.create!(
blob: ActiveStorage::Blob.create_and_upload!( blob: ActiveStorage::Blob.create_and_upload!(
io: io.tap(&:rewind), filename: "#{submission.name || submission.template&.name}.pdf" io: io.tap(&:rewind), filename: "#{submission.name || submission.template&.name}.pdf".tr('/', '-')
), ),
name: with_audit ? 'combined_document' : 'merged_document', name: with_audit ? 'combined_document' : 'merged_document',
record: submission record: submission

@ -71,7 +71,7 @@ module Submissions
submission:, submission:,
values_hash:, values_hash:,
name: 'preview_merged_document', name: 'preview_merged_document',
filename: "#{submission.name || template&.name}.pdf" filename: "#{submission.name || template&.name}.pdf".tr('/', '-')
) )
ApplicationRecord.no_touching { attachment.save! } ApplicationRecord.no_touching { attachment.save! }
@ -115,7 +115,7 @@ module Submissions
submitter:, submitter:,
uuid: GenerateResultAttachments.images_pdf_uuid(original_documents.select(&:image?)), uuid: GenerateResultAttachments.images_pdf_uuid(original_documents.select(&:image?)),
values_hash:, values_hash:,
filename: "#{submission.name || template&.name}.pdf" filename: "#{submission.name || template&.name}.pdf".tr('/', '-')
) )
ApplicationRecord.no_touching do ApplicationRecord.no_touching do

@ -814,7 +814,7 @@ module Submissions
end end
ActiveStorage::Attachment.new( ActiveStorage::Attachment.new(
blob: ActiveStorage::Blob.create_and_upload!(io: io.tap(&:rewind), filename: "#{name}.pdf"), blob: ActiveStorage::Blob.create_and_upload!(io: io.tap(&:rewind), filename: "#{name}.pdf".tr('/', '-')),
metadata: { original_uuid: uuid, metadata: { original_uuid: uuid,
analyzed: true, analyzed: true,
sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(io.string)) }, sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(io.string)) },

@ -238,7 +238,7 @@ module Submitters
I18n.l(completed_at.in_time_zone(submitter.account.timezone), format: :short) I18n.l(completed_at.in_time_zone(submitter.account.timezone), format: :short)
end end
"#{filename}.#{blob.filename.extension}" "#{filename}.#{blob.filename.extension}".tr('/', '-')
end end
def send_shared_link_email_verification_code(submitter, request:) def send_shared_link_email_verification_code(submitter, request:)

@ -76,7 +76,7 @@ module Templates
blob = ActiveStorage::Blob.create_and_upload!( blob = ActiveStorage::Blob.create_and_upload!(
io: StringIO.new(document_data), io: StringIO.new(document_data),
filename: file.original_filename, filename: file.original_filename.tr('/', '-'),
metadata: { metadata: {
**metadata, **metadata,
identified: file.content_type == PDF_CONTENT_TYPE, identified: file.content_type == PDF_CONTENT_TYPE,

Loading…
Cancel
Save