Be stricter with what is passed in to the openid components

This commit is contained in:
David Baker
2023-07-03 16:21:56 +01:00
parent 9e95e8b5a7
commit f2eabec382
3 changed files with 40 additions and 17 deletions

View File

@@ -36,6 +36,7 @@ import { UserChoices } from "../livekit/useLiveKit";
import { findDeviceByName } from "../media-utils";
import { OpenIDLoader } from "../livekit/OpenIDLoader";
import { ActiveCall } from "./InCallView";
import { Config } from "../config/Config";
declare global {
interface Window {
@@ -219,11 +220,21 @@ export function GroupCallView({
undefined
);
const lkServiceURL = Config.get().livekit?.livekit_service_url;
if (!lkServiceURL) {
return <ErrorView error={new Error("No livekit_service_url defined")} />;
}
if (error) {
return <ErrorView error={error} />;
} else if (state === GroupCallState.Entered && userChoices) {
return (
<OpenIDLoader client={client} roomName={matrixInfo.roomName}>
<OpenIDLoader
client={client}
livekitServiceURL={lkServiceURL}
roomName={matrixInfo.roomName}
>
<ActiveCall
client={client}
groupCall={groupCall}