Merge branch 'master' into gemmel/numeric-conversion-fix

Author: MartinBeranek

CHANGELOG.md

@@ -4,10 +4,13 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
-## 3.4.1
+## 3.4.2
+### Fixed
+* Input validation before authorization check in ApiPresenter (causes issues with some authorization handlers that need to check input params)
 
+## 3.4.1
 ### Fixed
-- Don't overwrite global preflight handler if it is set and enableGlobalPreflight is called without parameter
+* Don't overwrite global preflight handler if it is set and enableGlobalPreflight is called without parameter
 
 ## 3.4.0
 

src/Component/ApiConsoleControl.php

@@ -104,7 +104,7 @@ public function formSucceeded(Form $form, ArrayHash $values): void
         $template = $this->getTemplate();
         $template->add('response', $result);
 
-        if ($this->getPresenter()?->isAjax()) {
+        if ($this->getPresenter()->isAjax()) {
             $this->getPresenter()->redrawControl();
         }
     }

src/Handlers/OpenApiHandler.php

@@ -342,7 +342,6 @@ private function getPaths(array $versionApis, string $baseUrl, string $basePath)
                             } else {
                                 foreach ($examples as $exampleKey => $example) {
                                     $example = is_array($example) ? $example : json_decode($example, true);
-                                    /** @phpstan-ignore-next-line */
                                     $responses[$output->getCode()]['content']['application/json; charset=utf-8']['examples'][$exampleKey] = $example;
                                 }
                             }

src/Presenters/ApiPresenter.php

@@ -85,19 +85,19 @@ public function run(Request $request): IResponse
         }
 
         $paramsProcessor = new ParamsProcessor($handler->params());
-        if ($paramsProcessor->isError()) {
-            $response = $this->errorHandler->handleInputParams($paramsProcessor->getErrors());
-            $this->response->setCode($response->getCode());
-            return $response;
-        }
-
-        $params = $paramsProcessor->getValues();
+        $params = $paramsProcessor->isError() ? [] : $paramsProcessor->getValues();
 
         $authResponse = $this->checkAuth($authorization, $params);
         if ($authResponse !== null) {
             return $authResponse;
         }
 
+        if ($paramsProcessor->isError()) {
+            $response = $this->errorHandler->handleInputParams($paramsProcessor->getErrors());
+            $this->response->setCode($response->getCode());
+            return $response;
+        }
+
         try {
             $response = $handler->handle($params);
             $code = $response->getCode();
@@ -145,7 +145,7 @@ private function getApi(Request $request): Api
             $request->getMethod() ?? '',
             $request->getParameter('version'),
             $request->getParameter('package'),
-            $request->getParameter('apiAction')
+            $request->getParameter('apiAction'),
         );
     }
 
@@ -216,10 +216,10 @@ private function logRequest(Request $request, ApiLoggerInterface $logger, int $c
             $code,
             $request->getMethod() ?? '',
             $requestHeaders,
-            (string) filter_input(INPUT_SERVER, 'REQUEST_URI'),
+            (string)filter_input(INPUT_SERVER, 'REQUEST_URI'),
             $ipDetector->getRequestIp(),
-            (string) filter_input(INPUT_SERVER, 'HTTP_USER_AGENT'),
-            (int) ($elapsed * self::TO_SECONDS)
+            (string)filter_input(INPUT_SERVER, 'HTTP_USER_AGENT'),
+            (int)($elapsed * self::TO_SECONDS),
         );
     }