Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jitsi requests 'requires_client' capability if auth token is provided #24294

Merged
merged 3 commits into from
Jan 31, 2023
Merged

Jitsi requests 'requires_client' capability if auth token is provided #24294

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bca2e73
Jitsi requests 'io.element.requires_client' capability if auth token …
Jan 23, 2023
54d8d15
Added a comment that Jitsi should request 'requires_client' capabilit…
Jan 25, 2023
377ed1e
Merge branch 'develop' into jitsi_requires_client_auth_token
maheichyk Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/vector/jitsi/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { ElementWidgetActions } from "matrix-react-sdk/src/stores/widgets/Elemen
import { logger } from "matrix-js-sdk/src/logger";
import { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
import { ElementWidgetCapabilities } from "matrix-react-sdk/src/stores/widgets/ElementWidgetCapabilities";

import { getVectorConfig } from "../getconfig";

Expand Down Expand Up @@ -98,6 +99,13 @@ const setupCompleted = (async (): Promise<string | void> => {

widgetApiReady = new Promise<void>((resolve) => widgetApi.once("ready", resolve));
widgetApi.requestCapabilities(VideoConferenceCapabilities);

// jitsi cannot work in a popup if auth token is provided because widgetApi is not available there
// so check the token and request the 'requires_client' capability to hide the popup icon in the Element
if (qsParam("auth", true) === "openidtoken-jwt") {
widgetApi.requestCapability(ElementWidgetCapabilities.RequiresClient);
}

widgetApi.start();

const handleAction = (
Expand Down