Merge branch 'release/2.2.0'

Author: brandonkelly

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes for Webhooks for Craft CMS
 
+## 2.2.0 - 2019-07-29
+
+### Added
+- Webhooks can now specify custom request headers. ([#12](https://github.com/craftcms/webhooks/issues/12))
+
 ## 2.1.0 - 2019-07-26
 
 ### Added

README.md

@@ -132,6 +132,18 @@ class ArticleFilter implements FilterInterface
 }
 ```
 
+#### Sending Custom Headers
+
+You can send custom headers along with webhook requests using the Custom Headers setting.
+
+<img src="./images/custom-headers.png" width="696" height="292" alt="Screenshot of the Custom Headers setting">
+
+Header values can be set to an environment variable using the `$VARIABLE_NAME` syntax, or a Twig template.
+
+An `event` variable will be available to the Twig template, set to the event that triggered the webhook.
+
+You can have multiple headers that have the same name, and if a header value takes up multiple lines (after any empty lines have been discarded), each line will be sent as its own header, all using the same header name.
+
 #### Sending More Data
 
 If you need more data than what’s in the default POST request payload, you can fill in the “Extra User Attributes”, “Extra Sender Attributes”, and “Extra Event Attributes” fields.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/webhooks",
   "description": "Post webhooks when events are triggered in Craft CMS.",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "craft-plugin",
   "keywords": [
     "html",

images/custom-headers.png

@@ -79,7 +79,7 @@ class Plugin extends \craft\base\Plugin
     /**
      * @inheritdoc
      */
-    public $schemaVersion = '2.1.0';
+    public $schemaVersion = '2.2.0';
 
     // Public Methods
     // =========================================================================
@@ -118,10 +118,12 @@ public function init()
                     }
                 }
 
+                $view = Craft::$app->getView();
+
                 if ($webhook->method === 'post') {
                     // Build out the body data
                     if ($webhook->payloadTemplate) {
-                        $json = Craft::$app->getView()->renderString($webhook->payloadTemplate, [
+                        $json = $view->renderString($webhook->payloadTemplate, [
                             'event' => $e,
                         ]);
                         $data = Json::decodeIfJson($json);
@@ -147,15 +149,39 @@ public function init()
                     }
                 }
 
-                // Queue the send request up
+                // Set the headers and body
                 $headers = [];
+
+                foreach ($webhook->headers as $header) {
+                    $header['value'] = Craft::parseEnv($header['value']);
+                    if (strpos($header['value'], '{') !== false) {
+                        $header['value'] = $view->renderString($header['value'], [
+                            'event' => $e,
+                        ]);
+                    }
+                    // Get the trimmed lines
+                    $lines = array_filter(array_map('trim', preg_split('/[\r\n]+/', $header['value'])));
+                    // Add to the header array one-by-one, ensuring that we don't overwrite existing values
+                    foreach ($lines as $line) {
+                        if (!isset($headers[$header['name']])) {
+                            $headers[$header['name']] = $line;
+                        } else {
+                            if (!is_array($headers[$header['name']])) {
+                                $headers[$header['name']] = [$headers[$header['name']]];
+                            }
+                            $headers[$header['name']][] = $line;
+                        }
+                    }
+                }
+
                 if (isset($data) && is_array($data)) {
                     $body = Json::encode($data);
                     $headers['Content-Type'] = 'application/json';
                 } else {
                     $body = $data ?? null;
                 }
 
+                // Queue the send request up
                 $this->request($webhook->method, $webhook->url, $headers, $body, $webhook->id);
             });
         }

src/Plugin.php

@@ -62,6 +62,11 @@ class Webhook extends Model
      */
     public $url;
 
+    /**
+     * @var array
+     */
+    public $headers = [];
+
     /**
      * @var string|null
      */
@@ -149,7 +154,7 @@ function(string $attribute, array $params = null, Validator $validator) {
             ],
             [
                 ['filters'],
-                function(string $attribute) {
+                function() {
                     foreach ($this->filters as $class => &$value) {
                         if ($value === 'yes') {
                             $value = true;
@@ -162,6 +167,12 @@ function(string $attribute) {
                     }
                 }
             ],
+            [
+                ['headers'],
+                function() {
+                    $this->headers = $this->headers ? array_values($this->headers) : [];
+                }
+            ],
             [['userAttributes', 'senderAttributes'], 'validateAttributeList'],
             [['eventAttributes'], 'validateAttributeList', 'params' => ['regex' => '/^[a-z]\w*\.[a-z]\w*(?:\.[a-z]\w*)*$/i']],
             [['payloadTemplate'], 'validatePayloadTemplate'],

src/Webhook.php

@@ -197,9 +197,10 @@ public function saveWebhook(Webhook $webhook, bool $runValidation = true): bool
             'name' => $name,
             'class' => $webhook->class,
             'event' => $webhook->event,
-            'filters' => Json::encode($webhook->filters),
+            'filters' => $webhook->filters ? Json::encode($webhook->filters) : null,
             'method' => $webhook->method,
             'url' => $webhook->url,
+            'headers' => $webhook->headers ? Json::encode($webhook->headers) : null,
             'userAttributes' => $webhook->userAttributes,
             'senderAttributes' => $webhook->senderAttributes,
             'eventAttributes' => $webhook->eventAttributes,
@@ -238,7 +239,22 @@ public function deleteWebhookById(int $id)
     private function _createWebhookQuery(): Query
     {
         return (new Query())
-            ->select(['id', 'groupId', 'enabled', 'name', 'class', 'event', 'filters', 'method', 'url', 'userAttributes', 'senderAttributes', 'eventAttributes', 'payloadTemplate'])
+            ->select([
+                'id',
+                'groupId',
+                'enabled',
+                'name',
+                'class',
+                'event',
+                'filters',
+                'method',
+                'url',
+                'headers',
+                'userAttributes',
+                'senderAttributes',
+                'eventAttributes',
+                'payloadTemplate',
+            ])
             ->from(['{{%webhooks}}']);
     }
 
@@ -259,6 +275,12 @@ private function _createWebhook(array $result, bool $isMysql = null): Webhook
             $result['filters'] = [];
         }
 
+        if ($result['headers']) {
+            $result['headers'] = Json::decode($result['headers']);
+        } else {
+            $result['headers'] = [];
+        }
+
         return new Webhook($result);
     }
 

src/WebhookManager.php

@@ -3,6 +3,10 @@
     display: inline-block;
 }
 
+#filter-pane {
+    position: relative;
+}
+
 #no-filters {
     margin: 0;
 }
@@ -41,3 +45,16 @@
 #filters .filter-ignore .status {
     margin: 0;
 }
+
+#filter-spinner {
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(255,255,255,0.85);
+    z-index: 1;
+}

src/assets/edit/dist/css/edit-webhook.css

@@ -64,8 +64,6 @@
                     return;
                 }
                 this.$filterSpinner.removeClass('hidden');
-                this.$noFiltersMessage.addClass('hidden');
-                this.$filtersTable.addClass('hidden');
                 Craft.postActionRequest('webhooks/webhooks/filters', {
                     senderClass: this.classVal,
                     event: this.eventVal,
@@ -74,12 +72,14 @@
                     if (textStatus === 'success') {
                         this.resetFilters();
                         if (response.filters.length) {
+                            this.$noFiltersMessage.addClass('hidden');
                             this.$filtersTable.removeClass('hidden');
                             for (var i = 0; i < response.filters.length; i++) {
                                 this.filters[response.filters[i]].$tr.removeClass('hidden');
                             }
                         } else {
                             this.$noFiltersMessage.removeClass('hidden');
+                            this.$filtersTable.addClass('hidden');
                         }
                     }
                 }.bind(this));

src/assets/edit/dist/js/EditWebhook.js

@@ -36,6 +36,7 @@ public function safeUp()
             'filters' => $this->text(),
             'method' => $this->string(10)->notNull(),
             'url' => $this->string()->notNull(),
+            'headers' => $this->text(),
             'userAttributes' => $this->text(),
             'senderAttributes' => $this->text(),
             'eventAttributes' => $this->text(),