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

Commit

Permalink
Merge pull request #2062 from matrix-org/dbkr/use_configured_integ_url
Browse files Browse the repository at this point in the history
Jitsi: Use integrations URL from config
  • Loading branch information
dbkr committed Jul 20, 2018
2 parents a8a40f1 + 22bde9f commit fc29e89
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions src/CallHandler.js
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 @@ -474,11 +475,15 @@ async 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

0 comments on commit fc29e89

Please sign in to comment.