Merge pull request #6494 from kuzmany/webhook-support-tokens-in-url

Added support for contact tokens for url in Send a webhook campaign action
mautic · Aug 14, 2020 · 3cef551 · 3cef551
2 parents bf7ea02 + 2ea0ac2
commit 3cef551
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/app/bundles/WebhookBundle/Form/Type/CampaignEventSendWebhookType.php b/app/bundles/WebhookBundle/Form/Type/CampaignEventSendWebhookType.php
@@ -19,7 +19,6 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\Url;
 
 /**
  * Class CampaignEventRemoteUrlType.
@@ -50,11 +49,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'        => ['class' => 'form-control'],
                 'required'    => true,
                 'constraints' => [
-                    new Url(
-                        [
-                            'message' => 'mautic.form.submission.url.invalid',
-                        ]
-                    ),
                     new NotBlank(
                         [
                             'message' => 'mautic.core.value.required',

diff --git a/app/bundles/WebhookBundle/Helper/CampaignHelper.php b/app/bundles/WebhookBundle/Helper/CampaignHelper.php
@@ -44,7 +44,8 @@ public function fireWebhook(array $config, Lead $contact)
         // dump($config);die;
         $payload = $this->getPayload($config, $contact);
         $headers = $this->getHeaders($config, $contact);
-        $this->makeRequest($config['url'], $config['method'], $config['timeout'], $headers, $payload);
+        $url     = rawurldecode(TokenHelper::findLeadTokens($config['url'], $this->getContactValues($contact), true));
+        $this->makeRequest($url, $config['method'], $config['timeout'], $headers, $payload);
     }
 
     /**