pull/718/head
Pete Matsyburka 4 weeks ago
parent e5733d88c0
commit 11c76bf554

@ -57,7 +57,7 @@ class StartFormController < ApplicationController
elsif @submitter.errors.blank? && @submitter.save elsif @submitter.errors.blank? && @submitter.save
Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record
Submitters::StartForm.assign_start_form_cookie(request, @submitter) Submitters::StartForm.assign_start_form_cookie(@submitter, request)
redirect_to submit_form_path(@submitter.slug) redirect_to submit_form_path(@submitter.slug)
else else

@ -23,7 +23,8 @@ class StartFormResubmitController < ApplicationController
if (is_new_record = @submitter.new_record?) if (is_new_record = @submitter.new_record?)
Submitters::StartForm.assign_submission_attributes( Submitters::StartForm.assign_submission_attributes(
@submitter, @template, @submitter, @template,
ip: request.remote_ip, user_agent: request.user_agent, resubmit_submitter: @resubmit_submitter ip: request.remote_ip, user_agent: request.user_agent, resubmit_submitter: @resubmit_submitter,
source: @resubmit_submitter.submission.source_self? ? :self : :link
) )
Submissions::AssignDefinedSubmitters.call(@submitter.submission) Submissions::AssignDefinedSubmitters.call(@submitter.submission)
@ -36,7 +37,7 @@ class StartFormResubmitController < ApplicationController
elsif @submitter.save elsif @submitter.save
Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record
Submitters::StartForm.assign_start_form_cookie(request, @submitter) Submitters::StartForm.assign_start_form_cookie(@submitter, request)
redirect_to submit_form_path(@submitter.slug) redirect_to submit_form_path(@submitter.slug)
else else

@ -29,7 +29,7 @@ class StartFormSelfController < ApplicationController
Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record
Submitters::StartForm.assign_start_form_cookie(request, @submitter) Submitters::StartForm.assign_start_form_cookie(@submitter, request)
redirect_to submit_form_path(@submitter.slug) redirect_to submit_form_path(@submitter.slug)
end end

@ -26,14 +26,13 @@ module Submitters
return false if submitter.submission.source_embed? return false if submitter.submission.source_embed?
return true if template.preferences['shared_link_2fa'] == true return true if template.preferences['shared_link_2fa'] == true
return false if submitter.submission.source_link? return false if submitter.submission.source_link?
return true if Docuseal.multitenant?
return true if current_user && submitter.email == current_user.email && return true if current_user && submitter.email == current_user.email &&
current_user.account_id == submitter.account_id current_user.account_id == submitter.account_id
Accounts.can_send_emails?(template.account) Docuseal.multitenant? || Accounts.can_send_emails?(template.account)
end end
def assign_start_form_cookie(request, submitter) def assign_start_form_cookie(submitter, request)
request.cookie_jar.encrypted[:start_form_slug] = request.cookie_jar.encrypted[:start_form_slug] =
{ value: submitter.slug, expires: START_FORM_COOKIES_TTL.from_now, **COOKIES_DEFAULTS } { value: submitter.slug, expires: START_FORM_COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
end end
@ -118,7 +117,7 @@ module Submitters
enqueue_new_submitter_jobs(submitter) if is_new_record enqueue_new_submitter_jobs(submitter) if is_new_record
assign_start_form_cookie(request, submitter) assign_start_form_cookie(submitter, request)
if is_otp_verified if is_otp_verified
SubmissionEvents.create_with_tracking_data(submitter, 'email_verified', request) SubmissionEvents.create_with_tracking_data(submitter, 'email_verified', request)

Loading…
Cancel
Save