From fc654b6f159085cad15b1fde1ede27361980cd0e Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Thu, 16 Dec 2021 09:49:42 +0200
Subject: [PATCH] Mapbox token as env variable
---
src/client/configs/portalConfig.json | 1 -
src/client/helpers/helpers.js | 6 +++++-
webpack.client.common.js | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/client/configs/portalConfig.json b/src/client/configs/portalConfig.json
index d798ab1e..ff38ead0 100644
--- a/src/client/configs/portalConfig.json
+++ b/src/client/configs/portalConfig.json
@@ -83,7 +83,6 @@
}
},
"mapboxConfig": {
- "mapboxAccessToken": "pk.eyJ1IjoiZWtrb25lbiIsImEiOiJja2FkbGxiY2owMDZkMnFxcGVqNTZ0dmk2In0.6keLTN8VveJkM5y4_OFmUw",
"mapboxStyle": "light-v10"
},
"yasguiConfig": {
diff --git a/src/client/helpers/helpers.js b/src/client/helpers/helpers.js
index 07cc14ac..f915a87c 100644
--- a/src/client/helpers/helpers.js
+++ b/src/client/helpers/helpers.js
@@ -187,9 +187,13 @@ export const createURIfromLocalID = ({ localID, baseURI, URITemplate }) => {
}
export const processPortalConfig = async portalConfig => {
- const { layoutConfig } = portalConfig
+ const { layoutConfig, mapboxConfig } = portalConfig
const { bannerImage, bannerBackround } = layoutConfig.mainPage
const { default: bannerImageURL } = await import(/* webpackMode: "eager" */ `../img/${bannerImage}`)
+ const mapboxAccessToken = process.env.MAPBOX_ACCESS_TOKEN
+ if (mapboxConfig && mapboxAccessToken) {
+ mapboxConfig.mapboxAccessToken = mapboxAccessToken
+ }
layoutConfig.mainPage.bannerBackround = bannerBackround.replace('<BANNER_IMAGE_URL', bannerImageURL)
}
diff --git a/webpack.client.common.js b/webpack.client.common.js
index 21bf261e..5b0880a2 100644
--- a/webpack.client.common.js
+++ b/webpack.client.common.js
@@ -1,4 +1,5 @@
const path = require('path')
+const dotenv = require('dotenv').config()
const HtmlWebpackPlugin = require('html-webpack-plugin')
const { CleanWebpackPlugin } = require('clean-webpack-plugin')
const webpack = require('webpack')
@@ -27,7 +28,8 @@ module.exports = {
favicon: 'src/client/favicon.ico'
}),
new webpack.DefinePlugin({
- 'process.env.API_URL': JSON.stringify(apiUrl)
+ 'process.env.API_URL': JSON.stringify(apiUrl),
+ 'process.env': JSON.stringify(dotenv.parsed)
})
],
output: {
--
GitLab