imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Scalar Widget URL check to WidgetUtils

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2018-05-27 11:12:55 -06:00
parent 23162c8625
commit 98613748b6
3 changed files with 38 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/views/elements/AppPermission.js
View file

@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import url from 'url';
import { _t } from '../../../languageHandler';
import SdkConfig from '../../../SdkConfig';
import WidgetUtils from "../../../WidgetUtils";
export default class AppPermission extends React.Component {
constructor(props) {
@ -20,7 +21,7 @@ export default class AppPermission extends React.Component {
const searchParams = new URLSearchParams(wurl.search);
if (this.isScalarWurl(wurl) && searchParams && searchParams.get('url')) {
if (WidgetUtils.isScalarUrl(wurl) && searchParams && searchParams.get('url')) {
curl = url.parse(searchParams.get('url'));
if (curl) {
curl.search = curl.query = "";
@ -34,26 +35,6 @@ export default class AppPermission extends React.Component {
return curlString;
}
isScalarWurl(wurl) {
// Exit early if we've been given bad data
if (!wurl) {
return false;
}
let scalarUrls = SdkConfig.get().integrations_widgets_urls;
if (!scalarUrls || scalarUrls.length == 0) {
scalarUrls = [SdkConfig.get().integrations_rest_url];
}
const url = wurl.format();
for (const scalarUrl of scalarUrls) {
if (url.startsWith(scalarUrl)) {
return true;
}
}
return false;
}
render() {
let e2eWarningText;
if (this.props.isRoomEncrypted) {