fix(releases) use external api with tenant value to get the correct release version (#26)

Author: mihhu

example/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@jitsi/react-sdk",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "React SDK for the Jitsi Meet IFrame",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package-lock.json

@@ -10,7 +10,7 @@ import {
 import { DEFAULT_DOMAIN } from '../constants';
 import { fetchExternalApi } from '../init';
 import { IJitsiMeetExternalApi, IJitsiMeetingProps, JitsiMeetExternalApi } from '../types';
-import { generateComponentId } from '../utils';
+import { generateComponentId, getAppId } from '../utils';
 
 /**
  * Returns the JitsiMeeting Component with access to a custom External API
@@ -53,7 +53,7 @@ const JitsiMeeting = ({
     , [ generateComponentId ]);
 
     useEffect(() => {
-        fetchExternalApi(domain, release)
+        fetchExternalApi(domain, release, getAppId(roomName))
             .then((api: JitsiMeetExternalApi) => {
                 externalApi.current = api;
                 setApiLoaded(true);

package.json

@@ -3,17 +3,19 @@ import { JitsiMeetExternalApi } from './types';
 
 const loadExternalApi = async (
         domain: string,
-        release?: string
+        release?: string,
+        appId?: string
 ): Promise<JitsiMeetExternalApi> => new Promise((resolve, reject) => {
     if (window.JitsiMeetExternalAPI) {
         return resolve(window.JitsiMeetExternalAPI);
     }
 
     const script: HTMLScriptElement = document.createElement('script');
     const releaseParam: string = release ? `?release=${release}` : '';
+    const appIdPath: string = appId ? `${appId}/` : '';
 
     script.async = true;
-    script.src = `https://${domain}/external_api.js${releaseParam}`;
+    script.src = `https://${domain}/${appIdPath}external_api.js${releaseParam}`;
     script.onload = () => resolve(window.JitsiMeetExternalAPI);
     script.onerror = () => reject(new Error(`Script load error: ${script.src}`));
     document.head.appendChild(script as Node);
@@ -31,17 +33,19 @@ let scriptPromise: Promise<JitsiMeetExternalApi>;
  *
  * @param {string} domain - The domain of the external API
  * @param {string} release - The Jitsi Meet release. Expected format: 'release-1234'
+ * @param {string} appId - The tenant for JaaS Meetings
  * @returns {Promise<JitsiMeetExternalApi>} - The JitsiMeetExternalAPI or an error
  */
 export const fetchExternalApi = (
         domain: string = DEFAULT_DOMAIN,
-        release?: string
+        release?: string,
+        appId?: string
 ): Promise<JitsiMeetExternalApi> => {
     if (scriptPromise) {
         return scriptPromise;
     }
 
-    scriptPromise = loadExternalApi(domain, release);
+    scriptPromise = loadExternalApi(domain, release, appId);
 
     return scriptPromise;
 };

src/components/JitsiMeeting.tsx

@@ -18,6 +18,22 @@ export const getRoomName = (
     return roomName;
 };
 
+/**
+ * Returns the appId or tenant value
+ *
+ * @param {string} roomName
+ * @returns {string|undefined}
+ */
+export const getAppId = (roomName: string): string | undefined => {
+    const roomParts = roomName.split('/');
+
+    if (roomParts.length <= 1) {
+        return;
+    }
+
+    return roomParts[0];
+}
+
 /**
  * Returns the JaaS domain
  *