Merge pull request #5848 from HSLdevcom/AB#593

Ab#593: Static files configuration

Author: vesameskanen

app/component/AppBarHsl.js

@@ -207,7 +207,7 @@ const AppBarHsl = ({ lang, user, favourites }, context) => {
       {!config.hideHeader && (
         <SiteHeader
           baseUrl={config.URL.ROOTLINK}
-          staticAssetsUrl="/static-assets"
+          staticAssetsUrl={config.URL.STATIC_ASSETS}
           lang={lang}
           userMenu={userMenu}
           langMenu={languages}

app/configurations/config.hsl.js

@@ -18,7 +18,8 @@ const SUGGESTION_URL = process.env.CONTENT_DOMAIN
   ? `${process.env.CONTENT_DOMAIN}/api/v1/search/suggestions`
   : 'https://content.hsl.fi/api/v1/search/suggestions'; // old url
 const travelersAccountUrl = process.env.TRAVELERS_ACCOUNT_URL;
-const staticAssetsUrl = process.env.STATIC_ASSETS_URL;
+const staticAssetsUrl =
+  process.env.STATIC_ASSETS_URL || 'https://staticfiles-test.hslfi.hsldev.com/';
 
 const virtualMonitorBaseUrl = IS_DEV
   ? 'https://dev-hslmonitori.digitransit.fi'

server/server.js

@@ -123,17 +123,6 @@ function setUpMiddleware() {
     // proxy for dev-bundle
     app.use('/proxy/', proxy(`http://localhost:${hotloadPort}/`));
   }
-  // Proxy static assets to avoid CORS issues when fetching from the browser
-  // TODO this is a hacky solution, contact site-header admins to update site-header cors settings.
-  const staticAssetsBaseUrl = process.env.STATIC_ASSETS_URL;
-  if (staticAssetsBaseUrl) {
-    app.use(
-      '/static-assets',
-      proxy(staticAssetsBaseUrl, {
-        proxyReqPathResolver: req => req.url,
-      }),
-    );
-  }
 }
 
 function onError(err, req, res) {