kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Applied PHP-CS-Fixer rules

Browse Source
This commit is contained in:
Bernd Bestel
2020-09-01 21:29:47 +02:00
parent 3da8904cba
commit 836bcc82e5
56 changed files with 150 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
middleware/ApiKeyAuthMiddleware.php
View File

@@ -17,7 +17,7 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
$this->ApiKeyHeaderName = $this->AppContainer->get('ApiKeyHeaderName');
}
function authenticate(Request $request)
public function authenticate(Request $request)
{
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
{
@@ -33,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;
@@ -43,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')
@@ -59,21 +59,16 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
{
$validApiKey = true;
}
}
}
if ($validApiKey)
{
return $apiKeyService->GetUserByApiKey($usedApiKey);
}
else
{
return null;
}
}
}

9
middleware/AuthMiddleware.php
View File

@@ -30,9 +30,7 @@ abstract class AuthMiddleware extends BaseMiddleware
{
return $handler->handle($request);
}
else
if ($routeName === 'login')
elseif ($routeName === 'login')
{
define('GROCY_AUTHENTICATED', false);
return $handler->handle($request);
@@ -66,7 +64,6 @@ abstract class AuthMiddleware extends BaseMiddleware
{
return $response->withHeader('Location', $this->AppContainer->get('UrlManager')->ConstructUrl('/login'));
}
}
else
{
@@ -76,9 +73,7 @@ abstract class AuthMiddleware extends BaseMiddleware
return $response = $handler->handle($request);
}
}
}
/**
@@ -86,5 +81,5 @@ abstract class AuthMiddleware extends BaseMiddleware
* @return mixed|null the user row or null if the request is not authenticated
* @throws \Exception Throws an \Exception if config is invalid.
*/
protected abstract function authenticate(Request $request);
abstract protected function authenticate(Request $request);
}

8
middleware/CorsMiddleware.php
View File

@@ -28,14 +28,13 @@ class CorsMiddleware
else
{
$response = $handler->handle($request);
}
//$routeContext = RouteContext::fromRequest($request);
//$routeContext = RouteContext::fromRequest($request);
//$routingResults = $routeContext->getRoutingResults();
//$routingResults = $routeContext->getRoutingResults();
//$methods = $routingResults->getAllowedMethods();
//$methods = $routingResults->getAllowedMethods();
//$requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers');
$response = $response->withHeader('Access-Control-Allow-Origin', '*');
@@ -44,5 +43,4 @@ class CorsMiddleware
return $response;
}
}

1
middleware/DefaultAuthMiddleware.php
View File

@@ -22,5 +22,4 @@ class DefaultAuthMiddleware extends AuthMiddleware
$user = $auth->authenticate($request);
return $user;
}
}

2
middleware/JsonMiddleware.php
View File

@@ -25,7 +25,5 @@ class JsonMiddleware extends BaseMiddleware
return $response;
}
}
}

19
middleware/LocaleMiddleware.php
View File

@@ -28,9 +28,7 @@ class LocaleMiddleware extends BaseMiddleware
{
return $locale;
}
}
}
$langs = implode(',', $request->getHeader('Accept-Language'));
@@ -38,12 +36,13 @@ class LocaleMiddleware extends BaseMiddleware
// src: https://gist.github.com/spolischook/0cde9c6286415cddc088
$prefLocales = array_reduce(
explode(',', $langs),
function ($res, $el)
{
function ($res, $el) {
list($l, $q) = array_merge(explode(';q=', $el), [1]);
$res[$l] = (float) $q;
return $res;
}, []);
},
[]
);
arsort($prefLocales);
$availableLocales = scandir(__DIR__ . '/../localization');
@@ -55,25 +54,23 @@ class LocaleMiddleware extends BaseMiddleware
return $locale;
}
// e.g. en_GB
// e.g. en_GB
if (in_array(substr($locale, 0, 5), $availableLocales))
{
return substr($locale, 0, 5);
}
// e.g: cs
// e.g: cs
// or en
// or en
// or de
// or de
if (in_array(substr($locale, 0, 2), $availableLocales))
{
return substr($locale, 0, 2);
}
}
return GROCY_DEFAULT_LOCALE;
}
}

3
middleware/ReverseProxyAuthMiddleware.php
View File

@@ -8,7 +8,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
class ReverseProxyAuthMiddleware extends AuthMiddleware
{
function authenticate(Request $request)
public function authenticate(Request $request)
{
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
{
@@ -36,5 +36,4 @@ class ReverseProxyAuthMiddleware extends AuthMiddleware
return $user;
}
}

4
middleware/SessionAuthMiddleware.php
View File

@@ -16,7 +16,7 @@ class SessionAuthMiddleware extends AuthMiddleware
$this->SessionCookieName = $this->AppContainer->get('LoginControllerInstance')->GetSessionCookieName();
}
function authenticate(Request $request)
public function authenticate(Request $request)
{
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
{
@@ -33,7 +33,5 @@ class SessionAuthMiddleware extends AuthMiddleware
{
return $sessionService->GetUserBySessionKey($_COOKIE[$this->SessionCookieName]);
}
}
}