From 4f4340229966ecadd8ab193a1de7cbb482fd0183 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Sep 2023 16:29:46 +0100 Subject: [PATCH] Log an error if we don't have the key when generating a url for en e2ee room --- src/room/AppSelectionModal.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/room/AppSelectionModal.tsx b/src/room/AppSelectionModal.tsx index 80e2871b..10081189 100644 --- a/src/room/AppSelectionModal.tsx +++ b/src/room/AppSelectionModal.tsx @@ -18,9 +18,10 @@ import { FC, MouseEvent, useCallback, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import { Button, Text } from "@vector-im/compound-web"; import { ReactComponent as PopOutIcon } from "@vector-im/compound-design-tokens/icons/pop-out.svg"; +import { logger } from "matrix-js-sdk/src/logger"; import { Modal } from "../Modal"; -import { useRoomSharedKey } from "../e2ee/sharedKeyManagement"; +import { useIsRoomE2EE, useRoomSharedKey } from "../e2ee/sharedKeyManagement"; import { getAbsoluteRoomUrl } from "../matrix-utils"; import styles from "./AppSelectionModal.module.css"; import { editFragmentQuery } from "../UrlParams"; @@ -43,6 +44,13 @@ export const AppSelectionModal: FC = ({ roomId }) => { ); const roomSharedKey = useRoomSharedKey(roomId ?? ""); + const roomIsEncrypted = useIsRoomE2EE(roomId ?? ""); + if (roomIsEncrypted && roomSharedKey === undefined) { + logger.error( + "Generating app redirect URL for encrypted room but don't have key available!" + ); + } + const appUrl = useMemo(() => { // If the room ID is not known, fall back to the URL of the current page // Also, we don't really know the room name at this stage as we haven't