From 233a76caabb37110db66dd07e1a3116f6fad7045 Mon Sep 17 00:00:00 2001
From: mattiagiupponi <mattia.giupponi@gmail.com>
Date: Thu, 19 May 2022 13:24:37 +0200
Subject: [PATCH 1/2] [Fixes #976] Fix mapbox token in geostories

---
 geonode_mapstore_client/client/js/utils/ResourceUtils.js       | 3 +++
 geonode_mapstore_client/client/package.json                    | 1 +
 .../templates/geonode-mapstore-client/_geonode_config.html     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/geonode_mapstore_client/client/js/utils/ResourceUtils.js b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
index 142235738f..032c1e0846 100644
--- a/geonode_mapstore_client/client/js/utils/ResourceUtils.js
+++ b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
@@ -549,6 +549,9 @@ export const parseMapConfig = (mapResponse, resource = {}) => {
         if (layer.group === 'background' && (layer.type === 'ol' || layer.type === 'OpenLayers.Layer')) {
             layer.type = 'empty';
         }
+        if (layer.provider === 'MapBoxStyle' || layer.provider === 'MapBox') {
+            layer.accessToken = window.__GEONODE_CONFIG__?.mapboxAccessToken
+        }
         return layer;
     }));
 
diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
index c3c1958fb3..20035c1f31 100644
--- a/geonode_mapstore_client/client/package.json
+++ b/geonode_mapstore_client/client/package.json
@@ -27,6 +27,7 @@
   "license": "BSD-2-Clause",
   "devDependencies": {
     "@mapstore/project": "1.0.21",
+    "webpack-cli": "4.9.0",
     "dotenv": "10.0.0",
     "jsdoc-to-markdown": "7.1.0"
   },
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html b/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html
index 1d1af27f81..6361d7aecc 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html
@@ -12,6 +12,7 @@
 
 {% get_menu_json 'CARDS_MENU' as CARDS_MENU %}
 {{ CARDS_MENU|json_script:"menu-CARDS_MENU" }}
+{% mapbox_access_token as MAPBOX_ACCESS_TOKEN %}
 
 <script>
     (function(){
@@ -66,6 +67,7 @@
         window.__GEONODE_CONFIG__ = {
             languageCode: '{{ LANGUAGE_CODE }}',
             languages: languages,
+            mapboxAccessToken: '{{ MAPBOX_ACCESS_TOKEN }}',
             translationsPath: translationsPath,
             resourceId: '{{ resource.pk|default:"" }}',
             resourceType: '{{ resource.resource_type|default:"" }}',

From a0006bf7359826f7a54694d5c7f88ea087b4399b Mon Sep 17 00:00:00 2001
From: allyoucanmap <stefano.bovio@geosolutionsgroup.com>
Date: Thu, 19 May 2022 18:15:49 +0200
Subject: [PATCH 2/2] replaced direct access to global variable with
 getConfigProp

---
 geonode_mapstore_client/client/js/utils/ResourceUtils.js       | 3 ++-
 geonode_mapstore_client/client/package.json                    | 1 -
 .../templates/geonode-mapstore-client/_geonode_config.html     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/geonode_mapstore_client/client/js/utils/ResourceUtils.js b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
index 032c1e0846..58b3332ab3 100644
--- a/geonode_mapstore_client/client/js/utils/ResourceUtils.js
+++ b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
@@ -550,7 +550,8 @@ export const parseMapConfig = (mapResponse, resource = {}) => {
             layer.type = 'empty';
         }
         if (layer.provider === 'MapBoxStyle' || layer.provider === 'MapBox') {
-            layer.accessToken = window.__GEONODE_CONFIG__?.mapboxAccessToken
+            const { mapboxAccessToken } = getConfigProp('geoNodeSettings') || {};
+            layer.accessToken = mapboxAccessToken || '';
         }
         return layer;
     }));
diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
index 20035c1f31..c3c1958fb3 100644
--- a/geonode_mapstore_client/client/package.json
+++ b/geonode_mapstore_client/client/package.json
@@ -27,7 +27,6 @@
   "license": "BSD-2-Clause",
   "devDependencies": {
     "@mapstore/project": "1.0.21",
-    "webpack-cli": "4.9.0",
     "dotenv": "10.0.0",
     "jsdoc-to-markdown": "7.1.0"
   },
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html b/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html
index 6361d7aecc..7fbbf5a2da 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/_geonode_config.html
@@ -67,7 +67,6 @@
         window.__GEONODE_CONFIG__ = {
             languageCode: '{{ LANGUAGE_CODE }}',
             languages: languages,
-            mapboxAccessToken: '{{ MAPBOX_ACCESS_TOKEN }}',
             translationsPath: translationsPath,
             resourceId: '{{ resource.pk|default:"" }}',
             resourceType: '{{ resource.resource_type|default:"" }}',
@@ -103,6 +102,7 @@
                     datasetMaxUploadSize: datasetMaxUploadSize,
                     documentMaxUploadSize: documentMaxUploadSize,
                     maxParallelUploads: maxParallelUploads,
+                    mapboxAccessToken: '{{ MAPBOX_ACCESS_TOKEN }}'
                 },
                 geoNodeConfiguration: {
                     cardsMenu: {