Fix other FocusInfo / livekit service URL instances

This commit is contained in:
David Baker
2023-07-12 17:20:02 +01:00
parent 587973fb9b
commit 73e1ce547d
2 changed files with 4 additions and 13 deletions

View File

@@ -139,13 +139,6 @@ export const ClientProvider: FC<Props> = ({ children }) => {
session; session;
const livekit = Config.get().livekit; const livekit = Config.get().livekit;
const foci = livekit
? [
{
livekitServiceUrl: livekit.livekit_service_url,
},
]
: undefined;
try { try {
return { return {
@@ -156,7 +149,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
userId: user_id, userId: user_id,
deviceId: device_id, deviceId: device_id,
fallbackICEServerAllowed: fallbackICEServerAllowed, fallbackICEServerAllowed: fallbackICEServerAllowed,
foci, livekitServiceURL: livekit?.livekit_service_url,
}, },
true true
), ),
@@ -173,7 +166,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
userId: user_id, userId: user_id,
deviceId: device_id, deviceId: device_id,
fallbackICEServerAllowed: fallbackICEServerAllowed, fallbackICEServerAllowed: fallbackICEServerAllowed,
foci, livekitServiceURL: livekit?.livekit_service_url,
}, },
false // Don't need the crypto store just to log out false // Don't need the crypto store just to log out
); );

View File

@@ -164,7 +164,7 @@ export const widget: WidgetHelpers | null = (() => {
// message so that we can use the widget API in less racy mode, but we need to change // message so that we can use the widget API in less racy mode, but we need to change
// element-web to use waitForIFrameLoad=false. Once that change has rolled out, // element-web to use waitForIFrameLoad=false. Once that change has rolled out,
// we can just start the client after we've fetched the config. // we can just start the client after we've fetched the config.
foci: [], livekitServiceURL: undefined,
} }
); );
@@ -178,9 +178,7 @@ export const widget: WidgetHelpers | null = (() => {
// Now we've fetched the config, be evil and use the getter to inject the focus // Now we've fetched the config, be evil and use the getter to inject the focus
// into the client (see above XXX). // into the client (see above XXX).
if (focus) { if (focus) {
client.getFoci().push({ client.setLivekitServiceURL(livekit.livekit_service_url);
livekitServiceUrl: livekit.livekit_service_url,
});
} }
await client.startClient(); await client.startClient();
resolve(client); resolve(client);