Fix env substitution in access token generation (internal-1893)

* Fix ENV substitution in generate-access-token-script.js * fix CSP urls
mapbox · Oct 25, 2024 · 63b8d31 · 63b8d31
1 parent 123357e
commit 63b8d31
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -9,7 +9,7 @@
     "parserOptions": {
         "projectService": {
             "defaultProject": "./tsconfig.json",
-            "allowDefaultProject": ["*.js", "debug/*.html"]
+            "allowDefaultProject": ["*.js", "debug/*", "build/*"]
         }
     },
     "plugins": [

diff --git a/debug/access_token.js b/debug/access_token.js
@@ -4,13 +4,14 @@ mapboxgl.accessToken = getAccessToken();
 
 function getAccessToken() {
     const accessToken = [
-        typeof process !== 'undefined' && process.env.MapboxAccessToken,
-        typeof process !== 'undefined' && process.env.MAPBOX_ACCESS_TOKEN,
+        process.env.MapboxAccessToken,
+        process.env.MAPBOX_ACCESS_TOKEN,
         getURLParameter('access_token'),
         localStorage.getItem('accessToken'),
         // this token is a fallback for CI and testing. it is domain restricted to localhost
         'pk.eyJ1IjoibWFwYm94LWdsLWpzIiwiYSI6ImNram9ybGI1ajExYjQyeGxlemppb2pwYjIifQ.LGy5UGNIsXUZdYMvfYRiAQ'
     ].find(Boolean);
+
     try {
         localStorage.setItem('accessToken', accessToken);
     } catch (_) {
@@ -20,7 +21,6 @@ function getAccessToken() {
 }
 
 function getURLParameter(name) {
-    var regexp = new RegExp('[?&]' + name + '=([^&#]*)', 'i');
-    var output = regexp.exec(window.location.href);
-    return output && output[1];
+    const url = new URL(window.location.href);
+    return url.searchParams.get(name);
 }
diff --git a/package.json b/package.json
@@ -147,7 +147,7 @@
     "test-build": "tsx ./node_modules/.bin/tape test/build/**/*.test.js",
     "watch-render": "cross-env SUITE_NAME=render testem -f test/integration/testem/testem.js",
     "watch-query": "SUITE_NAME=query testem -f test/integration/testem/testem.js",
-    "test-csp": "vitest --config vitest.config.csp.js --run",
+    "test-csp": "npm run build-token && vitest --config vitest.config.csp.ts --run",
     "test-render": "cross-env SUITE_NAME=render testem ci -f test/integration/testem/testem.js",
     "test-render-firefox": "cross-env BROWSER=Firefox SUITE_NAME=render testem ci -f test/integration/testem/testem.js",
     "test-render-safari": "cross-env BROWSER=Safari SUITE_NAME=render testem ci -f test/integration/testem/testem.js",

diff --git a/test/integration/csp-tests/fixtures/csp.html b/test/integration/csp-tests/fixtures/csp.html
@@ -6,7 +6,7 @@
 <body>
     <div id="map"></div>
     <script src="/dist/mapbox-gl.js"></script>
-    <script src="/debug/access_token.js"></script>
+    <script src="/debug/access_token_generated.js"></script>
     <script>
 
         window.addEventListener('message', (e) => {

diff --git a/test/integration/csp-tests/fixtures/strict.html b/test/integration/csp-tests/fixtures/strict.html
@@ -6,7 +6,7 @@
 <body>
     <div id="map"></div>
     <script src="/dist/mapbox-gl-csp.js"></script>
-    <script src="/debug/access_token.js"></script>
+    <script src="/debug/access_token_generated.js"></script>
     <script>
         mapboxgl.workerUrl = '/dist/mapbox-gl-csp-worker.js';
         window.addEventListener('message', (e) => {

diff --git a/vitest.config.csp.ts b/vitest.config.csp.ts
@@ -1,4 +1,4 @@
-import {defineConfig, mergeConfig} from 'vite';
+import {defineConfig, mergeConfig} from 'vitest/config';
 import baseConfig from './vitest.config.base';
 
 export default mergeConfig(baseConfig, defineConfig({