Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🐛(frontend) prevent silent login in webmail iframe integration

lebaudantoinee210f26f9c1c
diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 72607b96..0a1d3c7e 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -13,14 +13,17 @@ import { routes } from './routes'
import './i18n/init'
import { queryClient } from '@/api/queryClient'
import { AppInitialization } from '@/components/AppInitialization'
+import { useIsSdkContext } from '@/features/sdk/hooks/useIsSdkContext'
function App() {
const { i18n } = useTranslation()
useLang(i18n.language)
+ const isSDKContext = useIsSdkContext()
+
return (
<QueryClientProvider client={queryClient}>
- <AppInitialization />
+ {!isSDKContext && <AppInitialization />}
<Suspense fallback={null}>
<I18nProvider locale={i18n.language}>
<Layout>
diff --git a/src/frontend/src/components/AppInitialization.tsx b/src/frontend/src/components/AppInitialization.tsx
index b99952f6..5b37d6ae 100644
--- a/src/frontend/src/components/AppInitialization.tsx
+++ b/src/frontend/src/components/AppInitialization.tsx
@@ -2,15 +2,9 @@ import { silenceLiveKitLogs } from '@/utils/livekit'
import { useConfig } from '@/api/useConfig'
import { useAnalytics } from '@/features/analytics/hooks/useAnalytics'
import { useSupport } from '@/features/support/hooks/useSupport'
-import { useLocation } from 'wouter'
-import { useSyncUserPreferencesWithBackend } from '@/features/auth'
-
-const SDK_BASE_ROUTE = '/sdk'
export const AppInitialization = () => {
const { data } = useConfig()
- const [location] = useLocation()
- useSyncUserPreferencesWithBackend()
const {
analytics = {},
@@ -18,10 +12,8 @@ export const AppInitialization = () => {
silence_livekit_debug_logs = false,
} = data || {}
- const isSDKContext = location.includes(SDK_BASE_ROUTE)
-
- useAnalytics({ ...analytics, isDisabled: isSDKContext })
- useSupport({ ...support, isDisabled: isSDKContext })
+ useAnalytics(analytics)
+ useSupport(support)
silenceLiveKitLogs(silence_livekit_debug_logs)
diff --git a/src/frontend/src/features/sdk/hooks/useIsSdkContext.ts b/src/frontend/src/features/sdk/hooks/useIsSdkContext.ts
new file mode 100644
index 00000000..dea5cd39
--- /dev/null
+++ b/src/frontend/src/features/sdk/hooks/useIsSdkContext.ts
@@ -0,0 +1,8 @@
+import { useLocation } from 'wouter'
+
+const SDK_BASE_ROUTE = '/sdk'
+
+export const useIsSdkContext = () => {
+ const [location] = useLocation()
+ return location.includes(SDK_BASE_ROUTE)
+}