dev

application/Espo/Core/Api/Response.php

@@ -46,6 +46,16 @@ interface Response
      */
     public function setHeader(string $name, string $value);
 
+    /**
+     * Get a header value.
+     */
+    public function getHeader(string $name) : ?string;
+
+    /**
+     * Whether a header is set.
+     */
+    public function hasHeader(string $name) : bool;
+
     /**
      * Write a body.
      */

application/Espo/Core/Api/ResponseWrapper.php

@@ -55,6 +55,18 @@ class ResponseWrapper implements ApiResponse
         $this->response = $this->response->withHeader($name, $value);
     }
 
+    public function getHeader(string $name) : ?string
+    {
+        if (!$this->response->hasHeader($name)) return null;
+
+        return $this->response->getHeaderLine($name);
+    }
+
+    public function hasHeader(string $name) : bool
+    {
+        return $this->response->hasHeader($name);
+    }
+
     public function getResponse() : Psr7Response
     {
         return $this->response;

application/Espo/Core/Api/RouteProcessor.php

@@ -0,0 +1,112 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Api;
+
+use Espo\Core\{
+    Api\Request,
+    Api\Response,
+    Utils\Config,
+    ControllerManager,
+};
+
+class RouteProcessor
+{
+    protected $config;
+    protected $controllerManager;
+
+    public function __construct(Config $config, ControllerManager $controllerManager)
+    {
+        $this->config = $config;
+        $this->controllerManager = $controllerManager;
+    }
+
+    public function process(string $route, array $routeParams, RequestWrapper $request, ResponseWrapper $response, array $args)
+    {
+        $response->setHeader('Content-Type', 'application/json');
+
+        $data = $request->getBodyContents();
+
+        $params = [];
+
+        $paramKeys = array_keys($routeParams);
+
+        $setKeyList = [];
+
+        foreach ($paramKeys as $key) {
+            $value = $routeParams[$key];
+
+            $paramName = $key;
+            if ($value[0] === ':') {
+                $realKey = substr($value, 1);
+                $params[$paramName] = $args[$realKey];
+                $setKeyList[] = $realKey;
+            } else {
+                $params[$paramName] = $value;
+            }
+        }
+
+        foreach ($args as $key => $value) {
+            if (in_array($key, $setKeyList)) continue;
+            $params[$key] = $value;
+        }
+
+        $controllerName = $params['controller'] ?? null;
+        $actionName = $params['action'] ?? null;
+
+        if (!$controllerName) {
+            throw new Error("Route '{$route}' doesn't have a controller.");
+        }
+
+        $controllerName = ucfirst($controllerName);
+
+        if (!$actionName) {
+            $httpMethod = strtolower($request->getMethod());
+            $crudList = $this->config->get('crud') ?? [];
+            $actionName = $crudList[$httpMethod] ?? null;
+            if (!$actionName) {
+                throw new Error("No action for method {$httpMethod}.");
+            }
+        }
+
+        unset($params['controller']);
+        unset($params['action']);
+
+        $contents = $this->controllerManager->process($controllerName, $actionName, $params, $data, $request, $response);
+
+        if (is_string($contents)) {
+            $response->writeBody($contents);
+        }
+
+        $response->setHeader('Expires', '0');
+        $response->setHeader('Last-Modified', gmdate("D, d M Y H:i:s") . " GMT");
+        $response->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
+        $response->setHeader('Pragma', 'no-cache');
+    }
+}

application/Espo/Core/Application.php

@@ -41,6 +41,7 @@ use Espo\Core\{
     Api\ErrorOutput as ApiErrorOutput,
     Api\RequestWrapper,
     Api\ResponseWrapper,
+    Api\RouteProcessor,
     Utils\Auth,
     Utils\Route,
     Utils\Autoload,
@@ -122,18 +123,9 @@ class Application
                     $responseWrapped = new ResponseWrapper($response);
 
                     try {
-                        /*$authRequired = true;
-
-                        $conditions = $item['conditions'] ?? [];
-                        if (($conditions['auth'] ?? true) === false) {
-                            $authRequired = false;
-                        }*/
-
                         $authRequired = !($item['noAuth'] ?? false);
 
-                        $auth = $this->createAuth($requestWrapped);
-                        $apiAuth = new ApiAuth($auth, $authRequired);
-
+                        $apiAuth = new ApiAuth($this->createAuth($requestWrapped), $authRequired);
                         $apiAuth->process($requestWrapped, $responseWrapped);
 
                         if (!$apiAuth->isResolved()) {
@@ -143,7 +135,8 @@ class Application
                             $this->setupSystemUser();
                         }
 
-                        $this->processRoute($item, $requestWrapped, $responseWrapped, $args);
+                        $routeProcessor = $this->getInjectableFactory()->create(RouteProcessor::class);
+                        $routeProcessor->process($item['route'], $item['params'], $requestWrapped, $responseWrapped, $args);
                     } catch (\Exception $exception) {
                         (new ApiErrorOutput($requestWrapped))->process(
                             $responseWrapped, $exception, false, $item, $args
@@ -390,66 +383,6 @@ class Application
         ]);
     }
 
-    protected function processRoute(array $route, RequestWrapper $request, ResponseWrapper $response, array $args)
-    {
-        $response->setHeader('Content-Type', 'application/json');
-
-        $data = $request->getBodyContents();
-
-        $params = [];
-
-        $paramKeys = array_keys($route['params']);
-
-        $setKeyList = [];
-
-        foreach ($paramKeys as $key) {
-            $value = $route['params'][$key];
-
-            $paramName = $key;
-            if ($value[0] === ':') {
-                $realKey = substr($value, 1);
-                $params[$paramName] = $args[$realKey];
-                $setKeyList[] = $realKey;
-            } else {
-                $params[$paramName] = $value;
-            }
-        }
-
-        foreach ($args as $key => $value) {
-            if (in_array($key, $setKeyList)) continue;
-            $params[$key] = $value;
-        }
-
-        $controllerName = $params['controller'] ?? null;
-        $actionName = $params['action'] ?? null;
-
-        if (!$controllerName) {
-            throw new Error("Route ".$route['route']." doesn't have a controller.");
-        }
-
-        $controllerName = ucfirst($controllerName);
-
-        if (!$actionName) {
-            $httpMethod = strtolower($request->getMethod());
-            $crudList = $this->getConfig()->get('crud') ?? [];
-            $actionName = $crudList[$httpMethod] ?? null;
-            if (!$actionName) {
-                throw new Error("No action for method {$httpMethod}.");
-            }
-        }
-
-        unset($params['controller']);
-        unset($params['action']);
-
-        $controllerManager = $this->container->get('controllerManager');
-
-        $contents = $controllerManager->process($controllerName, $actionName, $params, $data, $request, $response);
-
-        if (is_string($contents)) {
-            $response->writeBody($contents);
-        }
-    }
-
     protected function initAutoloads()
     {
         $autoload = $this->getInjectableFactory()->create(Autoload::class);