From 5f8e86197fe9677f5beee125da25921887a601b6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 1 Aug 2017 12:00:03 +0100
Subject: [PATCH] Check that wurl is scalar, before checking for curl

---
 src/components/views/elements/AppPermission.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index cd9b599655..dbdf74dbbc 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -19,7 +19,7 @@ export default class AppPermission extends React.Component {
 
         const searchParams = new URLSearchParams(wurl.search);
 
-        if(searchParams && searchParams.get('url')) {
+        if(this.isScalarWurl(wurl) && searchParams && searchParams.get('url')) {
             curl = url.parse(searchParams.get('url'));
             if(curl) {
                 curl.search = curl.query = "";
@@ -33,6 +33,18 @@ export default class AppPermission extends React.Component {
         return curlString;
     }
 
+    isScalarWurl(wurl) {
+        if(wurl && wurl.hostname && (
+            wurl.hostname === 'scalar.vector.im' ||
+            wurl.hostname === 'scalar-staging.riot.im' ||
+            wurl.hostname === 'demo.riot.im' ||
+            wurl.hostname === 'localhost'
+        )) {
+            return true;
+        }
+        return false;
+    }
+
     render() {
         return (
             <div className='mx_AppPermissionWarning'>