Kill off references to deprecated getStoredDevice and getStoredDevicesForUser

src/DeviceListener.ts

@@ -46,6 +46,7 @@ import { recordClientInformation, removeClientInformation } from "./utils/device
 import SettingsStore, { CallbackFn } from "./settings/SettingsStore";
 import { UIFeature } from "./settings/UIFeature";
 import { isBulkUnverifiedDeviceReminderSnoozed } from "./utils/device/snoozeBulkUnverifiedDeviceReminder";
+import { getUserDeviceIds } from "./utils/crypto/deviceInfo";
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 
@@ -161,12 +162,8 @@ export default class DeviceListener {
      */
     private async getDeviceIds(): Promise<Set<string>> {
         const cli = this.client;
-        const crypto = cli?.getCrypto();
-        if (crypto === undefined) return new Set();
-
-        const userId = cli!.getSafeUserId();
-        const devices = await crypto.getUserDeviceInfo([userId]);
-        return new Set(devices.get(userId)?.keys() ?? []);
+        if (!cli) return new Set();
+        return await getUserDeviceIds(cli, cli.getSafeUserId());
     }
 
     private onWillUpdateDevices = async (users: string[], initialFetch?: boolean): Promise<void> => {

src/SlashCommands.tsx

@@ -70,6 +70,7 @@ import { leaveRoomBehaviour } from "./utils/leave-behaviour";
 import { isLocalRoom } from "./utils/localRoom/isLocalRoom";
 import { SdkContextClass } from "./contexts/SDKContext";
 import { MatrixClientPeg } from "./MatrixClientPeg";
+import { getDeviceCryptoInfo } from "./utils/crypto/deviceInfo";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -1031,7 +1032,7 @@ export const Commands = [
 
                     return success(
                         (async (): Promise<void> => {
-                            const device = cli.getStoredDevice(userId, deviceId);
+                            const device = await getDeviceCryptoInfo(cli, userId, deviceId);
                             if (!device) {
                                 throw new UserFriendlyError(
                                     "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)",

src/components/structures/MatrixChat.tsx

@@ -1659,7 +1659,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             Modal.createDialog(KeySignatureUploadFailedDialog, { failures, source, continuation });
         });
 
-        cli.on(CryptoEvent.VerificationRequest, (request) => {
+        cli.on(CryptoEvent.VerificationRequestReceived, (request) => {
             if (request.verifier) {
                 Modal.createDialog(
                     IncomingSasDialog,

src/components/views/dialogs/devtools/VerificationExplorer.tsx

@@ -83,7 +83,7 @@ const VerificationExplorer: Tool = ({ onBack }: IDevtoolsProps) => {
     const cli = useContext(MatrixClientContext);
     const context = useContext(DevtoolsContext);
 
-    const requests = useTypedEventEmitterState(cli, CryptoEvent.VerificationRequest, () => {
+    const requests = useTypedEventEmitterState(cli, CryptoEvent.VerificationRequestReceived, () => {
         return (
             cli.crypto?.inRoomVerificationRequests["requestsByRoomId"]?.get(context.room.roomId) ??
             new Map<string, VerificationRequest>()

src/components/views/right_panel/VerificationPanel.tsx

@@ -36,6 +36,7 @@ import E2EIcon, { E2EState } from "../rooms/E2EIcon";
 import Spinner from "../elements/Spinner";
 import AccessibleButton from "../elements/AccessibleButton";
 import VerificationShowSas from "../verification/VerificationShowSas";
+import { getDeviceCryptoInfo } from "../../../utils/crypto/deviceInfo";
 
 interface IProps {
     layout: string;
@@ -224,12 +225,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
             return;
         }
         this.haveCheckedDevice = true;
-
-        const deviceMap = await client.getCrypto()?.getUserDeviceInfo([userId]);
-        if (!deviceMap) return;
-        const userDevices = deviceMap.get(userId);
-        if (!userDevices) return;
-        this.setState({ otherDeviceDetails: userDevices.get(deviceId) });
+        this.setState({ otherDeviceDetails: await getDeviceCryptoInfo(client, userId, deviceId) });
     }
 
     private renderQRReciprocatePhase(): JSX.Element {

src/components/views/rooms/MemberTile.tsx

@@ -34,6 +34,7 @@ import DisambiguatedProfile from "../messages/DisambiguatedProfile";
 import UserIdentifierCustomisations from "../../../customisations/UserIdentifier";
 import { E2EState } from "./E2EIcon";
 import { asyncSome } from "../../../utils/arrays";
+import { getUserDeviceIds } from "../../../utils/crypto/deviceInfo";
 
 interface IProps {
     member: RoomMember;
@@ -127,9 +128,8 @@ export default class MemberTile extends React.Component<IProps, IState> {
             return;
         }
 
-        const devices = cli.getStoredDevicesForUser(userId);
-        const anyDeviceUnverified = await asyncSome(devices, async (device) => {
-            const { deviceId } = device;
+        const deviceIDs = await getUserDeviceIds(cli, userId);
+        const anyDeviceUnverified = await asyncSome(deviceIDs, async (deviceId) => {
             // For your own devices, we use the stricter check of cross-signing
             // verification to encourage everyone to trust their own devices via
             // cross-signing so that other users can then safely trust you.

src/components/views/toasts/VerificationRequestToast.tsx

@@ -20,8 +20,8 @@ import {
     VerificationRequest,
     VerificationRequestEvent,
 } from "matrix-js-sdk/src/crypto-api";
-import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
 import { logger } from "matrix-js-sdk/src/logger";
+import { Device } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -35,6 +35,7 @@ import { Action } from "../../../dispatcher/actions";
 import VerificationRequestDialog from "../dialogs/VerificationRequestDialog";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
+import { getDeviceCryptoInfo } from "../../../utils/crypto/deviceInfo";
 
 interface IProps {
     toastKey: string;
@@ -44,7 +45,7 @@ interface IProps {
 interface IState {
     /** number of seconds left in the timeout counter. Zero if there is no timeout. */
     counter: number;
-    device?: DeviceInfo;
+    device?: Device;
     ip?: string;
 }
 
@@ -74,15 +75,13 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         // a toast hanging around after logging in if you did a verification as part of login).
         this.checkRequestIsPending();
 
-        if (request.isSelfVerification) {
+        const otherDeviceId = request.otherDeviceId;
+        if (request.isSelfVerification && !!otherDeviceId) {
             const cli = MatrixClientPeg.safeGet();
-            const device = request.otherDeviceId ? await cli.getDevice(request.otherDeviceId) : null;
-            const ip = device?.last_seen_ip;
+            const device = await cli.getDevice(otherDeviceId);
             this.setState({
-                device:
-                    (request.otherDeviceId && cli.getStoredDevice(cli.getSafeUserId(), request.otherDeviceId)) ||
-                    undefined,
-                ip,
+                ip: device.last_seen_ip,
+                device: await getDeviceCryptoInfo(cli, cli.getSafeUserId(), otherDeviceId),
             });
         }
     }
@@ -158,7 +157,7 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         let detail;
         if (request.isSelfVerification) {
             if (this.state.device) {
-                description = this.state.device.getDisplayName();
+                description = this.state.device.displayName;
                 detail = _t("%(deviceId)s from %(ip)s", {
                     deviceId: this.state.device.deviceId,
                     ip: this.state.ip,

src/stores/SetupEncryptionStore.ts

@@ -64,7 +64,7 @@ export class SetupEncryptionStore extends EventEmitter {
         this.phase = Phase.Loading;
 
         const cli = MatrixClientPeg.safeGet();
-        cli.on(CryptoEvent.VerificationRequest, this.onVerificationRequest);
+        cli.on(CryptoEvent.VerificationRequestReceived, this.onVerificationRequest);
         cli.on(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged);
 
         const requestsInProgress = cli.getCrypto()!.getVerificationRequestsToDeviceInProgress(cli.getUserId()!);
@@ -87,7 +87,7 @@ export class SetupEncryptionStore extends EventEmitter {
 
         const cli = MatrixClientPeg.get();
         if (!!cli) {
-            cli.removeListener(CryptoEvent.VerificationRequest, this.onVerificationRequest);
+            cli.removeListener(CryptoEvent.VerificationRequestReceived, this.onVerificationRequest);
             cli.removeListener(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged);
         }
     }

src/stores/right-panel/RightPanelStore.ts

@@ -66,13 +66,13 @@ export default class RightPanelStore extends ReadyWatchingStore {
 
     protected async onReady(): Promise<any> {
         this.viewedRoomId = SdkContextClass.instance.roomViewStore.getRoomId();
-        this.matrixClient?.on(CryptoEvent.VerificationRequest, this.onVerificationRequestUpdate);
+        this.matrixClient?.on(CryptoEvent.VerificationRequestReceived, this.onVerificationRequestUpdate);
         this.loadCacheFromSettings();
         this.emitAndUpdateSettings();
     }
 
     protected async onNotReady(): Promise<any> {
-        this.matrixClient?.off(CryptoEvent.VerificationRequest, this.onVerificationRequestUpdate);
+        this.matrixClient?.off(CryptoEvent.VerificationRequestReceived, this.onVerificationRequestUpdate);
     }
 
     protected onDispatcherAction(payload: ActionPayload): void {

src/utils/crypto/deviceInfo.ts

@@ -0,0 +1,67 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Device, MatrixClient } from "matrix-js-sdk/src/matrix";
+
+/**
+ * Get crypto information on a specific device.
+ *
+ * Only devices with Crypto support are returned. If the MatrixClient doesn't support cryptography, `undefined` is
+ * returned.
+ *
+ * @param client  - Matrix Client.
+ * @param userId  - ID of the user owning the device.
+ * @param deviceId - ID of the device.
+ * @param downloadUncached - If true, download the device list for users whose device list we are not
+ *    currently tracking. Defaults to false.
+ *
+ * @returns Information on the device if it is known.
+ */
+export async function getDeviceCryptoInfo(
+    client: MatrixClient,
+    userId: string,
+    deviceId: string,
+    downloadUncached?: boolean,
+): Promise<Device | undefined> {
+    const crypto = client.getCrypto();
+    if (!crypto) {
+        // no crypto support, no device.
+        return undefined;
+    }
+
+    const deviceMap = await crypto.getUserDeviceInfo([userId], downloadUncached);
+    return deviceMap.get(userId)?.get(deviceId);
+}
+
+/**
+ * Get the IDs of the given user's devices.
+ *
+ * Only devices with Crypto support are returned. If the MatrixClient doesn't support cryptography, an empty Set is
+ * returned.
+ *
+ * @param client  - Matrix Client.
+ * @param userId  - ID of the user to query.
+ */
+
+export async function getUserDeviceIds(client: MatrixClient, userId: string): Promise<Set<string>> {
+    const crypto = client.getCrypto();
+    if (!crypto) {
+        return new Set();
+    }
+
+    const deviceMap = await crypto.getUserDeviceInfo([userId]);
+    return new Set(deviceMap.get(userId)?.keys() ?? []);
+}

test/components/views/right_panel/UserInfo-test.tsx

@@ -160,7 +160,6 @@ beforeEach(() => {
         credentials: {},
         setPowerLevel: jest.fn(),
         downloadKeys: jest.fn(),
-        getStoredDevicesForUser: jest.fn(),
         getCrypto: jest.fn().mockReturnValue(mockCrypto),
         getStoredCrossSigningForUser: jest.fn(),
     } as unknown as MatrixClient);

test/components/views/toasts/VerificationRequestToast-test.tsx

@@ -15,18 +15,23 @@ limitations under the License.
 */
 
 import React, { ComponentProps } from "react";
-import { Mocked } from "jest-mock";
+import { mocked, Mocked } from "jest-mock";
 import { act, render, RenderResult } from "@testing-library/react";
 import {
     VerificationRequest,
     VerificationRequestEvent,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
 import { IMyDevice, MatrixClient } from "matrix-js-sdk/src/client";
 import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter";
+import { Device } from "matrix-js-sdk/src/matrix";
 
 import VerificationRequestToast from "../../../../src/components/views/toasts/VerificationRequestToast";
-import { flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../test-utils";
+import {
+    flushPromises,
+    getMockClientWithEventEmitter,
+    mockClientMethodsCrypto,
+    mockClientMethodsUser,
+} from "../../../test-utils";
 import ToastStore from "../../../../src/stores/ToastStore";
 
 function renderComponent(
@@ -46,7 +51,7 @@ describe("VerificationRequestToast", () => {
     beforeEach(() => {
         client = getMockClientWithEventEmitter({
             ...mockClientMethodsUser(),
-            getStoredDevice: jest.fn(),
+            ...mockClientMethodsCrypto(),
             getDevice: jest.fn(),
         });
     });
@@ -56,9 +61,15 @@ describe("VerificationRequestToast", () => {
         const otherIDevice: IMyDevice = { device_id: otherDeviceId, last_seen_ip: "1.1.1.1" };
         client.getDevice.mockResolvedValue(otherIDevice);
 
-        const otherDeviceInfo = new DeviceInfo(otherDeviceId);
-        otherDeviceInfo.unsigned = { device_display_name: "my other device" };
-        client.getStoredDevice.mockReturnValue(otherDeviceInfo);
+        const otherDeviceInfo = new Device({
+            algorithms: [],
+            keys: new Map(),
+            userId: "",
+            deviceId: otherDeviceId,
+            displayName: "my other device",
+        });
+        const deviceMap = new Map([[client.getSafeUserId(), new Map([[otherDeviceId, otherDeviceInfo]])]]);
+        mocked(client.getCrypto()!.getUserDeviceInfo).mockResolvedValue(deviceMap);
 
         const request = makeMockVerificationRequest({
             isSelfVerification: true,

test/test-utils/client.ts

@@ -64,6 +64,8 @@ export class MockClientWithEventEmitter extends EventEmitter {
         getUserId: jest.fn().mockReturnValue(aliceId),
     });
  * ```
+ *
+ * See also `stubClient()` which does something similar but uses a more complete mock client.
  */
 export const getMockClientWithEventEmitter = (
     mockProperties: Partial<Record<keyof MatrixClient, unknown>>,
@@ -158,6 +160,7 @@ export const mockClientMethodsCrypto = (): Partial<
         getSessionBackupPrivateKey: jest.fn(),
     },
     getCrypto: jest.fn().mockReturnValue({
+        getUserDeviceInfo: jest.fn(),
         getCrossSigningStatus: jest.fn().mockResolvedValue({
             publicKeysOnDevice: true,
             privateKeysInSecretStorage: false,

test/test-utils/test-utils.ts

@@ -60,6 +60,8 @@ import MatrixClientBackedSettingsHandler from "../../src/settings/handlers/Matri
  * TODO: once the components are updated to get their MatrixClients from
  * the react context, we can get rid of this and just inject a test client
  * via the context instead.
+ *
+ * See also `getMockClientWithEventEmitter` which does something similar but different.
  */
 export function stubClient(): MatrixClient {
     const client = createTestClient();