rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle all URL param flags the same way

Browse Source
This commit is contained in:
Robin
2023-09-19 07:11:39 -04:00
parent 4253963b95
commit 63f4086f98
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/UrlParams.ts
View File

@@ -146,10 +146,6 @@ class ParamParser {
// Normally, URL params should be encoded in the fragment so as to avoid // Normally, URL params should be encoded in the fragment so as to avoid
// leaking them to the server. However, we also check the normal query // leaking them to the server. However, we also check the normal query
// string for backwards compatibility with versions that only used that. // string for backwards compatibility with versions that only used that.
hasParam(name: string): boolean {
return this.fragmentParams.has(name) || this.queryParams.has(name);
}
getParam(name: string): string | null { getParam(name: string): string | null {
return this.fragmentParams.get(name) ?? this.queryParams.get(name); return this.fragmentParams.get(name) ?? this.queryParams.get(name);
} }
@@ -160,6 +156,11 @@ class ParamParser {
...this.queryParams.getAll(name), ...this.queryParams.getAll(name),
]; ];
} }
getFlagParam(name: string, defaultValue = false): boolean {
const param = this.getParam(name);
return param === null ? defaultValue : param !== "false";
}
} }
/** /**
@@ -183,14 +184,13 @@ export const getUrlParams = (
roomId: parser.getParam("roomId"), roomId: parser.getParam("roomId"),
password: parser.getParam("password"), password: parser.getParam("password"),
// This flag has 'embed' as an alias for historical reasons // This flag has 'embed' as an alias for historical reasons
confineToRoom: parser.hasParam("confineToRoom") || parser.hasParam("embed"), confineToRoom:
// Defaults to true parser.getFlagParam("confineToRoom") || parser.getFlagParam("embed"),
appPrompt: parser.getParam("appPrompt") !== "false", appPrompt: parser.getFlagParam("appPrompt", true),
preload: parser.hasParam("preload"), preload: parser.getFlagParam("preload"),
hideHeader: parser.hasParam("hideHeader"), hideHeader: parser.getFlagParam("hideHeader"),
hideScreensharing: parser.hasParam("hideScreensharing"), hideScreensharing: parser.getFlagParam("hideScreensharing"),
// Defaults to true e2eEnabled: parser.getFlagParam("enableE2e", true),
e2eEnabled: parser.getParam("enableE2e") !== "false",
userId: parser.getParam("userId"), userId: parser.getParam("userId"),
displayName: parser.getParam("displayName"), displayName: parser.getParam("displayName"),
deviceId: parser.getParam("deviceId"), deviceId: parser.getParam("deviceId"),
@@ -199,7 +199,7 @@ export const getUrlParams = (
fonts: parser.getAllParams("font"), fonts: parser.getAllParams("font"),
fontScale: Number.isNaN(fontScale) ? null : fontScale, fontScale: Number.isNaN(fontScale) ? null : fontScale,
analyticsID: parser.getParam("analyticsID"), analyticsID: parser.getParam("analyticsID"),
allowIceFallback: parser.hasParam("allowIceFallback"), allowIceFallback: parser.getFlagParam("allowIceFallback"),
}; };
}; };