Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor lib/Router to use with container for endpoints

Browse Source 
[MAILPOET-1605]
This commit is contained in:
Rostislav Wolny
2018-10-17 17:39:32 +02:00
parent 71ad9f50cb
commit fff8176a49
14 changed files with 132 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Router/Router.php
View File

@@ -3,6 +3,7 @@
namespace MailPoet\Router;
use MailPoet\Config\AccessControl;
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
use MailPoet\Util\Helpers;
if(!defined('ABSPATH')) exit;
@@ -12,11 +13,13 @@ class Router {
public $endpoint;
public $action;
public $data;
/** @var Container */
private $container;
const NAME = 'mailpoet_router';
const RESPONSE_ERROR = 404;
const RESPONE_FORBIDDEN = 403;
function __construct(AccessControl $access_control, $api_data = false) {
function __construct(AccessControl $access_control, Container $container, $api_data = false) {
$api_data = ($api_data) ? $api_data : $_GET;
$this->api_request = isset($api_data[self::NAME]);
$this->endpoint = isset($api_data['endpoint']) ?
@@ -29,15 +32,19 @@ class Router {
self::decodeRequestData($api_data['data']) :
array();
$this->access_control = $access_control;
$this->container = $container;
}
function init() {
$endpoint_class = __NAMESPACE__ . "\\Endpoints\\" . ucfirst($this->endpoint);
if(!$this->api_request) return;
$endpoint_class = __NAMESPACE__ . "\\Endpoints\\" . ucfirst($this->endpoint);
if(!$this->endpoint || !class_exists($endpoint_class)) {
return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint', 'mailpoet'));
}
$endpoint = new $endpoint_class($this->data, $this->access_control);
$endpoint = $this->container->get($endpoint_class);
if(!method_exists($endpoint, $this->endpoint_action) || !in_array($this->endpoint_action, $endpoint->allowed_actions)) {
return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint action', 'mailpoet'));
}
@@ -46,10 +53,11 @@ class Router {
}
do_action('mailpoet_conflict_resolver_router_url_query_parameters');
return call_user_func(
array(
[
$endpoint,
$this->endpoint_action
)
$this->endpoint_action,
],
$this->data
);
}
@@ -88,4 +96,4 @@ class Router {
$this->access_control->validatePermission($permissions['actions'][$endpoint_action]) :
$this->access_control->validatePermission($permissions['global']);
}
}
}