adjust signing certs

lib/accounts.rb

@@ -118,7 +118,11 @@ module Accounts
       end
 
     if (default_cert = cert_data['custom']&.find { |e| e['status'] == 'default' })
-      OpenSSL::PKCS12.new(Base64.urlsafe_decode64(default_cert['data']), default_cert['password'].to_s)
+      if default_cert['name'] == Docuseal::AATL_CERT_NAME
+        Docuseal.default_pkcs
+      else
+        OpenSSL::PKCS12.new(Base64.urlsafe_decode64(default_cert['data']), default_cert['password'].to_s)
+      end
     else
       GenerateCertificate.load_pkcs(cert_data)
     end
@@ -153,7 +157,9 @@ module Accounts
 
     default_pkcs = GenerateCertificate.load_pkcs(cert_data)
 
-    custom_certs = cert_data.fetch('custom', []).map do |e|
+    custom_certs = cert_data.fetch('custom', []).filter_map do |e|
+      next if e['data'].blank?
+
       OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s)
     end
 

lib/docuseal.rb

@@ -14,6 +14,7 @@ module Docuseal
   CHATGPT_URL = 'https://chatgpt.com/g/g-9hg8AAw0r-docuseal'
   SUPPORT_EMAIL = 'support@docuseal.co'
   HOST = ENV.fetch('HOST', 'localhost')
+  AATL_CERT_NAME = 'docuseal_aatl'
   CONSOLE_URL = if Rails.env.development?
                   'http://console.localhost.io:3001'
                 elsif ENV['MULTITENANT'] == 'true'

lib/submissions/generate_audit_trail.rb

@@ -43,9 +43,11 @@ module Submissions
 
       document.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
 
+      last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
+
       sign_params = {
         reason: sign_reason,
-        **Submissions::GenerateResultAttachments.build_signing_params(pkcs, tsa_url)
+        **Submissions::GenerateResultAttachments.build_signing_params(last_submitter, pkcs, tsa_url)
       }
 
       document.sign(io, **sign_params)
@@ -170,7 +172,7 @@ module Submissions
 
       composer.draw_box(divider)
 
-      last_submitter = submission.submitters.where.not(completed_at: nil).order(:completed_at).last
+      last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
 
       documents_data = Submitters.select_attachments_for_download(last_submitter).map do |document|
         original_documents = submission.template.documents.select do |e|

lib/submissions/generate_combined_attachment.rb

@@ -19,7 +19,7 @@ module Submissions
 
       sign_params = {
         reason: sign_reason,
-        **Submissions::GenerateResultAttachments.build_signing_params(pkcs, tsa_url)
+        **Submissions::GenerateResultAttachments.build_signing_params(submitter, pkcs, tsa_url)
       }
 
       pdf.sign(io, **sign_params)

lib/submissions/generate_result_attachments.rb

@@ -454,7 +454,7 @@ module Submissions
       if sign_reason
         sign_params = {
           reason: sign_reason,
-          **build_signing_params(pkcs, tsa_url)
+          **build_signing_params(submitter, pkcs, tsa_url)
         }
 
         begin
@@ -491,7 +491,7 @@ module Submissions
       io
     end
 
-    def build_signing_params(pkcs, tsa_url)
+    def build_signing_params(_submitter, pkcs, tsa_url)
       params = {
         certificate: pkcs.certificate,
         key: pkcs.key,