Remove files from commit that shouldn've have changed

.gitignore

@@ -6,4 +6,4 @@ dist-ssr
 
 .env
 # Local Netlify folder
-.netlify
+.netlify

backend/package.json

@@ -27,7 +27,7 @@
     "@types/pubnub": "^7.2.1",
     "concurrently": "^7.6.0",
     "nodemon": "^2.0.20",
-    "typescript": "4.9.5",
+    "typescript": "^5.1.5",
     "wait-on": "^6.0.1"
   }
 }

src/App.tsx

@@ -4,20 +4,28 @@ import React, { useEffect } from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 
+import styles from './App.module.scss';
 import PhoneLandscapeCurtain from './components/PhoneLandscapeCurtain';
 import TranslationProvider from './components/TranslationProvider';
-import './App.module.scss';
 import { ConferenceCreateProvider } from './context/ConferenceCreateContext';
 import useToken from './hooks/useToken';
 import { Navigator } from './routes/Navigator';
 
 const App = () => {
+  const { YOUR_TOKEN, getToken, error } = useToken();
+
   // Register the component name so that we can estimate the app's usage
   useEffect(() => {
     VoxeetSDK.registerComponentVersion(import.meta.env.VITE_APP_NAME, import.meta.env.VITE_APP_VERSION);
   }, []);
 
-  const { YOUR_TOKEN, getToken } = useToken();
+  if (error) {
+    return (
+      <ThemeProvider>
+        <div className={styles.fallbackContainer}>Error : {error}</div>;
+      </ThemeProvider>
+    );
+  }
 
   if (!YOUR_TOKEN) {
     return null;

src/hooks/useToken.ts

@@ -1,35 +1,41 @@
 import getProxyUrl from '@src/utils/getProxyUrl';
-import { useMemo, useState, useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useState, useEffect, useCallback } from 'react';
 
 import fetch from '../utils/fetch';
 
 const useToken = () => {
-  const location = useLocation();
+  const [error, setError] = useState<string | undefined>();
 
-  const accessToken = useMemo(() => {
-    return encodeURIComponent(
-      new URLSearchParams(window.location.search).get('token') || import.meta.env.VITE_CLIENT_ACCESS_TOKEN || '',
-    );
-  }, [location]);
+  const accessToken = import.meta.env.VITE_CLIENT_ACCESS_TOKEN || '';
 
   const [YOUR_TOKEN, setToken] = useState<string | null>(null);
 
-  const getToken = async () => {
+  const getToken = useCallback(async () => {
     if (accessToken && accessToken.length) {
       return accessToken;
     }
-    const res = await fetch(`${getProxyUrl()}/client-access-token`, { method: 'GET' });
-    return res.data.access_token;
-  };
+    try {
+      const res = await fetch(`${getProxyUrl()}/client-access-token`);
+
+      if (!res.data.access_token) {
+        setError(`Invalid Dolby.io token, please refer to Readme to set it correctly`);
+      } else {
+        setError(undefined);
+      }
+      return res.data.access_token;
+    } catch (e) {
+      setError(`Invalid Dolby.io token, please refer to Readme to set it correctly`);
+      return null;
+    }
+  }, [accessToken]);
 
   useEffect(() => {
     (async () => {
       setToken(await getToken());
     })();
-  }, []);
+  }, [getToken]);
 
-  return { YOUR_TOKEN, getToken };
+  return { YOUR_TOKEN, getToken, error };
 };
 
 export default useToken;

src/routes/ConferenceCreate/DeviceSetup/MobileContent/MobileContent.tsx

@@ -12,7 +12,6 @@ import {
 import ToggleMicrophoneButton from '@src/routes/ConferenceCreate/DeviceSetup/ToggleMicrophoneButton';
 import ToggleVideoButton from '@src/routes/ConferenceCreate/DeviceSetup/ToggleVideoButton';
 import { splitMeetingAlias } from '@src/utils/misc';
-
 import React, { useMemo } from 'react';
 
 import styles from './MobileContent.module.scss';

src/utils/env.ts

@@ -6,7 +6,8 @@ const defaults = {
   VITE_RTMP_STREAMING: 'true',
   VITE_MUSIC_MODE: 'true',
   VITE_BLUR_OPTION: 'true',
-  VITE_CONFERENCE_RECORDING: 'false',
+  VITE_CONFERENCE_RECORDING: 'true',
+  VITE_VIDEO_FORWARDING_OPTION: 'true',
 } satisfies Record<string, string | undefined>;
 // The type above allows us to define the value type while still being strongly typed
 // For example, the type for defaults.VITE_ENABLE_UNGATED_FEATURES is undefined rather