Merge from docusealco/wip

pull/414/head 1.8.3
Alex Turchyn 11 months ago committed by GitHub
commit bb3b38e76f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -64,6 +64,8 @@ module Docuseal
end end
def default_pkcs def default_pkcs
return if Docuseal::CERTS['enabled'] == false
@default_pkcs ||= GenerateCertificate.load_pkcs(Docuseal::CERTS) @default_pkcs ||= GenerateCertificate.load_pkcs(Docuseal::CERTS)
end end

@ -77,7 +77,7 @@ module Submissions
if template_fields != (submission.template_fields || submission.template.fields) || if template_fields != (submission.template_fields || submission.template.fields) ||
submitters_attrs.any? { |e| e[:completed].present? } submitters_attrs.any? { |e| e[:completed].present? }
submission.template_fields = template_fields submission.template_fields = template_fields
submission.template_schema = submission.template.schema submission.template_schema = submission.template.schema if submission.template_schema.blank?
end end
submission submission

@ -43,12 +43,16 @@ module Submissions
last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at) last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
sign_params = { if pkcs
reason: sign_reason, sign_params = {
**Submissions::GenerateResultAttachments.build_signing_params(last_submitter, pkcs, tsa_url) 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) Submissions::GenerateResultAttachments.maybe_enable_ltv(io, sign_params)

@ -17,12 +17,16 @@ module Submissions
pdf.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})" pdf.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
sign_params = { if pkcs
reason: Submissions::GenerateResultAttachments.single_sign_reason(submitter), sign_params = {
**Submissions::GenerateResultAttachments.build_signing_params(submitter, pkcs, tsa_url) 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) Submissions::GenerateResultAttachments.maybe_enable_ltv(io, sign_params)

@ -487,7 +487,7 @@ module Submissions
sign_reason = fetch_sign_reason(submitter) sign_reason = fetch_sign_reason(submitter)
if sign_reason if sign_reason && pkcs
sign_params = { sign_params = {
reason: sign_reason, reason: sign_reason,
**build_signing_params(submitter, pkcs, tsa_url) **build_signing_params(submitter, pkcs, tsa_url)

@ -25,7 +25,8 @@ Capybara.register_driver(:headless_cuprite) do |app|
Capybara::Cuprite::Driver.new(app, window_size: [1200, 800], Capybara::Cuprite::Driver.new(app, window_size: [1200, 800],
process_timeout: 20, process_timeout: 20,
timeout: 20, timeout: 20,
js_errors: true) js_errors: true,
browser_options: { 'no-sandbox' => nil })
end end
Capybara.register_driver(:headful_cuprite) do |app| Capybara.register_driver(:headful_cuprite) do |app|
@ -33,7 +34,8 @@ Capybara.register_driver(:headful_cuprite) do |app|
headless: false, headless: false,
process_timeout: 20, process_timeout: 20,
timeout: 20, timeout: 20,
js_errors: true) js_errors: true,
browser_options: { 'no-sandbox' => nil })
end end
Rails.root.glob('spec/support/**/*.rb').each { |f| require f } Rails.root.glob('spec/support/**/*.rb').each { |f| require f }

Loading…
Cancel
Save