Add middleware to auto-detect basePath

application/front/ShaarliErrorHandler.php

@@ -12,6 +12,7 @@
 use Shaarli\Front\Controller\PageTrait;
 use Shaarli\Front\Exception\ShaarliFrontException;
 use Shaarli\Render\TemplatePage;
+use Slim\App;
 use Slim\Exception\HttpNotFoundException;
 use Slim\Handlers\ErrorHandler;
 use Slim\Interfaces\CallableResolverInterface;
@@ -23,15 +24,17 @@ class ShaarliErrorHandler extends ErrorHandler
 {
     use PageTrait;
 
+    private App $app;
+
     private ?Container $container;
 
     public function __construct(
-        CallableResolverInterface $callableResolver,
-        ResponseFactoryInterface $responseFactory,
+        App $app,
         ?LoggerInterface $logger = null,
-        ?Container $container = null
+        ?Container $container = null,
     ) {
-        parent::__construct($callableResolver, $responseFactory, $logger);
+        parent::__construct($app->getCallableResolver(), $app->getResponseFactory(), $logger);
+        $this->app = $app;
         $this->container = $container;
     }
 
@@ -84,10 +87,9 @@ protected function showError404($request): ResponseInterface
         if (false !== strpos($request->getRequestTarget(), '/api/v1')) {
             return $response->withStatus(404);
         }
-        $basePathFromRequest = $request->getAttribute(RouteContext::BASE_PATH) ?? '';
 
-        // This is required because the middleware is ignored if the route is not found.
-        $this->container->set('basePath', rtrim($basePathFromRequest, '/'));
+        // This is required because the request handler throw the error before setting the base path.
+        $this->container->set('basePath', rtrim($this->app->getBasePath(), '/'));
 
         $this->assignView('error_message', t('Requested page could not be found.'));
 

application/front/ShaarliMiddleware.php

@@ -113,7 +113,7 @@ protected function checkOpenShaarli(Request $request, RequestHandler $handler):
     protected function initBasePath(Request $request): void
     {
         if (null === $this->container->get('basePath')) {
-            $this->container->set('basePath', rtrim($request->getAttribute('basePath'), '/'));
+            $this->container->set('basePath', rtrim($request->getAttribute(RouteContext::BASE_PATH), '/'));
         }
     }
 

composer.json

@@ -27,6 +27,7 @@
         "malkusch/lock": "^2.1",
         "php-di/php-di": "^6.4",
         "pubsubhubbub/publisher": "dev-master",
+        "selective/basepath": "^2.1",
         "shaarli/netscape-bookmark-parser": "^4.0",
         "slim/psr7": "^1.6",
         "slim/slim": "4.*"

index.php

@@ -28,6 +28,7 @@
 
 use Katzgrau\KLogger\Logger;
 use Psr\Log\LogLevel;
+use Selective\BasePath\BasePathMiddleware;
 use Shaarli\Api\Controllers as ApiControllers;
 use Shaarli\Config\ConfigManager;
 use Shaarli\Container\ContainerBuilder;
@@ -108,6 +109,7 @@
 $container = $containerBuilder->build();
 AppFactory::setContainer($container);
 $app = AppFactory::create();
+$app->add(new BasePathMiddleware($app));
 
 // Main Shaarli routes
 $app->group('', function (RouteCollectorProxy $group) {
@@ -202,7 +204,7 @@
 
 $errorMiddleware = $app->addErrorMiddleware($displayErrorDetails, true, true);
 $errorMiddleware->setDefaultErrorHandler(
-    new ShaarliErrorHandler($app->getCallableResolver(), $app->getResponseFactory(), $logger, $container)
+    new ShaarliErrorHandler($app, $logger, $container)
 );