OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5443 from matrix-org/travis/fix-permissions 

Fix existing widgets not having approved capabilities for their function
pull/21833/head
Travis Ralston 2020-11-26 07:00:23 -07:00 committed by GitHub
parent 1db130b8f0 3780afff7d
commit 32b7e795f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stores/widgets/StopGapWidgetDriver.ts
View File

@ -16,6 +16,7 @@
import { import {
Capability, Capability,
EventDirection,
IOpenIDCredentials, IOpenIDCredentials,
IOpenIDUpdate, IOpenIDUpdate,
ISendEventDetails, ISendEventDetails,
@ -24,6 +25,7 @@ import {
SimpleObservable, SimpleObservable,
Widget, Widget,
WidgetDriver, WidgetDriver,
WidgetEventCapability,
WidgetKind, WidgetKind,
} from "matrix-widget-api"; } from "matrix-widget-api";
import { iterableDiff, iterableUnion } from "../../utils/iterables"; import { iterableDiff, iterableUnion } from "../../utils/iterables";
@ -37,6 +39,8 @@ import WidgetCapabilitiesPromptDialog, {
getRememberedCapabilitiesForWidget, getRememberedCapabilitiesForWidget,
} from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog"; } from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions"; import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions";
import { WidgetType } from "../../widgets/WidgetType";
import { EventType } from "matrix-js-sdk/src/@types/event";
// TODO: Purge this from the universe // TODO: Purge this from the universe
@ -51,6 +55,15 @@ export class StopGapWidgetDriver extends WidgetDriver {
// spew screenshots at us and can't request screenshots of us, so it's up to us to provide the // spew screenshots at us and can't request screenshots of us, so it's up to us to provide the
// button if the widget says it supports screenshots. // button if the widget says it supports screenshots.
this.allowedCapabilities = new Set([...allowedCapabilities, MatrixCapabilities.Screenshots]); this.allowedCapabilities = new Set([...allowedCapabilities, MatrixCapabilities.Screenshots]);
// Grant the permissions that are specific to given widget types
if (WidgetType.JITSI.matches(this.forWidget.type) && forWidgetKind === WidgetKind.Room) {
this.allowedCapabilities.add(MatrixCapabilities.AlwaysOnScreen);
} else if (WidgetType.STICKERPICKER.matches(this.forWidget.type) && forWidgetKind === WidgetKind.Account) {
const stickerSendingCap = WidgetEventCapability.forRoomEvent(EventDirection.Send, EventType.Sticker).raw;
this.allowedCapabilities.add(MatrixCapabilities.StickerSending); // legacy as far as MSC2762 is concerned
this.allowedCapabilities.add(stickerSendingCap);
}
} }
public async validateCapabilities(requested: Set<Capability>): Promise<Set<Capability>> { public async validateCapabilities(requested: Set<Capability>): Promise<Set<Capability>> {