From 8ea457f949d510a077b2060292b6652905d1387a Mon Sep 17 00:00:00 2001
From: Diana Olarte <dcoa@live.com>
Date: Wed, 30 Nov 2022 17:13:10 +1100
Subject: [PATCH] feat: allow runtime configuration (#654)

---
 .env              | 2 ++
 .env.development  | 2 ++
 .env.test         | 2 ++
 public/index.html | 1 -
 src/MainApp.jsx   | 5 +++++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 16509d61..6d418553 100644
--- a/.env
+++ b/.env
@@ -27,3 +27,5 @@ MARKETING_EMAILS_OPT_IN=''
 ENABLE_COPPA_COMPLIANCE=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
+APP_ID=''
+MFE_CONFIG_API_URL=''
diff --git a/.env.development b/.env.development
index ceb03c4b..7b22f46a 100644
--- a/.env.development
+++ b/.env.development
@@ -34,3 +34,5 @@ ENABLE_COPPA_COMPLIANCE=''
 MARKETING_EMAILS_OPT_IN=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
+APP_ID=''
+MFE_CONFIG_API_URL=''
diff --git a/.env.test b/.env.test
index 8463e288..82aa38eb 100644
--- a/.env.test
+++ b/.env.test
@@ -26,3 +26,5 @@ MARKETING_EMAILS_OPT_IN=''
 ENABLE_COPPA_COMPLIANCE=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
+APP_ID=''
+MFE_CONFIG_API_URL=''
diff --git a/public/index.html b/public/index.html
index 571440aa..8e68a656 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,6 @@
       <title>Authn | <%= process.env.SITE_NAME %></title>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
       <% if (process.env.OPTIMIZELY_URL) { %>
         <script
           src="<%= process.env.OPTIMIZELY_URL %>"
diff --git a/src/MainApp.jsx b/src/MainApp.jsx
index 921a584a..e7a96d3d 100755
--- a/src/MainApp.jsx
+++ b/src/MainApp.jsx
@@ -1,6 +1,8 @@
 import React from 'react';
 
+import { getConfig } from '@edx/frontend-platform';
 import { AppProvider } from '@edx/frontend-platform/react';
+import { Helmet } from 'react-helmet';
 import { Redirect, Route, Switch } from 'react-router-dom';
 
 import {
@@ -20,6 +22,9 @@ registerIcons();
 
 const MainApp = () => (
   <AppProvider store={configureStore()}>
+    <Helmet>
+      <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
+    </Helmet>
     <Switch>
       <Route exact path="/">
         <Redirect to={updatePathWithQueryParams(REGISTER_PAGE)} />