Factor out shield display rules into one file

src/components/structures/RoomView.js

@@ -56,6 +56,7 @@ import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { shieldStatusForMembership } from '../../utils/ShieldUtils';
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -818,45 +819,9 @@ export default createReactClass({
             return;
         }
 
-        // Duplication between here and _updateE2eStatus in RoomTile
         /* At this point, the user has encryption on and cross-signing on */
-        const e2eMembers = await room.getEncryptionTargetMembers();
-        const verified = [];
-        const unverified = [];
-        e2eMembers.map(({userId}) => userId)
-            .filter((userId) => userId !== this.context.getUserId())
-            .forEach((userId) => {
-                (this.context.checkUserTrust(userId).isCrossSigningVerified() ?
-                verified : unverified).push(userId);
-            });
-
-        debuglog("e2e verified", verified, "unverified", unverified);
-
-        /* Check all verified user devices. */
-        /* Don't alarm if no other users are verified  */
-        const isDM = !!DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-        const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
-                            !isDM &&                    // Don't alarm for self in DMs with other users
-                            (e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
-                            (e2eMembers.length == 1);   // Do alarm for self if we're alone in a room
-        const targets = includeUser ? [...verified, this.context.getUserId()] : verified;
-        for (const userId of targets) {
-            const devices = await this.context.getStoredDevicesForUser(userId);
-            const anyDeviceNotVerified = devices.some(({deviceId}) => {
-                return !this.context.checkDeviceTrust(userId, deviceId).isVerified();
-            });
-            if (anyDeviceNotVerified) {
         this.setState({
-                    e2eStatus: "warning",
+            e2eStatus: await shieldStatusForMembership(this.context, room),
-                });
-                debuglog("e2e status set to warning as not all users trust all of their sessions." +
-                         " Aborted on user", userId);
-                return;
-            }
-        }
-
-        this.setState({
-            e2eStatus: unverified.length === 0 ? "verified" : "normal",
         });
     },
 

src/components/views/rooms/RoomTile.js

@@ -37,6 +37,7 @@ import E2EIcon from './E2EIcon';
 import InviteOnlyIcon from './InviteOnlyIcon';
 // eslint-disable-next-line camelcase
 import rate_limited_func from '../../../ratelimitedfunc';
+import { shieldStatusForMembership } from '../../../utils/ShieldUtils';
 
 export default createReactClass({
     displayName: 'RoomTile',
@@ -154,40 +155,9 @@ export default createReactClass({
             return;
         }
 
-        // Duplication between here and _updateE2eStatus in RoomView
+        /* At this point, the user has encryption on and cross-signing on */
-        const e2eMembers = await this.props.room.getEncryptionTargetMembers();
-        const verified = [];
-        const unverified = [];
-        e2eMembers.map(({userId}) => userId)
-            .filter((userId) => userId !== cli.getUserId())
-            .forEach((userId) => {
-                (cli.checkUserTrust(userId).isCrossSigningVerified() ?
-                verified : unverified).push(userId);
-            });
-
-        /* Check all verified user devices. */
-        /* Don't alarm if no other users are verified  */
-        const isDM = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-        const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
-                            !isDM &&                    // Don't alarm for self in DMs with other users
-                            (e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
-                            (e2eMembers.length == 1);   // Do alarm for self if we're alone in a room
-        const targets = includeUser ? [...verified, cli.getUserId()] : verified;
-        for (const userId of targets) {
-            const devices = await cli.getStoredDevicesForUser(userId);
-            const allDevicesVerified = devices.every(({deviceId}) => {
-                return cli.checkDeviceTrust(userId, deviceId).isVerified();
-            });
-            if (!allDevicesVerified) {
         this.setState({
-                    e2eStatus: "warning",
+            e2eStatus: await shieldStatusForMembership(cli, this.props.room),
-                });
-                return;
-            }
-        }
-
-        this.setState({
-            e2eStatus: unverified.length === 0 ? "verified" : "normal",
         });
     },
 

src/utils/ShieldUtils.ts

@@ -0,0 +1,45 @@
+import DMRoomMap from './DMRoomMap';
+
+/* For now, a cut-down type spec for the client */
+interface Client {
+    getUserId: () => string;
+    checkUserTrust: (userId: string) => {
+        isCrossSigningVerified: () => boolean
+    };
+    getStoredDevicesForUser: (userId: string) => Promise<[{ deviceId: string }]>;
+    checkDeviceTrust: (userId: string, deviceId: string) => {
+        isVerified: () => boolean
+    }
+}
+
+export async function shieldStatusForMembership(client: Client, room) {
+    const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
+    const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+
+    const verified = [];
+    const unverified = [];
+    members.filter((userId) => userId !== client.getUserId())
+        .forEach((userId) => {
+            (client.checkUserTrust(userId).isCrossSigningVerified() ?
+            verified : unverified).push(userId);
+        });
+
+    /* Check all verified user devices. */
+    /* Don't alarm if no other users are verified  */
+    const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
+                        !inDMMap &&                 // Don't alarm for self in DMs with other users
+                        (members.length != 2) || // Don't alarm for self in 1:1 chats with other users
+                        (members.length == 1);   // Do alarm for self if we're alone in a room
+    const targets = includeUser ? [...verified, client.getUserId()] : verified;
+    for (const userId of targets) {
+        const devices = await client.getStoredDevicesForUser(userId);
+        const anyDeviceNotVerified = devices.some(({deviceId}) => {
+            return !client.checkDeviceTrust(userId, deviceId).isVerified();
+        });
+        if (anyDeviceNotVerified) {
+            return "warning";
+        }
+    }
+
+    return unverified.length === 0 ? "verified" : "normal";
+}