From fe4329d730d2cf6310ecf4665f3a906905e6538b Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Mon, 5 Sep 2022 20:56:49 +0200
Subject: [PATCH] Allowed trailing slashes support to be enabled for the short
 URLs route

---
 config/autoload/routes.config.php  | 6 +++++-
 module/Core/src/Config/EnvVars.php | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/autoload/routes.config.php b/config/autoload/routes.config.php
index 298b9349..b36c4b78 100644
--- a/config/autoload/routes.config.php
+++ b/config/autoload/routes.config.php
@@ -7,15 +7,19 @@ namespace Shlinkio\Shlink;
 use Fig\Http\Message\RequestMethodInterface;
 use RKA\Middleware\IpAddress;
 use Shlinkio\Shlink\Core\Action as CoreAction;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Shlinkio\Shlink\Rest\Action;
 use Shlinkio\Shlink\Rest\ConfigProvider;
 use Shlinkio\Shlink\Rest\Middleware;
 use Shlinkio\Shlink\Rest\Middleware\Mercure\NotConfiguredMercureErrorHandler;
 
+use function sprintf;
+
 return (static function (): array {
     $contentNegotiationMiddleware = Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware::class;
     $dropDomainMiddleware = Middleware\ShortUrl\DropDefaultDomainFromRequestMiddleware::class;
     $overrideDomainMiddleware = Middleware\ShortUrl\OverrideDomainMiddleware::class;
+    $shortUrlRouteSuffix = EnvVars::SHORT_URL_TRAILING_SLASH->loadFromEnv(false) ? '[/]' : '';
 
     return [
 
@@ -90,7 +94,7 @@ return (static function (): array {
             ],
             [
                 'name' => CoreAction\RedirectAction::class,
-                'path' => '/{shortCode}',
+                'path' => sprintf('/{shortCode}%s', $shortUrlRouteSuffix),
                 'middleware' => [
                     IpAddress::class,
                     CoreAction\RedirectAction::class,
diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php
index ae93e4da..7cbd0af4 100644
--- a/module/Core/src/Config/EnvVars.php
+++ b/module/Core/src/Config/EnvVars.php
@@ -43,6 +43,7 @@ enum EnvVars: string
     case REDIRECT_STATUS_CODE = 'REDIRECT_STATUS_CODE';
     case REDIRECT_CACHE_LIFETIME = 'REDIRECT_CACHE_LIFETIME';
     case BASE_PATH = 'BASE_PATH';
+    case SHORT_URL_TRAILING_SLASH = 'SHORT_URL_TRAILING_SLASH';
     case PORT = 'PORT';
     case TASK_WORKER_NUM = 'TASK_WORKER_NUM';
     case WEB_WORKER_NUM = 'WEB_WORKER_NUM';