kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-11-30 18:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Applied PHP formatting rules

Browse Source
This commit is contained in:
Bernd Bestel
2020-08-31 20:40:31 +02:00
parent 33325d5560
commit d4c5da2173
58 changed files with 3667 additions and 3082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
middleware/ApiKeyAuthMiddleware.php
View File

@@ -2,22 +2,21 @@
namespace Grocy\Middleware;
use Grocy\Services\ApiKeyService;
use Psr\Http\Message\ResponseFactoryInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Slim\Routing\RouteContext;
use Grocy\Services\ApiKeyService;
class ApiKeyAuthMiddleware extends AuthMiddleware
{
protected $ApiKeyHeaderName;
public function __construct(\DI\Container $container, ResponseFactoryInterface $responseFactory)
{
parent::__construct($container, $responseFactory);
$this->ApiKeyHeaderName = $this->AppContainer->get('ApiKeyHeaderName');
}
protected $ApiKeyHeaderName;
function authenticate(Request $request)
{
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
@@ -34,7 +33,7 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
$apiKeyService = new ApiKeyService();
// First check of the API key in the configured header
// First check of the API key in the configured header
if (!$request->hasHeader($this->ApiKeyHeaderName) || !$apiKeyService->IsValidApiKey($request->getHeaderLine($this->ApiKeyHeaderName)))
{
$validApiKey = false;
@@ -44,14 +43,14 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
$usedApiKey = $request->getHeaderLine($this->ApiKeyHeaderName);
}
// Not recommended, but it's also possible to provide the API key via a query parameter (same name as the configured header)
// Not recommended, but it's also possible to provide the API key via a query parameter (same name as the configured header)
if (!$validApiKey && !empty($request->getQueryParam($this->ApiKeyHeaderName)) && $apiKeyService->IsValidApiKey($request->getQueryParam($this->ApiKeyHeaderName)))
{
$validApiKey = true;
$usedApiKey = $request->getQueryParam($this->ApiKeyHeaderName);
}
// Handling of special purpose API keys
// Handling of special purpose API keys
if (!$validApiKey)
{
if ($routeName === 'calendar-ical')
@@ -60,7 +59,9 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
{
$validApiKey = true;
}
}
}
if ($validApiKey)
@@ -72,5 +73,7 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
{
return null;
}
}
}