Persist and maintain identity server in account data

src/components/structures/MatrixChat.js

@@ -446,6 +446,29 @@ export default React.createClass({
         }
 
         switch (payload.action) {
+            case 'MatrixActions.accountData':
+                // XXX: This is a collection of several hacks to solve a minor problem. We want to
+                // update our local state when the ID server changes, but don't want to put that in
+                // the js-sdk as we'd be then dictating how all consumers need to behave. However,
+                // this component is already bloated and we probably don't want this tiny logic in
+                // here, but there's no better place in the react-sdk for it. Additionally, we're
+                // abusing the MatrixActionCreator stuff to avoid errors on dispatches.
+                if (payload.event_type === 'm.identity_server') {
+                    const fullUrl = payload.event_content ? payload.event_content['base_url'] : null;
+                    if (!fullUrl) {
+                        MatrixClientPeg.get().setIdentityServerUrl(null);
+                        localStorage.removeItem("mx_is_access_token");
+                        localStorage.removeItem("mx_is_url");
+                    } else {
+                        MatrixClientPeg.get().setIdentityServerUrl(fullUrl);
+                        localStorage.removeItem("mx_is_access_token"); // clear token
+                        localStorage.setItem("mx_is_url", fullUrl); // XXX: Do we still need this?
+                    }
+
+                    // redispatch the change with a more specific action
+                    dis.dispatch({action: 'id_server_changed'});
+                }
+                break;
             case 'logout':
                 Lifecycle.logout();
                 break;

src/components/views/elements/ReplyThread.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2017 New Vector Ltd
+Copyright 2019 Michael Telatynski <[email protected]>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -176,6 +177,9 @@ export default class ReplyThread extends React.Component {
     componentWillMount() {
         this.unmounted = false;
         this.room = this.context.matrixClient.getRoom(this.props.parentEv.getRoomId());
+        this.room.on("Room.redaction", this.onRoomRedaction);
+        // same event handler as Room.redaction as for both we just do forceUpdate
+        this.room.on("Room.redactionCancelled", this.onRoomRedaction);
         this.initialize();
     }
 
@@ -185,8 +189,21 @@ export default class ReplyThread extends React.Component {
 
     componentWillUnmount() {
         this.unmounted = true;
+        if (this.room) {
+            this.room.removeListener("Room.redaction", this.onRoomRedaction);
+            this.room.removeListener("Room.redactionCancelled", this.onRoomRedaction);
+        }
     }
 
+    onRoomRedaction = (ev, room) => {
+        if (this.unmounted) return;
+
+        // If one of the events we are rendering gets redacted, force a re-render
+        if (this.state.events.some(event => event.getId() === ev.getId())) {
+            this.forceUpdate();
+        }
+    };
+
     async initialize() {
         const {parentEv} = this.props;
         // at time of making this component we checked that props.parentEv has a parentEventId
@@ -298,11 +315,13 @@ export default class ReplyThread extends React.Component {
 
             return <blockquote className="mx_ReplyThread" key={ev.getId()}>
                 { dateSep }
-                <EventTile mxEvent={ev}
-                           tileShape="reply"
-                           onHeightChanged={this.props.onHeightChanged}
-                           permalinkCreator={this.props.permalinkCreator}
-                           isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
+                <EventTile
+                    mxEvent={ev}
+                    tileShape="reply"
+                    onHeightChanged={this.props.onHeightChanged}
+                    permalinkCreator={this.props.permalinkCreator}
+                    isRedacted={ev.isRedacted()}
+                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
             </blockquote>;
         });
 

src/components/views/settings/SetIdServer.js

@@ -106,6 +106,31 @@ export default class SetIdServer extends React.Component {
         };
     }
 
+    componentDidMount(): void {
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    componentWillUnmount(): void {
+        dis.unregister(this.dispatcherRef);
+    }
+
+    onAction = (payload) => {
+        // We react to changes in the ID server in the event the user is staring at this form
+        // when changing their identity server on another device. If the user is trying to change
+        // it in two places, we'll end up stomping all over their input, but at that point we
+        // should question our UX which led to them doing that.
+        if (payload.action !== "id_server_changed") return;
+
+        const fullUrl = MatrixClientPeg.get().getIdentityServerUrl();
+        let abbr = '';
+        if (fullUrl) abbr = abbreviateUrl(fullUrl);
+
+        this.setState({
+            currentClientIdServer: fullUrl,
+            idServer: abbr,
+        });
+    };
+
     _onIdentityServerChanged = (ev) => {
         const u = ev.target.value;
 
@@ -131,10 +156,10 @@ export default class SetIdServer extends React.Component {
     };
 
     _continueTerms = (fullUrl) => {
-        MatrixClientPeg.get().setIdentityServerUrl(fullUrl);
-        localStorage.removeItem("mx_is_access_token");
-        localStorage.setItem("mx_is_url", fullUrl);
-        dis.dispatch({action: 'id_server_changed'});
+        // Account data change will update localstorage, client, etc through dispatcher
+        MatrixClientPeg.get().setAccountData("m.identity_server", {
+            base_url: fullUrl,
+        });
         this.setState({idServer: '', busy: false, error: null});
     };
 
@@ -237,9 +262,10 @@ export default class SetIdServer extends React.Component {
     };
 
     _disconnectIdServer = () => {
-        MatrixClientPeg.get().setIdentityServerUrl(null);
-        localStorage.removeItem("mx_is_access_token");
-        localStorage.removeItem("mx_is_url");
+        // Account data change will update localstorage, client, etc through dispatcher
+        MatrixClientPeg.get().setAccountData("m.identity_server", {
+            base_url: null, // clear
+        });
 
         let newFieldVal = '';
         if (SdkConfig.get()['validated_server_config']['isUrl']) {