From ddcb85a1d87d8a71196c489b23e126487d247008 Mon Sep 17 00:00:00 2001
From: Vlad Piersec <vlad.piersec@8x8.com>
Date: Thu, 7 Oct 2021 09:42:57 +0300
Subject: [PATCH] fix(jaas): Get dynamic branding url from config file

We make the request for dynamic branding as soon as possible so
at the time of the request the config is not yet added to the store.
In order to fix this we get the jass brandingDataUrl &
dynamicBrandingUrl directly from the config.
---
 react/features/dynamic-branding/actions.js   | 2 +-
 react/features/dynamic-branding/functions.js | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/react/features/dynamic-branding/actions.js b/react/features/dynamic-branding/actions.js
index e7a3297d4..705708b3e 100644
--- a/react/features/dynamic-branding/actions.js
+++ b/react/features/dynamic-branding/actions.js
@@ -27,7 +27,7 @@ export function fetchCustomBrandingData() {
         const { customizationReady } = state['features/dynamic-branding'];
 
         if (!customizationReady) {
-            const url = getDynamicBrandingUrl(state);
+            const url = await getDynamicBrandingUrl();
 
             if (url) {
                 try {
diff --git a/react/features/dynamic-branding/functions.js b/react/features/dynamic-branding/functions.js
index dd5be7142..f9648efa0 100644
--- a/react/features/dynamic-branding/functions.js
+++ b/react/features/dynamic-branding/functions.js
@@ -1,4 +1,5 @@
 // @flow
+import { loadConfig } from '../base/lib-jitsi-meet';
 
 /**
  * Extracts the fqn part from a path, where fqn represents
@@ -17,17 +18,17 @@ export function extractFqnFromPath() {
 /**
  * Returns the url used for fetching dynamic branding.
  *
- * @param {Object} state - The state of the app.
  * @returns {string}
  */
-export function getDynamicBrandingUrl(state: Object) {
-    const { dynamicBrandingUrl } = state['features/base/config'];
+export async function getDynamicBrandingUrl() {
+    const config = await loadConfig(window.location.href);
+    const { dynamicBrandingUrl } = config;
 
     if (dynamicBrandingUrl) {
         return dynamicBrandingUrl;
     }
 
-    const baseUrl = state['features/base/config'].brandingDataUrl;
+    const { brandingDataUrl: baseUrl } = config;
     const fqn = extractFqnFromPath();
 
     if (baseUrl && fqn) {