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

Better support for widgets overriding their URLs

Browse source 
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
This commit is contained in:
David Baker 2020-04-01 10:00:33 +01:00
parent 78fd8e4569
commit 538147f7fa
6 changed files with 135 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/utils/AutoDiscoveryUtils.js
View file

@ -22,6 +22,7 @@ import {makeType} from "./TypeUtils";
import SdkConfig from '../SdkConfig';
const LIVELINESS_DISCOVERY_ERRORS = [
AutoDiscovery.ERROR_INVALID,
AutoDiscovery.ERROR_INVALID_HOMESERVER,
AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER,
];
@ -232,8 +233,8 @@ export default class AutoDiscoveryUtils {
const preferredHomeserverUrl = hsResult["base_url"];
let preferredHomeserverName = serverName ? serverName : hsResult["server_name"];
const url = new URL(preferredHomeserverUrl);
if (!preferredHomeserverName) preferredHomeserverName = url.hostname;
const url = preferredHomeserverUrl ? new URL(preferredHomeserverUrl) : null;
if (!preferredHomeserverName && url) preferredHomeserverName = url.hostname;
// It should have been set by now, so check it
if (!preferredHomeserverName) {
@ -241,10 +242,12 @@ export default class AutoDiscoveryUtils {
throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
}
const hsNameIsDifferent = url ? (url.hostname !== preferredHomeserverName) : null;
return makeType(ValidatedServerConfig, {
hsUrl: preferredHomeserverUrl,
hsName: preferredHomeserverName,
hsNameIsDifferent: url.hostname !== preferredHomeserverName,
hsNameIsDifferent,
isUrl: preferredIdentityUrl,
isDefault: false,
warning: hsResult.error,