Add config to skip widget_build_url for DM rooms (#11044)
* Add config to skip widget_build_url for DM rooms * Add tests
This commit is contained in:
parent
d340fa8d2a
commit
2e68479577
5 changed files with 69 additions and 6 deletions
|
@ -106,6 +106,7 @@ export interface IConfigOptions {
|
|||
};
|
||||
|
||||
widget_build_url?: string; // url called to replace jitsi/call widget creation
|
||||
widget_build_url_ignore_dm?: boolean;
|
||||
audio_stream_url?: string;
|
||||
jitsi?: {
|
||||
preferred_domain: string;
|
||||
|
|
|
@ -963,7 +963,7 @@ export default class LegacyCallHandler extends EventEmitter {
|
|||
}
|
||||
|
||||
// We might be using managed hybrid widgets
|
||||
if (isManagedHybridWidgetEnabled()) {
|
||||
if (isManagedHybridWidgetEnabled(roomId)) {
|
||||
await addManagedHybridWidget(roomId);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -26,6 +26,7 @@ const EMBEDDED_PAGES_WK_PROPERTY = "io.element.embedded_pages";
|
|||
/* eslint-disable camelcase */
|
||||
export interface ICallBehaviourWellKnown {
|
||||
widget_build_url?: string;
|
||||
ignore_dm?: boolean;
|
||||
}
|
||||
|
||||
export interface IE2EEWellKnown {
|
||||
|
|
|
@ -24,6 +24,7 @@ import { IStoredLayout, WidgetLayoutStore } from "../stores/widgets/WidgetLayout
|
|||
import WidgetEchoStore from "../stores/WidgetEchoStore";
|
||||
import WidgetStore from "../stores/WidgetStore";
|
||||
import SdkConfig from "../SdkConfig";
|
||||
import DMRoomMap from "../utils/DMRoomMap";
|
||||
|
||||
/* eslint-disable camelcase */
|
||||
interface IManagedHybridWidgetData {
|
||||
|
@ -33,16 +34,25 @@ interface IManagedHybridWidgetData {
|
|||
}
|
||||
/* eslint-enable camelcase */
|
||||
|
||||
function getWidgetBuildUrl(): string | undefined {
|
||||
function getWidgetBuildUrl(roomId: string): string | undefined {
|
||||
const isDm = !!DMRoomMap.shared().getUserIdForRoomId(roomId);
|
||||
if (SdkConfig.get().widget_build_url) {
|
||||
if (isDm && SdkConfig.get().widget_build_url_ignore_dm) {
|
||||
return undefined;
|
||||
}
|
||||
return SdkConfig.get().widget_build_url;
|
||||
}
|
||||
|
||||
const wellKnown = getCallBehaviourWellKnown(MatrixClientPeg.get());
|
||||
if (isDm && wellKnown?.ignore_dm) {
|
||||
return undefined;
|
||||
}
|
||||
/* eslint-disable-next-line camelcase */
|
||||
return getCallBehaviourWellKnown(MatrixClientPeg.get())?.widget_build_url;
|
||||
return wellKnown?.widget_build_url;
|
||||
}
|
||||
|
||||
export function isManagedHybridWidgetEnabled(): boolean {
|
||||
return !!getWidgetBuildUrl();
|
||||
export function isManagedHybridWidgetEnabled(roomId: string): boolean {
|
||||
return !!getWidgetBuildUrl(roomId);
|
||||
}
|
||||
|
||||
export async function addManagedHybridWidget(roomId: string): Promise<void> {
|
||||
|
@ -60,7 +70,7 @@ export async function addManagedHybridWidget(roomId: string): Promise<void> {
|
|||
|
||||
// Get widget data
|
||||
/* eslint-disable-next-line camelcase */
|
||||
const widgetBuildUrl = getWidgetBuildUrl();
|
||||
const widgetBuildUrl = getWidgetBuildUrl(roomId);
|
||||
if (!widgetBuildUrl) {
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue