1 files changed, 13 insertions, 128 deletions
diff --git a/app/Model/Webhook.php b/app/Model/Webhook.php
index b84728cf..e3af37f7 100644
--- a/app/Model/Webhook.php
+++ b/app/Model/Webhook.php
@@ -2,8 +2,6 @@
 
 namespace Model;
 
-use Event\WebhookListener;
-
 /**
  * Webhook model
  *
@@ -13,139 +11,26 @@ use Event\WebhookListener;
 class Webhook extends Base
 {
     /**
-     * HTTP connection timeout in seconds
-     *
-     * @var integer
-     */
-    const HTTP_TIMEOUT = 1;
-
-    /**
-     * Number of maximum redirections for the HTTP client
-     *
-     * @var integer
-     */
-    const HTTP_MAX_REDIRECTS = 3;
-
-    /**
-     * HTTP client user agent
-     *
-     * @var string
-     */
-    const HTTP_USER_AGENT = 'Kanboard Webhook';
-
-    /**
-     * URL to call for task creation
-     *
-     * @access private
-     * @var string
-     */
-    private $url_task_creation = '';
-
-    /**
-     * URL to call for task modification
-     *
-     * @access private
-     * @var string
-     */
-    private $url_task_modification = '';
-
-    /**
-     * Webook token
-     *
-     * @access private
-     * @var string
-     */
-    private $token = '';
-
-    /**
-     * Attach events
-     *
-     * @access public
-     */
-    public function attachEvents()
-    {
-        $this->url_task_creation = $this->config->get('webhook_url_task_creation');
-        $this->url_task_modification = $this->config->get('webhook_url_task_modification');
-        $this->token = $this->config->get('webhook_token');
-
-        if ($this->url_task_creation) {
-            $this->attachCreateEvents();
-        }
-
-        if ($this->url_task_modification) {
-            $this->attachUpdateEvents();
-        }
-    }
-
-    /**
-     * Attach events for task modification
-     *
-     * @access public
-     */
-    public function attachUpdateEvents()
-    {
-        $events = array(
-            Task::EVENT_UPDATE,
-            Task::EVENT_CLOSE,
-            Task::EVENT_OPEN,
-            Task::EVENT_MOVE_COLUMN,
-            Task::EVENT_MOVE_POSITION,
-            Task::EVENT_ASSIGNEE_CHANGE,
-        );
-
-        $listener = new WebhookListener($this->registry);
-        $listener->setUrl($this->url_task_modification);
-
-        foreach ($events as $event_name) {
-            $this->event->attach($event_name, $listener);
-        }
-    }
-
-    /**
-     * Attach events for task creation
-     *
-     * @access public
-     */
-    public function attachCreateEvents()
-    {
-        $listener = new WebhookListener($this->registry);
-        $listener->setUrl($this->url_task_creation);
-
-        $this->event->attach(Task::EVENT_CREATE, $listener);
-    }
-
-    /**
      * Call the external URL
      *
      * @access public
-     * @param  string   $url    URL to call
-     * @param  array    $task   Task data
+     * @param  array    $values   Event payload
      */
-    public function notify($url, array $task)
+    public function notify(array $values)
     {
-        $headers = array(
-            'Connection: close',
-            'User-Agent: '.self::HTTP_USER_AGENT,
-        );
+        $url = $this->config->get('webhook_url');
+        $token = $this->config->get('webhook_token');
 
-        $context = stream_context_create(array(
-            'http' => array(
-                'method' => 'POST',
-                'protocol_version' => 1.1,
-                'timeout' => self::HTTP_TIMEOUT,
-                'max_redirects' => self::HTTP_MAX_REDIRECTS,
-                'header' => implode("\r\n", $headers),
-                'content' => json_encode($task)
-            )
-        ));
+        if (! empty($url)) {
 
-        if (strpos($url, '?') !== false) {
-            $url .= '&token='.$this->token;
-        }
-        else {
-            $url .= '?token='.$this->token;
-        }
+            if (strpos($url, '?') !== false) {
+                $url .= '&token='.$token;
+            }
+            else {
+                $url .= '?token='.$token;
+            }
 
-        @file_get_contents($url, false, $context);
+            return $this->httpClient->postJson($url, $values);
+        }
     }
 }