From 9ac3cc23f71f9ffd4649fa87b07d1396d057e870 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 2 Jul 2020 12:36:33 +0300 Subject: [PATCH] dev --- application/Espo/Core/Application.php | 1 + application/Espo/Core/Utils/Api/Auth.php | 2 +- application/Espo/Core/Utils/Api/RequestWrapper.php | 5 +++++ application/Espo/Core/Utils/Api/ResponseWrapper.php | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/application/Espo/Core/Application.php b/application/Espo/Core/Application.php index 9ca8aa4a64..7ae20d34dc 100644 --- a/application/Espo/Core/Application.php +++ b/application/Espo/Core/Application.php @@ -420,6 +420,7 @@ class Application $conditions = $route['conditions'] ?? []; if (($conditions['auth'] ?? true) === false) { $authRequired = false; + } $auth = $this->createAuth($request); diff --git a/application/Espo/Core/Utils/Api/Auth.php b/application/Espo/Core/Utils/Api/Auth.php index 762c903556..407673cc94 100644 --- a/application/Espo/Core/Utils/Api/Auth.php +++ b/application/Espo/Core/Utils/Api/Auth.php @@ -58,7 +58,7 @@ class Auth protected function resolve() { - $this->resolved = true; + $this->isResolved = true; } protected function resolveUseNoAuth() diff --git a/application/Espo/Core/Utils/Api/RequestWrapper.php b/application/Espo/Core/Utils/Api/RequestWrapper.php index 0081b7f458..91d1bd95f6 100644 --- a/application/Espo/Core/Utils/Api/RequestWrapper.php +++ b/application/Espo/Core/Utils/Api/RequestWrapper.php @@ -53,4 +53,9 @@ class RequestWrapper return $this->request->getHeaderLine($name); } + + public function getMethod() + { + return $this->request->getMethod(); + } } diff --git a/application/Espo/Core/Utils/Api/ResponseWrapper.php b/application/Espo/Core/Utils/Api/ResponseWrapper.php index 44e9c41840..e5541d1d84 100644 --- a/application/Espo/Core/Utils/Api/ResponseWrapper.php +++ b/application/Espo/Core/Utils/Api/ResponseWrapper.php @@ -37,7 +37,7 @@ class ResponseWrapper { protected $response; - public function __construct(Request $response) + public function __construct(Response $response) { $this->response = $response; }