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

Continuation 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-09-28 10:50:31 +01:00
parent e3b0bf1915
commit 30d2e61a0d
3 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/FromWidgetPostMessageApi.js
View File

@ -259,6 +259,7 @@ export default class FromWidgetPostMessageApi {
sendResponse(event, res) {
const data = objectClone(event.data);
data.response = res;
if (!event.source) return; // source may have gone away since
event.source.postMessage(data, event.origin);
}

12
src/components/views/dialogs/ModalWidgetDialog.tsx
View File

@ -83,9 +83,11 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
public render() {
// TODO: Don't violate every single security principle
const widgetId = encodeURIComponent(this.getWidgetId());
const parentUrl = encodeURIComponent(window.location.href);
const widgetUrl = `${this.props.widgetDefinition.url}?widgetId=${widgetId}&parentUrl=${parentUrl}`;
const widgetUrl = new URL(this.props.widgetDefinition.url);
// TODO: Replace these with proper widget params
// See https://github.com/matrix-org/matrix-doc/pull/1958/files#r405714833
widgetUrl.searchParams.set("widgetId", this.getWidgetId());
widgetUrl.searchParams.set("parentUrl", window.location.href);
let buttons;
if (this.props.widgetDefinition.buttons) {
@ -124,10 +126,10 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
<div>
<iframe
ref={this.appFrame}
sandbox="allow-forms allow-scripts"
// sandbox="allow-forms allow-scripts"
width={700} // TODO
height={450} // TODO
src={widgetUrl}
src={widgetUrl.toString()}
onLoad={this.onLoad}
/>
</div>

35
src/widgets/WidgetApi.ts
View File

@ -126,32 +126,32 @@ export class WidgetApi extends EventEmitter {
if (payload.api === WidgetApiType.ToWidget && payload.action) {
console.log(`[WidgetAPI] Got request: ${JSON.stringify(payload)}`);
if (payload.action === KnownWidgetActions.GetCapabilities) {
switch (payload.action) {
case KnownWidgetActions.GetCapabilities:
this.onCapabilitiesRequest(<ToWidgetRequest>payload);
if (!this.expectingExplicitReady) {
this.readyPromiseResolve();
}
} else if (payload.action === KnownWidgetActions.ClientReady) {
break;
case KnownWidgetActions.ClientReady:
this.readyPromiseResolve();
// Automatically acknowledge so we can move on
this.replyToRequest(<ToWidgetRequest>payload, {});
} else if (payload.action === KnownWidgetActions.Terminate) {
// Finalization needs to be async, so postpone with a promise
let finalizePromise = Promise.resolve();
const wait = (promise) => {
finalizePromise = finalizePromise.then(() => promise);
};
this.emit('terminate', wait);
Promise.resolve(finalizePromise).then(() => {
// Acknowledge that we're shut down now
this.replyToRequest(<ToWidgetRequest>payload, {});
});
} else if (payload.action === KnownWidgetActions.ReceiveOpenIDCredentials) {
break;
case KnownWidgetActions.ReceiveOpenIDCredentials:
// Save OpenID credentials
this.setOpenIDCredentials(<ToWidgetRequest>payload);
this.replyToRequest(<ToWidgetRequest>payload, {});
} else if (payload.action === KnownWidgetActions.GetWidgetConfig) {
break;
// Ack, handle by caller
case KnownWidgetActions.Terminate:
case KnownWidgetActions.ButtonClicked:
case KnownWidgetActions.GetWidgetConfig:
case KnownWidgetActions.CloseModalWidget: {
// Finalization needs to be async, so postpone with a promise
let finalizePromise = Promise.resolve();
const wait = (promise) => {
@ -162,7 +162,10 @@ export class WidgetApi extends EventEmitter {
// Acknowledge that we're shut down now
this.replyToRequest(<ToWidgetRequest>payload, {});
});
} else {
break;
}
default:
console.warn(`[WidgetAPI] Got unexpected action: ${payload.action}`);
}
} else if (payload.api === WidgetApiType.FromWidget && this.inFlightRequests[payload.requestId]) {