Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Jitsi: Use integrations URL from config #2062

Merged
merged 2 commits into from
Jul 20, 2018
Merged

Jitsi: Use integrations URL from config #2062

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e95a8e8
Jitsi: Use integrations URL from config
dbkr Jul 16, 2018
22bde9f
Read jitsi widget URL from config
dbkr Jul 18, 2018
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
15 changes: 10 additions & 5 deletions src/CallHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import sdk from './index';
import { _t } from './languageHandler';
import Matrix from 'matrix-js-sdk';
import dis from './dispatcher';
import SdkConfig from './SdkConfig';
import { showUnknownDeviceDialogForCalls } from './cryptodevices';
import SettingsStore from "./settings/SettingsStore";
import WidgetUtils from './utils/WidgetUtils';
Expand Down Expand Up @@ -443,11 +444,15 @@ function _startCallApp(roomId, type) {
'avatarUrl=$matrix_avatar_url',
'email=$matrix_user_id',
].join('&');
const widgetUrl = (
'https://scalar.vector.im/api/widgets' +
'/jitsi.html?' +
queryString
);

let widgetUrl;
if (SdkConfig.get().integrations_jitsi_widget_url) {
// Try this config key. This probably isn't ideal as a way of discovering this
// URL, but this will at least allow the integration manager to not be hardcoded.
widgetUrl = SdkConfig.get().integrations_jitsi_widget_url + '?' + queryString;
} else {
widgetUrl = SdkConfig.get().integrations_rest_url + '/widgets/jitsi.html?' + queryString;
}

const widgetData = { widgetSessionId };

Expand Down