Refactored Rest ConfigProvider so that it appends the health action with and without version

This commit is contained in:
Alejandro Celaya
2020-01-07 18:07:51 +01:00
parent 36d5e057d0
commit 2b544ad141
2 changed files with 61 additions and 26 deletions

View File

@@ -6,6 +6,8 @@ namespace Shlinkio\Shlink\Rest;
use Closure;
use function Functional\first;
use function Functional\map;
use function Shlinkio\Shlink\Common\loadConfigFromGlob;
use function sprintf;
@@ -30,21 +32,33 @@ class ConfigProvider
private function applyRoutesPrefix(array $config): array
{
$routes =& $config['routes'] ?? [];
$routes = $config['routes'] ?? [];
$healthRoute = $this->buildUnversionedHealthRouteFromExistingRoutes($routes);
// Prepend the routes prefix to every path
foreach ($routes as $key => $route) {
$prefixRoute = static function (array $route) {
['path' => $path] = $route;
$routes[$key]['path'] = sprintf('%s%s', self::ROUTES_PREFIX, $path);
$route['path'] = sprintf('%s%s', self::ROUTES_PREFIX, $path);
// Also append the health route so that it works without version
if ($path === '/health') {
$route['path'] = sprintf('%s%s', self::UNVERSIONED_ROUTES_PREFIX, $path);
$route['name'] = self::UNVERSIONED_HEALTH_ENDPOINT_NAME;
$routes[] = $route;
}
}
return $route;
};
$prefixedRoutes = map($routes, $prefixRoute);
$config['routes'] = $healthRoute !== null ? [...$prefixedRoutes, $healthRoute] : $prefixedRoutes;
return $config;
}
private function buildUnversionedHealthRouteFromExistingRoutes(array $routes): ?array
{
$healthRoute = first($routes, fn (array $route) => $route['path'] === '/health');
if ($healthRoute === null) {
return null;
}
$path = $healthRoute['path'];
$healthRoute['path'] = sprintf('%s%s', self::UNVERSIONED_ROUTES_PREFIX, $path);
$healthRoute['name'] = self::UNVERSIONED_HEALTH_ENDPOINT_NAME;
return $healthRoute;
}
}