adjust for multitenant

app/controllers/esign_settings_controller.rb

@@ -12,11 +12,9 @@ class EsignSettingsController < ApplicationController
         HexaPDF::Document.new(io: StringIO.new(blob.download))
       end
 
-    cert = EncryptedConfig.find_by(account: current_account, key: EncryptedConfig::ESIGN_CERTS_KEY).value
+    certs = Accounts.load_signing_certs(current_account)
 
-    trusted_certs = [OpenSSL::X509::Certificate.new(cert['cert']),
-                     OpenSSL::X509::Certificate.new(cert['sub_ca']),
-                     OpenSSL::X509::Certificate.new(cert['root_ca'])]
+    trusted_certs = [certs[:cert], certs[:sub_ca], certs[:root_ca]]
 
     render turbo_stream: turbo_stream.replace('result', partial: 'result', locals: { pdfs:, blobs:, trusted_certs: })
   rescue HexaPDF::MalformedPDFError

app/controllers/setup_controller.rb

@@ -22,7 +22,7 @@ class SetupController < ApplicationController
     if @user.save
       encrypted_configs = [
         { key: EncryptedConfig::APP_URL_KEY, value: encrypted_config_params[:value] },
-        { key: EncryptedConfig::ESIGN_CERTS_KEY, value: GenerateCertificate.call }
+        { key: EncryptedConfig::ESIGN_CERTS_KEY, value: GenerateCertificate.call.transform_values(&:to_pem) }
       ]
       @account.encrypted_configs.create!(encrypted_configs)
 

app/javascript/elements/download_button.js

@@ -25,7 +25,7 @@ export default targetable(class extends HTMLElement {
             const link = document.createElement('a')
 
             link.href = blobUrl
-            link.setAttribute('download', decodeURI(resp.headers.get('content-disposition').split('"')[1]))
+            link.setAttribute('download', decodeURI(url.split('/').pop()))
 
             link.click()
 

app/javascript/form.js

@@ -12,6 +12,7 @@ window.customElements.define('submission-form', class extends HTMLElement {
       submitterSlug: this.dataset.submitterSlug,
       submitterUuid: this.dataset.submitterUuid,
       authenticityToken: this.dataset.authenticityToken,
+      canSendEmail: this.dataset.canSendEmail === 'true',
       values: reactive(JSON.parse(this.dataset.values)),
       attachments: reactive(JSON.parse(this.dataset.attachments)),
       fields: JSON.parse(this.dataset.fields)

app/javascript/submission_form/completed.vue

@@ -12,6 +12,7 @@
     </p>
     <div class="space-y-3 mt-5">
       <button
+        v-if="canSendEmail"
         class="white-button flex items-center space-x-1 w-full"
         :disabled="isSendingCopy"
         @click.prevent="sendCopyToEmail"
@@ -58,6 +59,11 @@ export default {
     submitterSlug: {
       type: String,
       required: true
+    },
+    canSendEmail: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data () {
@@ -98,7 +104,7 @@ export default {
               const link = document.createElement('a')
 
               link.href = blobUrl
-              link.setAttribute('download', decodeURI(resp.headers.get('content-disposition').split('"')[1]))
+              link.setAttribute('download', decodeURI(url.split('/').pop()))
 
               link.click()
 

app/javascript/submission_form/form.vue

@@ -249,6 +249,7 @@
     </form>
     <FormCompleted
       v-else
+      :can-send-email="canSendEmail"
       :submitter-slug="submitterSlug"
     />
     <div class="flex justify-center">
@@ -291,6 +292,11 @@ export default {
       type: String,
       required: true
     },
+    canSendEmail: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     submitterUuid: {
       type: String,
       required: true

app/javascript/submission_form/signature_step.vue

@@ -74,8 +74,10 @@ export default {
     }
   },
   async mounted () {
-    this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth
-    this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth / 3
+    this.$nextTick(() => {
+      this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth
+      this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth / 3
+    })
 
     import('@rails/activestorage')
     const { default: SignaturePad } = await import('signature_pad')

app/views/accounts/show.html.erb

@@ -21,11 +21,13 @@
           </div>
         </div>
       <% end %>
-      <%= f.fields_for @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) do |ff| %>
-        <div class="form-control">
-          <%= ff.label :value, 'App URL', class: 'label' %>
-          <%= ff.text_field :value, autocomplete: 'off', class: 'base-input' %>
-        </div>
+      <% unless Docuseal.multitenant? %>
+        <%= f.fields_for @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) do |ff| %>
+          <div class="form-control">
+            <%= ff.label :value, 'App URL', class: 'label' %>
+            <%= ff.text_field :value, autocomplete: 'off', class: 'base-input' %>
+          </div>
+        <% end %>
       <% end %>
       <div class="form-control pt-2">
         <%= f.button button_title(title: 'Update', disabled_with: 'Updating'), class: 'base-button' %>

app/views/devise/registrations/new.html.erb

@@ -22,6 +22,8 @@
         </div>
       <% end %>
       <%= f.fields_for resource.account do |ff| %>
+        <set-timezone data-input-id="_account_timezone"></set-timezone>
+        <%= ff.hidden_field :timezone %>
         <div class="form-control">
           <%= ff.label :name, 'Company name', class: 'label' %>
           <%= ff.text_field :name, required: true, class: 'base-input' %>

app/views/shared/_settings_nav.html.erb

@@ -9,12 +9,14 @@
       <li>
         <%= link_to 'Account', settings_account_path, class: 'text-base hover:bg-base-300' %>
       </li>
-      <li>
-        <%= link_to 'Email', settings_email_index_path, class: 'text-base hover:bg-base-300' %>
-      </li>
-      <li>
-        <%= link_to 'Storage', settings_storage_index_path, class: 'text-base hover:bg-base-300' %>
-      </li>
+      <% unless Docuseal.multitenant? %>
+        <li>
+          <%= link_to 'Email', settings_email_index_path, class: 'text-base hover:bg-base-300' %>
+        </li>
+        <li>
+          <%= link_to 'Storage', settings_storage_index_path, class: 'text-base hover:bg-base-300' %>
+        </li>
+      <% end %>
       <li>
         <%= link_to 'Signature', settings_esign_index_path, class: 'text-base hover:bg-base-300' %>
       </li>

app/views/start_form/completed.html.erb

@@ -29,9 +29,11 @@
     <div class="text-center text-2xl font-semibold">
       Form has been submitter already
     </div>
-    <div>
-      <%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending', icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
-    </div>
+    <% if Accounts.can_send_emails?(@submitter.submission.template.account) %>
+      <div>
+        <%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending', icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
+      </div>
+    <% end %>
   </div>
 </div>
 <%= render 'shared/attribution' %>

app/views/submissions/new.html.erb

@@ -36,7 +36,7 @@
       </dynamic-list>
     <% end %>
     <div class="form-control">
-      <% is_smtp_configured = Docuseal.multitenant? || current_account.encrypted_configs.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY) %>
+      <% is_smtp_configured = Accounts.can_send_emails?(current_account) %>
       <%= f.label :send_email, class: 'flex items-center cursor-pointer' do %>
         <%= f.check_box :send_email, class: 'base-checkbox', disabled: !is_smtp_configured, onchange: "message_field.classList.toggle('hidden', !event.currentTarget.checked)" %>
         <span class="label">Send Email</span>

app/views/submissions/show.html.erb

@@ -75,7 +75,7 @@
             <div class="flex items-center space-x-1 mt-1">
               <%= svg_icon('writing', class: 'w-5 h-5') %>
               <span>
-                <%= submitter&.completed_at? ? l(submitter.completed_at, format: :long) : 'Not completed yet' %>
+                <%= submitter&.completed_at? ? l(submitter.completed_at.in_time_zone(current_account.timezone), format: :long, locale: current_account.locale) : 'Not completed yet' %>
               </span>
             </div>
             <% if submitter && !submitter.completed_at? %>

app/views/submit_form/completed.html.erb

@@ -27,8 +27,10 @@
       </div>
     </div>
     <div>
-      <%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending', icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
-      <div class="divider">OR</div>
+      <% if Accounts.can_send_emails?(@submitter.submission.template.account) %>
+        <%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending', icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
+        <div class="divider">OR</div>
+      <% end %>
       <download-button data-src="<%= submitter_download_index_path(@submitter.slug) %>" class="base-button w-full">
         <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
           <%= svg_icon('download', class: 'w-6 h-6') %>

app/views/submit_form/show.html.erb

@@ -29,7 +29,7 @@
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
       <div class="shadow-md bg-base-100 absolute bottom-0 md:bottom-4 w-full border border-base-200 border p-4 rounded">
-        <submission-form data-submitter-uuid="<%= @submitter.uuid %>" data-submitter-slug="<%= @submitter.slug %>" data-attachments="<%= attachments_index.values.select { |e| e.record_id == @submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>" data-fields="<%= @submitter.submission.template.fields.select { |f| f['submitter_uuid'] == @submitter.uuid }.to_json %>" data-values="<%= @submitter.values.to_json %>" data-authenticity-token="<%= form_authenticity_token %>"></submission-form>
+        <submission-form data-submitter-uuid="<%= @submitter.uuid %>" data-submitter-slug="<%= @submitter.slug %>" data-can-send-email="<%= Accounts.can_send_emails?(OpenStruct.new(id: @submitter.submission.template.account_id)) %>" data-attachments="<%= attachments_index.values.select { |e| e.record_id == @submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>" data-fields="<%= @submitter.submission.template.fields.select { |f| f['submitter_uuid'] == @submitter.uuid }.to_json %>" data-values="<%= @submitter.values.to_json %>" data-authenticity-token="<%= form_authenticity_token %>"></submission-form>
       </div>
     </div>
   </div>