Beautiful Open-Source Form Builder
fix email submission double escaping (#1223)
Julien Nahum0f23c45a87b8
diff --git a/api/app/Service/Forms/FormSubmissionFormatter.php b/api/app/Service/Forms/FormSubmissionFormatter.phpindex a57a43a8a..6a8f07657 100644--- a/api/app/Service/Forms/FormSubmissionFormatter.php+++ b/api/app/Service/Forms/FormSubmissionFormatter.php@@ -295,6 +295,7 @@ class FormSubmissionFormatterif ($this->createLinks && empty($field['value_is_html'])) {$field['value'] = $this->escapeHtmlValue($field['value']);+ $field['value_is_html'] = true;}$transformedFields[] = $field;diff --git a/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php b/api/tests/Feature/Integrations/Email/EmailIntegrationTest.phpindex 548bf4a81..2d6e2ce6f 100644--- a/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php+++ b/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php@@ -455,3 +455,35 @@ test('email notification escapes submission html while keeping generated links cexpect($html)->toContain('href="https://example.com/path"');expect($html)->toContain('>https://example.com/path<');});++test('email notification renders plain submission values once in the submission data block', function () {+ $user = $this->actingAsProUser();+ $workspace = $this->createUserWorkspace($user);+ $form = $this->createForm($user, $workspace);++ $textField = collect($form->properties)->firstWhere('name', 'Name');+ $submissionData = [+ $textField['id'] => "Café d'Art & <b>test</b>",+ ];++ $integrationData = (object) [+ 'sender_name' => 'Test Sender',+ 'subject' => 'Test Subject',+ 'email_content' => '<p>Body</p>',+ 'include_submission_data' => true,+ ];++ $notification = new FormEmailNotification(+ new \App\Events\Forms\FormSubmitted($form, $submissionData),+ $integrationData+ );++ $html = (string) $notification->toMail(new AnonymousNotifiable())->render();++ expect($html)->toContain('Café d');+ expect($html)->toContain('<b>test</b>');+ expect($html)->not->toContain('&#039;');+ expect($html)->not->toContain('&amp;');+ expect($html)->not->toContain('&lt;b&gt;test&lt;/b&gt;');+ expect($html)->not->toContain("Café d'Art & <b>test</b>");+});