From 90db64cc0360e47ae39c9df56c92606ca53f973c Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete.matsy@gmail.com>
Date: Thu, 5 Sep 2024 15:03:43 +0300
Subject: [PATCH] fix file prefill

---
 lib/submissions/normalize_param_utils.rb | 10 ++++++----
 lib/submitters/normalize_values.rb       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/submissions/normalize_param_utils.rb b/lib/submissions/normalize_param_utils.rb
index 05e80a9f..07ded95c 100644
--- a/lib/submissions/normalize_param_utils.rb
+++ b/lib/submissions/normalize_param_utils.rb
@@ -48,13 +48,15 @@ module Submissions
 
       submitters.each do |submitter|
         submitter.values.each_value do |value|
-          attachment = attachments_index[value]
+          Array.wrap(value).each do |v|
+            attachment = attachments_index[v]
 
-          next unless attachment
+            next unless attachment
 
-          attachment.record = submitter
+            attachment.record = submitter
 
-          attachment.save!
+            attachment.save!
+          end
         end
       end
     end
diff --git a/lib/submitters/normalize_values.rb b/lib/submitters/normalize_values.rb
index b14a4270..3e65b0c7 100644
--- a/lib/submitters/normalize_values.rb
+++ b/lib/submitters/normalize_values.rb
@@ -137,7 +137,7 @@ module Submitters
         elsif type.in?(%w[signature initials]) && value.length < 60
           find_or_create_blob_from_text(account, value, type)
         elsif (data = Base64.decode64(value.sub(BASE64_PREFIX_REGEXP, ''))) &&
-              Marcel::MimeType.for(data).include?('image')
+              Marcel::MimeType.for(data).exclude?('octet-stream')
           find_or_create_blob_from_base64(account, data, type)
         else
           raise InvalidDefaultValue, "Invalid value, url, base64 or text < 60 chars is expected: #{value.first(200)}..."