Merge from docusealco/wip

This commit is contained in:
Alex Turchyn
2024-12-18 21:30:59 +02:00
committed by GitHub
6 changed files with 26 additions and 14 deletions
+2
View File
@@ -64,6 +64,8 @@ module Docuseal
end
def default_pkcs
return if Docuseal::CERTS['enabled'] == false
@default_pkcs ||= GenerateCertificate.load_pkcs(Docuseal::CERTS)
end
+1 -1
View File
@@ -77,7 +77,7 @@ module Submissions
if template_fields != (submission.template_fields || submission.template.fields) ||
submitters_attrs.any? { |e| e[:completed].present? }
submission.template_fields = template_fields
submission.template_schema = submission.template.schema
submission.template_schema = submission.template.schema if submission.template_schema.blank?
end
submission
+9 -5
View File
@@ -43,12 +43,16 @@ module Submissions
last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
sign_params = {
reason: sign_reason,
**Submissions::GenerateResultAttachments.build_signing_params(last_submitter, pkcs, tsa_url)
}
if pkcs
sign_params = {
reason: sign_reason,
**Submissions::GenerateResultAttachments.build_signing_params(last_submitter, pkcs, tsa_url)
}
document.sign(io, **sign_params)
document.sign(io, **sign_params)
else
document.write(io)
end
Submissions::GenerateResultAttachments.maybe_enable_ltv(io, sign_params)
@@ -17,12 +17,16 @@ module Submissions
pdf.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
sign_params = {
reason: Submissions::GenerateResultAttachments.single_sign_reason(submitter),
**Submissions::GenerateResultAttachments.build_signing_params(submitter, pkcs, tsa_url)
}
if pkcs
sign_params = {
reason: Submissions::GenerateResultAttachments.single_sign_reason(submitter),
**Submissions::GenerateResultAttachments.build_signing_params(submitter, pkcs, tsa_url)
}
pdf.sign(io, **sign_params)
pdf.sign(io, **sign_params)
else
pdf.write(io)
end
Submissions::GenerateResultAttachments.maybe_enable_ltv(io, sign_params)
@@ -487,7 +487,7 @@ module Submissions
sign_reason = fetch_sign_reason(submitter)
if sign_reason
if sign_reason && pkcs
sign_params = {
reason: sign_reason,
**build_signing_params(submitter, pkcs, tsa_url)
+4 -2
View File
@@ -25,7 +25,8 @@ Capybara.register_driver(:headless_cuprite) do |app|
Capybara::Cuprite::Driver.new(app, window_size: [1200, 800],
process_timeout: 20,
timeout: 20,
js_errors: true)
js_errors: true,
browser_options: { 'no-sandbox' => nil })
end
Capybara.register_driver(:headful_cuprite) do |app|
@@ -33,7 +34,8 @@ Capybara.register_driver(:headful_cuprite) do |app|
headless: false,
process_timeout: 20,
timeout: 20,
js_errors: true)
js_errors: true,
browser_options: { 'no-sandbox' => nil })
end
Rails.root.glob('spec/support/**/*.rb').each { |f| require f }