Merge pull request #6685 from matrix-org/travis/fix-widget-remember

Fix client forgetting which capabilities a widget was approved for

src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx

@@ -31,14 +31,6 @@ import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { CapabilityText } from "../../../widgets/CapabilityText";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-export function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
- return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
-}
-
-function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
- localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
-}
-
 interface IProps extends IDialogProps {
  requestedCapabilities: Set<Capability>;
  widget: Widget;
@@ -95,10 +87,7 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
  };
 
  private closeAndTryRemember(approved: Capability[]) {
- if (this.state.rememberSelection) {
- setRememberedCapabilitiesForWidget(this.props.widget, approved);
- }
- this.props.onFinished({ approved });
+ this.props.onFinished({ approved, remember: this.state.rememberSelection });
  }
 
  public render() {

src/stores/widgets/StopGapWidgetDriver.ts

@@ -33,9 +33,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import ActiveRoomObserver from "../../ActiveRoomObserver";
 import Modal from "../../Modal";
 import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog";
-import WidgetCapabilitiesPromptDialog, {
- getRememberedCapabilitiesForWidget,
-} from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
+import WidgetCapabilitiesPromptDialog from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
 import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions";
 import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
 import { WidgetType } from "../../widgets/WidgetType";
@@ -48,6 +46,14 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 // TODO: Purge this from the universe
 
+function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
+ return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
+}
+
+function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
+ localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
+}
+
 export class StopGapWidgetDriver extends WidgetDriver {
  private allowedCapabilities: Set<Capability>;
 
@@ -100,6 +106,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
  }
  }
  // TODO: Do something when the widget requests new capabilities not yet asked for
+ let rememberApproved = false;
  if (missing.size > 0) {
  try {
  const [result] = await Modal.createTrackedDialog(
@@ -111,12 +118,19 @@ export class StopGapWidgetDriver extends WidgetDriver {
  widgetKind: this.forWidgetKind,
  }).finished;
  (result.approved || []).forEach(cap => allowedSoFar.add(cap));
+ rememberApproved = result.remember;
  } catch (e) {
  console.error("Non-fatal error getting capabilities: ", e);
  }
  }
 
- return new Set(iterableUnion(allowedSoFar, requested));
+ const allAllowed = new Set(iterableUnion(allowedSoFar, requested));
+
+ if (rememberApproved) {
+ setRememberedCapabilitiesForWidget(this.forWidget, Array.from(allAllowed));
+ }
+
+ return allAllowed;
  }
 
  public async sendEvent(eventType: string, content: any, stateKey: string = null): Promise<ISendEventDetails> {