expire download links

lib/submissions/generate_audit_trail.rb

@@ -391,8 +391,8 @@ module Submissions
               composer.formatted_text_box(
                 Array.wrap(value).map do |uuid|
                   attachment = submitter.attachments.find { |a| a.uuid == uuid }
-                  link =
-                    ActiveStorage::Blob.proxy_url(attachment.blob)
+
+                  link = r.submissions_preview_url(submission.slug, **Docuseal.default_url_options)
 
                   { link:, text: "#{attachment.filename}\n", style: :link }
                 end,
@@ -489,6 +489,10 @@ module Submissions
                             padding: [5, 0, 0, 8],
                             position: :float, text_align: :left)
     end
+
+    def r
+      Rails.application.routes.url_helpers
+    end
     # rubocop:enable Metrics
   end
 end

lib/submissions/generate_export_files.rb

@@ -6,8 +6,8 @@ module Submissions
 
     module_function
 
-    def call(submissions, format: :csv)
-      rows = build_table_rows(submissions)
+    def call(submissions, format: :csv, expires_at: nil)
+      rows = build_table_rows(submissions, expires_at:)
 
       if format.to_sym == :csv
         rows_to_csv(rows)
@@ -57,7 +57,7 @@ module Submissions
       headers.map { |key| row.find { |e| e[:name] == key }&.dig(:value) }
     end
 
-    def build_table_rows(submissions)
+    def build_table_rows(submissions, expires_at: nil)
       submissions.preload(submitters: [attachments_attachments: :blob, documents_attachments: :blob])
                  .find_each.map do |submission|
         submission_data = []
@@ -69,7 +69,7 @@ module Submissions
 
           submission_data += build_submission_data(submitter, submitter_name, submitters_count)
 
-          submission_data += submitter_formatted_fields(submitter).map do |field|
+          submission_data += submitter_formatted_fields(submitter, expires_at:).map do |field|
             {
               name: column_name(field[:name], submitter_name, submitters_count),
               value: field[:value]
@@ -81,7 +81,7 @@ module Submissions
           submission_data += submitter.documents.map.with_index(1) do |attachment, index|
             {
               name: "#{I18n.t('document')} #{index}",
-              value: ActiveStorage::Blob.proxy_url(attachment.blob)
+              value: ActiveStorage::Blob.proxy_url(attachment.blob, expires_at:)
             }
           end
         end
@@ -123,7 +123,7 @@ module Submissions
       submitters_count > 1 ? "#{submitter_name} - #{name}" : name
     end
 
-    def submitter_formatted_fields(submitter)
+    def submitter_formatted_fields(submitter, expires_at: nil)
       fields = submitter.submission.template_fields || submitter.submission.template.fields
 
       template_fields = fields.select { |f| f['submitter_uuid'] == submitter.uuid }
@@ -142,11 +142,13 @@ module Submissions
         value =
           if template_field_type.in?(%w[image signature])
             attachment = attachments_index[submitter_value]
-            ActiveStorage::Blob.proxy_url(attachment.blob) if attachment
+
+            ActiveStorage::Blob.proxy_url(attachment.blob, expires_at:) if attachment
           elsif template_field_type == 'file'
             Array.wrap(submitter_value).compact_blank.filter_map do |e|
               attachment = attachments_index[e]
-              ActiveStorage::Blob.proxy_url(attachment.blob) if attachment
+
+              ActiveStorage::Blob.proxy_url(attachment.blob, expires_at:) if attachment
             end
           else
             submitter_value

lib/submissions/generate_result_attachments.rb

@@ -201,13 +201,15 @@ module Submissions
 
       attachments_data_cache = {}
 
-      return pdfs_index if submitter.submission.template_fields.blank?
+      submission = submitter.submission
 
-      with_headings = find_last_submitter(submitter.submission, submitter:).blank? if with_headings.nil?
+      return pdfs_index if submission.template_fields.blank?
+
+      with_headings = find_last_submitter(submission, submitter:).blank? if with_headings.nil?
 
       locale = submitter.metadata.fetch('lang', account.locale)
 
-      submitter.submission.template_fields.each do |field|
+      submission.template_fields.each do |field|
         next if field['type'] == 'heading' && !with_headings
         next if field['submitter_uuid'] != submitter.uuid && field['type'] != 'heading'
 
@@ -476,7 +478,7 @@ module Submissions
                     height_diff - (height_diff.zero? ? diff : 0)
                   ],
                   A: { Type: :Action, S: :URI,
-                       URI: ActiveStorage::Blob.proxy_url(attachment.blob) }
+                       URI: r.submissions_preview_url(submission.slug, **Docuseal.default_url_options) }
                 }
               )
 
@@ -877,7 +879,7 @@ module Submissions
       end
     end
 
-    def h
+    def r
       Rails.application.routes.url_helpers
     end
   end

lib/submissions/serialize_for_api.rb

@@ -4,7 +4,6 @@ module Submissions
   module SerializeForApi
     SERIALIZE_PARAMS = {
       only: %i[id name slug source submitters_order expire_at created_at updated_at archived_at],
-      methods: %i[audit_log_url combined_document_url],
       include: {
         submitters: { only: %i[id] },
         template: { only: %i[id name external_id created_at updated_at],
@@ -15,11 +14,13 @@ module Submissions
 
     module_function
 
-    def call(submission, submitters = nil, params = {}, with_events: true, with_documents: true, with_values: true)
+    def call(submission, submitters = nil, params = {}, with_events: true, with_documents: true, with_values: true,
+             expires_at: Accounts.link_expires_at(Account.new(id: submission.account_id)))
       submitters ||= submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob)
 
       serialized_submitters = submitters.map do |submitter|
-        Submitters::SerializeForApi.call(submitter, with_documents:, with_events: false, with_values:, params:)
+        Submitters::SerializeForApi.call(submitter, with_documents:, with_events: false, with_values:, params:,
+                                                    expires_at:)
       end
 
       json = submission.as_json(SERIALIZE_PARAMS)
@@ -30,8 +31,6 @@ module Submissions
         json['submission_events'] = Submitters::SerializeForApi.serialize_events(submission.submission_events)
       end
 
-      json['combined_document_url'] ||= maybe_build_combined_url(submitters, submission, params)
-
       if submitters.all?(&:completed_at?)
         last_submitter = submitters.max_by(&:completed_at)
 
@@ -39,10 +38,16 @@ module Submissions
           json['documents'] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
         end
 
+        json['audit_log_url'] = submission.audit_log_url(expires_at:)
+        json['combined_document_url'] = submission.combined_document_url(expires_at:)
+        json['combined_document_url'] ||= maybe_build_combined_url(submitters, submission, params, expires_at:)
+
         json['status'] = 'completed'
         json['completed_at'] = last_submitter.completed_at.as_json
       else
         json['documents'] = [] if with_documents
+        json['audit_log_url'] = nil
+        json['combined_document_url'] = nil
         json['status'] = build_status(submission, submitters)
         json['completed_at'] = nil
       end
@@ -60,7 +65,7 @@ module Submissions
       end
     end
 
-    def maybe_build_combined_url(submitters, submission, params)
+    def maybe_build_combined_url(submitters, submission, params, expires_at: nil)
       return unless submitters.all?(&:completed_at?)
 
       attachment = submission.combined_document_attachment
@@ -71,7 +76,7 @@ module Submissions
         attachment = Submissions::GenerateCombinedAttachment.call(submitter)
       end
 
-      ActiveStorage::Blob.proxy_url(attachment.blob) if attachment
+      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at:) if attachment
     end
   end
 end