Beautiful Open-Source Form Builder
Add error logging for integration failures in AbstractIntegrationHandler
Julien Nahum747b41d0a625
diff --git a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php b/api/app/Integrations/Handlers/AbstractIntegrationHandler.phpindex cf90f267f..650e4fd7a 100644--- a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php+++ b/api/app/Integrations/Handlers/AbstractIntegrationHandler.php@@ -10,6 +10,7 @@ use App\Service\Forms\FormSubmissionFormatter;use App\Service\Forms\FormLogicConditionChecker;use Illuminate\Http\Client\RequestException;use Illuminate\Support\Facades\Http;+use Illuminate\Support\Facades\Log;use Vinkla\Hashids\Facades\Hashids;abstract class AbstractIntegrationHandler@@ -74,6 +75,10 @@ abstract class AbstractIntegrationHandler'status' => FormIntegrationsEvent::STATUS_ERROR,'data' => $this->extractEventDataFromException($e),]);+ Log::error('Integration failed', array_merge([+ 'form_id' => $this->form->id,+ 'integration_id' => $this->formIntegration->id,+ ], $this->extractEventDataFromException($e)));}}diff --git a/api/app/Notifications/Forms/FormEmailNotification.php b/api/app/Notifications/Forms/FormEmailNotification.phpindex 5f053c2fc..8d37082b5 100644--- a/api/app/Notifications/Forms/FormEmailNotification.php+++ b/api/app/Notifications/Forms/FormEmailNotification.php@@ -106,7 +106,14 @@ class FormEmailNotification extends Notificationreturn $this->integrationData->sender_email;}- return config('mail.from.address');+ $baseEmail = config('mail.from.address');+ if (!config('app.self_hosted')) {+ // Insert timestamp before the @ to prevent email grouping+ $parts = explode('@', $baseEmail);+ return $parts[0] . '+' . time() . '@' . $parts[1];+ }++ return $baseEmail;}private function getSenderName(): string@@ -155,6 +162,9 @@ class FormEmailNotification extends Notification// Add our custom Message-ID as X-Custom-Message-ID$message->getHeaders()->addTextHeader('X-Custom-Message-ID', $messageId);+ // Add X-Entity-Ref-ID header for Google+ notifications+ $message->getHeaders()->addTextHeader('X-Entity-Ref-ID', $messageId);+// Add References header$message->getHeaders()->addTextHeader('References', $references);diff --git a/api/tests/Feature/Forms/EmailNotificationTest.php b/api/tests/Feature/Forms/EmailNotificationTest.phpindex 85073609d..1ef97c93e 100644--- a/api/tests/Feature/Forms/EmailNotificationTest.php+++ b/api/tests/Feature/Forms/EmailNotificationTest.php@@ -3,6 +3,7 @@use App\Notifications\Forms\FormEmailNotification;use Tests\Helpers\FormSubmissionDataFactory;use Illuminate\Notifications\AnonymousNotifiable;+use Illuminate\Support\Facades\Notification;it('send email with the submitted data', function () {$user = $this->actingAsUser();@@ -159,7 +160,7 @@ it('does not use custom sender email in non-self-hosted mode', function () {$notifiable->route('mail', '[email protected]');$renderedMail = $mailable->toMail($notifiable);- expect($renderedMail->from[0])->toBe('[email protected]');+ expect($renderedMail->from[0])->toMatch('/^default\+\d+@example\.com$/');expect($renderedMail->from[1])->toBe('Custom Sender');expect($renderedMail->subject)->toBe('Custom Subject');expect(trim($renderedMail->render()))->toContain('Custom content');@@ -226,3 +227,30 @@ it('send email with empty reply to', function () {$renderedMail = $mailable->toMail($notifiable);expect($renderedMail->replyTo[0][0])->toBe($form->creator->email);});++it('uses exact email address without timestamp in self-hosted mode', function () {+ config(['app.self_hosted' => true]);+ config(['mail.from.address' => '[email protected]']);++ $user = $this->actingAsUser();+ $workspace = $this->createUserWorkspace($user);+ $form = $this->createForm($user, $workspace);+ $integrationData = $this->createFormIntegration('email', $form->id, [+ 'send_to' => '[email protected]',+ 'sender_name' => 'Custom Sender',+ 'subject' => 'Test Subject',+ 'email_content' => 'Test content',+ 'include_submission_data' => true,+ ]);++ $formData = FormSubmissionDataFactory::generateSubmissionData($form);++ $event = new \App\Events\Forms\FormSubmitted($form, $formData);+ $mailable = new FormEmailNotification($event, $integrationData, 'mail');+ $notifiable = new AnonymousNotifiable();+ $notifiable->route('mail', '[email protected]');+ $renderedMail = $mailable->toMail($notifiable);++ // In self-hosted mode, the email should be exactly as configured without timestamp+ expect($renderedMail->from[0])->toBe('[email protected]');+});