Revert "Support for getting SFU config using OIDC"

src/room/InCallView.tsx

@@ -72,6 +72,7 @@ import { MatrixInfo } from "./VideoPreview";
 import { useJoinRule } from "./useJoinRule";
 import { ParticipantInfo } from "./useGroupCall";
 import { ItemData, TileContent } from "../video-grid/VideoTile";
+import { Config } from "../config/Config";
 import { NewVideoGrid } from "../video-grid/NewVideoGrid";
 import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
 import { SettingsModal } from "../settings/SettingsModal";
@@ -83,7 +84,6 @@ import { UserChoices, useLiveKit } from "../livekit/useLiveKit";
 import { useMediaDevices } from "../livekit/useMediaDevices";
 import { useFullscreen } from "./useFullscreen";
 import { useLayoutStates } from "../video-grid/Layout";
-import { useSFUConfig } from "../livekit/OpenIDLoader";
 
 const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
 // There is currently a bug in Safari our our code with cloning and sending MediaStreams
@@ -91,13 +91,18 @@ const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
 // For now we can disable screensharing in Safari.
 const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
-export interface ActiveCallProps extends Omit<InCallViewProps, "livekitRoom"> {
+interface ActiveCallProps extends Omit<Props, "livekitRoom"> {
   userChoices: UserChoices;
 }
 
 export function ActiveCall(props: ActiveCallProps) {
-  const sfuConfig = useSFUConfig();
-  const livekitRoom = useLiveKit(props.userChoices, sfuConfig);
+  const livekitRoom = useLiveKit(props.userChoices, {
+    sfuUrl: Config.get().livekit!.server_url,
+    jwtUrl: `${Config.get().livekit!.jwt_service_url}/token`,
+    roomName: props.matrixInfo.roomName,
+    userDisplayName: props.matrixInfo.displayName,
+    userIdentity: `${props.client.getUserId()}:${props.client.getDeviceId()}`,
+  });
 
   return (
     livekitRoom && (
@@ -108,7 +113,7 @@ export function ActiveCall(props: ActiveCallProps) {
   );
 }
 
-export interface InCallViewProps {
+interface Props {
   client: MatrixClient;
   groupCall: GroupCall;
   livekitRoom: Room;
@@ -130,7 +135,7 @@ export function InCallView({
   hideHeader,
   matrixInfo,
   otelGroupCallMembership,
-}: InCallViewProps) {
+}: Props) {
   const { t } = useTranslation();
   usePreventScroll();