Bläddra i källkod

fix(branding): Use config url for dynamic branding

master
Vlad Piersec 4 år sedan
förälder
incheckning
33e4324f6d

+ 1
- 1
config.js Visa fil

616
          logoImageUrl: 'https://example.com/logo-img.png'
616
          logoImageUrl: 'https://example.com/logo-img.png'
617
      }
617
      }
618
     */
618
     */
619
-    // brandingDataUrl: '',
619
+    // dynamicBrandingUrl: '',
620
 
620
 
621
     // The URL of the moderated rooms microservice, if available. If it
621
     // The URL of the moderated rooms microservice, if available. If it
622
     // is present, a link to the service will be rendered on the welcome page,
622
     // is present, a link to the service will be rendered on the welcome page,

+ 5
- 5
react/features/dynamic-branding/actions.js Visa fil

9
     SET_DYNAMIC_BRANDING_FAILED,
9
     SET_DYNAMIC_BRANDING_FAILED,
10
     SET_DYNAMIC_BRANDING_READY
10
     SET_DYNAMIC_BRANDING_READY
11
 } from './actionTypes';
11
 } from './actionTypes';
12
-import { extractFqnFromPath } from './functions';
12
+import { getDynamicBrandingUrl } from './functions';
13
 
13
 
14
 const logger = getLogger(__filename);
14
 const logger = getLogger(__filename);
15
 
15
 
16
+
16
 /**
17
 /**
17
  * Fetches custom branding data.
18
  * Fetches custom branding data.
18
  * If there is no data or the request fails, sets the `customizationReady` flag
19
  * If there is no data or the request fails, sets the `customizationReady` flag
23
 export function fetchCustomBrandingData() {
24
 export function fetchCustomBrandingData() {
24
     return async function(dispatch: Function, getState: Function) {
25
     return async function(dispatch: Function, getState: Function) {
25
         const state = getState();
26
         const state = getState();
26
-        const baseUrl = state['features/base/config'].brandingDataUrl;
27
         const { customizationReady } = state['features/dynamic-branding'];
27
         const { customizationReady } = state['features/dynamic-branding'];
28
 
28
 
29
         if (!customizationReady) {
29
         if (!customizationReady) {
30
-            const fqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
30
+            const url = getDynamicBrandingUrl(state);
31
 
31
 
32
-            if (baseUrl && fqn) {
32
+            if (url) {
33
                 try {
33
                 try {
34
-                    const res = await doGetJSON(`${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`);
34
+                    const res = await doGetJSON(url);
35
 
35
 
36
                     return dispatch(setDynamicBrandingData(res));
36
                     return dispatch(setDynamicBrandingData(res));
37
                 } catch (err) {
37
                 } catch (err) {

+ 21
- 0
react/features/dynamic-branding/functions.js Visa fil

13
 
13
 
14
     return parts.length > 2 ? `${parts[len - 2]}/${parts[len - 1]}` : '';
14
     return parts.length > 2 ? `${parts[len - 2]}/${parts[len - 1]}` : '';
15
 }
15
 }
16
+
17
+/**
18
+ * Returns the url used for fetching dynamic branding.
19
+ *
20
+ * @param {Object} state - The state of the app.
21
+ * @returns {string}
22
+ */
23
+export function getDynamicBrandingUrl(state: Object) {
24
+    const { dynamicBrandingUrl } = state['features/base/config'];
25
+
26
+    if (dynamicBrandingUrl) {
27
+        return dynamicBrandingUrl;
28
+    }
29
+
30
+    const baseUrl = state['features/base/config'].brandingDataUrl;
31
+    const fqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
32
+
33
+    if (baseUrl && fqn) {
34
+        return `${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`;
35
+    }
36
+}

Laddar…
Avbryt
Spara