From ac124682383e277b28655fe018de78a2757a1a99 Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Wed, 8 Oct 2025 09:42:33 +0200
Subject: [PATCH] feat: add gateway +  mapstore localconfig add easytheming

(cherry picked from commit 89e9bd90002bdd1191cb325f2da6b02faf4cbc79)
---
 gateway/gateway.yaml              | 10 ++++++++++
 mapstore/configs/localConfig.json | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/gateway/gateway.yaml b/gateway/gateway.yaml
index 20e5f8d6..1fe34a05 100644
--- a/gateway/gateway.yaml
+++ b/gateway/gateway.yaml
@@ -6,6 +6,16 @@ spring.config.import: application.yaml, security.yaml, routes.yaml, roles-mappin
 
 georchestra:
   gateway:
+    # This allows to use /login?=redirect=... to redirect to a specific URL after a successful login
+    # (if the URL is in the allow list below)
+    # Disabled by default for security reasons (open redirect vulnerability)
+    # loginRedirectAllowList: >
+    #   https://localhost/datahub/,
+    #   https://localhost/geoserver/,
+    #   https://localhost/console/,
+    #   https://localhost/mapstore/,
+    #   https://localhost/import/,
+    #   https://localhost/geonetwork/
     # Redirection URL after a successful logout : Defaults to /?logout
     # logoutUrl : "/?logout" 
     default-headers:
diff --git a/mapstore/configs/localConfig.json b/mapstore/configs/localConfig.json
index 581e607c..2a693ab2 100644
--- a/mapstore/configs/localConfig.json
+++ b/mapstore/configs/localConfig.json
@@ -792,13 +792,14 @@
           },
           "FeedbackMask"
         ],
-        "common": [],
+        "common": ["Easytheming"],
       "maps": [
         "Login",
         "HomeDescription", "Fork",
         "MapSearch",
         "CreateNewMap",
         "FeaturedMaps", "ContentTabs",
+        "Easytheming",
         {
           "name": "Header",
           "cfg": {
@@ -854,6 +855,7 @@
           }
         },
         "Details",
+        "Easytheming",
         "AddWidgetDashboard",
         "MapConnectionDashboard",
         {
@@ -951,6 +953,7 @@
         { "name": "FeedbackMask" }
       ],
       "geostory": [
+        "Easytheming",
         {
           "name": "OmniBar",
           "cfg": {
@@ -1052,7 +1055,9 @@
           "className": "navbar shadow navbar-home"
         }
       }, "Login", "ContextManager"],
-      "notallowed": [{
+      "notallowed": [
+        "Easytheming",
+        {
           "name": "Header",
           "cfg": {
             "page": "msadmin"
@@ -1068,6 +1073,7 @@
         "NotAllowed"
       ],
       "context-creator": [
+          "Easytheming",
           {
             "name": "Header",
             "cfg": {