From cd5bbcd60a638425b3d173b60513684f06be6093 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Thu, 21 Jul 2016 16:59:27 +0200
Subject: [PATCH] Reused middleware to check Accept-Language header on any HTTP
 related middleware

---
 .../Common/config/middleware-pipeline.config.php   | 14 ++++++++++++++
 module/Common/config/services.config.php           |  2 ++
 .../src/Middleware/LocaleMiddleware.php            |  2 +-
 module/Rest/config/middleware-pipeline.config.php  |  1 -
 module/Rest/config/services.config.php             |  1 -
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 module/Common/config/middleware-pipeline.config.php
 rename module/{Rest => Common}/src/Middleware/LocaleMiddleware.php (98%)

diff --git a/module/Common/config/middleware-pipeline.config.php b/module/Common/config/middleware-pipeline.config.php
new file mode 100644
index 00000000..361621c6
--- /dev/null
+++ b/module/Common/config/middleware-pipeline.config.php
@@ -0,0 +1,14 @@
+<?php
+use Shlinkio\Shlink\Common\Middleware;
+
+return [
+
+    'middleware_pipeline' => [
+        'pre-routing' => [
+            'middleware' => [
+                Middleware\LocaleMiddleware::class,
+            ],
+            'priority' => 5,
+        ],
+    ],
+];
diff --git a/module/Common/config/services.config.php b/module/Common/config/services.config.php
index 1423b543..42d9dbc5 100644
--- a/module/Common/config/services.config.php
+++ b/module/Common/config/services.config.php
@@ -5,6 +5,7 @@ use Doctrine\ORM\EntityManager;
 use Shlinkio\Shlink\Common\Factory\CacheFactory;
 use Shlinkio\Shlink\Common\Factory\EntityManagerFactory;
 use Shlinkio\Shlink\Common\Factory\TranslatorFactory;
+use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
 use Shlinkio\Shlink\Common\Service\IpLocationResolver;
 use Shlinkio\Shlink\Common\Twig\Extension\TranslatorExtension;
 use Zend\I18n\Translator\Translator;
@@ -20,6 +21,7 @@ return [
             IpLocationResolver::class => AnnotatedFactory::class,
             Translator::class => TranslatorFactory::class,
             TranslatorExtension::class => AnnotatedFactory::class,
+            LocaleMiddleware::class => AnnotatedFactory::class,
         ],
         'aliases' => [
             'em' => EntityManager::class,
diff --git a/module/Rest/src/Middleware/LocaleMiddleware.php b/module/Common/src/Middleware/LocaleMiddleware.php
similarity index 98%
rename from module/Rest/src/Middleware/LocaleMiddleware.php
rename to module/Common/src/Middleware/LocaleMiddleware.php
index f3a4ddde..20f796ff 100644
--- a/module/Rest/src/Middleware/LocaleMiddleware.php
+++ b/module/Common/src/Middleware/LocaleMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Rest\Middleware;
+namespace Shlinkio\Shlink\Common\Middleware;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
diff --git a/module/Rest/config/middleware-pipeline.config.php b/module/Rest/config/middleware-pipeline.config.php
index aa9889f1..78c20c38 100644
--- a/module/Rest/config/middleware-pipeline.config.php
+++ b/module/Rest/config/middleware-pipeline.config.php
@@ -8,7 +8,6 @@ return [
             'path' => '/rest',
             'middleware' => [
                 Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\LocaleMiddleware::class,
                 Middleware\CrossDomainMiddleware::class,
             ],
             'priority' => 5,
diff --git a/module/Rest/config/services.config.php b/module/Rest/config/services.config.php
index 093e6e41..aff4cc96 100644
--- a/module/Rest/config/services.config.php
+++ b/module/Rest/config/services.config.php
@@ -19,7 +19,6 @@ return [
 
             Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
             Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class,
-            Middleware\LocaleMiddleware::class => AnnotatedFactory::class,
         ],
     ],