sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Update e2e tests and header

Browse Source 
Don't add normalisation of widget headers either
This commit is contained in:
David Langley
2026-03-13 15:43:25 +00:00
parent 6aa454c646
commit 5d091e91c3
10 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/widget-lifecycle/element-web/src/WidgetLifecycleModule.ts
+3 -8
View File
@@ -6,11 +6,9 @@ Please see LICENSE files in the repository root for full details.
*/
import type { Api, Module, WidgetDescriptor, WidgetLifecycleApi } from "@element-hq/element-web-module-api";
import { CONFIG_KEY, parseWidgetLifecycleConfig, type WidgetLifecycleModuleConfig } from "./config";
import { constructWidgetPermissions } from "./utils/constructWidgetPermissions";
import { matchPattern } from "./utils/matchPattern";
import { normalizeWidgetUrl } from "./utils/normalizeWidgetUrl";
/** Subset of {@link WidgetLifecycleApi} used by the module for registration only. */
export type WidgetLifecycleApiAdapter = Pick<
@@ -53,14 +51,12 @@ export default class WidgetLifecycleModule implements Module {
}
private preapprovePreload(widget: WidgetDescriptor): boolean {
const normalizedUrl = normalizeWidgetUrl(widget.templateUrl);
const configuration = constructWidgetPermissions(this.config, normalizedUrl);
const configuration = constructWidgetPermissions(this.config, widget.templateUrl);
return configuration.preload_approved === true;
}
private preapproveIdentity(widget: WidgetDescriptor): boolean {
const normalizedUrl = normalizeWidgetUrl(widget.templateUrl);
const configuration = constructWidgetPermissions(this.config, normalizedUrl);
const configuration = constructWidgetPermissions(this.config, widget.templateUrl);
return configuration.identity_approved === true;
}
@@ -68,8 +64,7 @@ export default class WidgetLifecycleModule implements Module {
widget: WidgetDescriptor,
requestedCapabilities: Set<string>,
): Set<string> | undefined {
const normalizedUrl = normalizeWidgetUrl(widget.templateUrl);
const configuration = constructWidgetPermissions(this.config, normalizedUrl);
const configuration = constructWidgetPermissions(this.config, widget.templateUrl);
const capabilitiesApproved = configuration.capabilities_approved;
if (!capabilitiesApproved) return undefined;
modules/widget-lifecycle/element-web/src/index.ts
-1
View File
@@ -6,7 +6,6 @@ Please see LICENSE files in the repository root for full details.
*/
import type { ModuleFactory } from "@element-hq/element-web-module-api";
import WidgetLifecycleModule from "./WidgetLifecycleModule";
export default WidgetLifecycleModule satisfies ModuleFactory;
modules/widget-lifecycle/element-web/src/utils/constructWidgetPermissions.ts
+1
View File
@@ -1,5 +1,6 @@
/*
Copyright 2026 Element Creations Ltd.
Copyright 2023 Nordeck IT + Consulting GmbH
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
modules/widget-lifecycle/element-web/src/utils/matchPattern.ts
+1
View File
@@ -1,5 +1,6 @@
/*
Copyright 2026 Element Creations Ltd.
Copyright 2023 Nordeck IT + Consulting GmbH
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
modules/widget-lifecycle/element-web/src/utils/normalizeWidgetUrl.ts
-16
View File
@@ -1,16 +0,0 @@
/*
Copyright 2026 Element Creations Ltd.
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/
/**
* Strips query parameters and fragment from a widget URL for matching against config patterns.
*/
export function normalizeWidgetUrl(widgetUrl: string): string {
const url = new URL(widgetUrl);
url.search = "";
url.hash = "";
return url.toString();
}