haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Vlad Piersec 2021-10-07 09:42:57 +03:00 committed by vp8x8
parent 1bc5ef3516
commit ddcb85a1d8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
react/features/dynamic-branding/actions.js
View File

@ -27,7 +27,7 @@ export function fetchCustomBrandingData() {
const { customizationReady } = state['features/dynamic-branding']; const { customizationReady } = state['features/dynamic-branding'];
if (!customizationReady) { if (!customizationReady) {
const url = getDynamicBrandingUrl(state); const url = await getDynamicBrandingUrl();
if (url) { if (url) {
try { try {

9
react/features/dynamic-branding/functions.js
View File

@ -1,4 +1,5 @@
// @flow // @flow
import { loadConfig } from '../base/lib-jitsi-meet';
/** /**
* Extracts the fqn part from a path, where fqn represents * 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. * Returns the url used for fetching dynamic branding.
* *
* @param {Object} state - The state of the app.
* @returns {string} * @returns {string}
*/ */
export function getDynamicBrandingUrl(state: Object) { export async function getDynamicBrandingUrl() {
const { dynamicBrandingUrl } = state['features/base/config']; const config = await loadConfig(window.location.href);
const { dynamicBrandingUrl } = config;
if (dynamicBrandingUrl) { if (dynamicBrandingUrl) {
return dynamicBrandingUrl; return dynamicBrandingUrl;
} }
const baseUrl = state['features/base/config'].brandingDataUrl; const { brandingDataUrl: baseUrl } = config;
const fqn = extractFqnFromPath(); const fqn = extractFqnFromPath();
if (baseUrl && fqn) { if (baseUrl && fqn) {