PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use new accessors for VerificationRequest (#11092)

Browse source 
* Switch verification request accessors to go via CryptoApi

part of https://github.com/vector-im/crypto-internal/issues/97

* Update references to `requestVerification`

https://github.com/vector-im/crypto-internal/issues/98
This commit is contained in:
Richard van der Hoff 2023-06-16 11:27:56 +01:00 committed by GitHub
parent dd46db4817
commit 06fa49a9da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/auth/SetupEncryptionBody.tsx
View file

@ -89,7 +89,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
private onVerifyClick = (): void => {
const cli = MatrixClientPeg.safeGet();
const userId = cli.getSafeUserId();
const requestPromise = cli.requestVerification(userId);
const requestPromise = cli.getCrypto()!.requestOwnUserVerification();
// We need to call onFinished now to close this dialog, and
// again later to signal that the verification is complete.

2
src/components/views/settings/devices/useOwnDevices.ts
View file

@ -177,7 +177,7 @@ export const useOwnDevices = (): DevicesState => {
const requestDeviceVerification =
isCurrentDeviceVerified && userId
? async (deviceId: ExtendedDevice["device_id"]): Promise<VerificationRequest> => {
return await matrixClient.requestVerification(userId, [deviceId]);
return await matrixClient.getCrypto()!.requestDeviceVerification(userId, deviceId);
}
: undefined;

2
src/stores/SetupEncryptionStore.ts
View file

@ -66,7 +66,7 @@ export class SetupEncryptionStore extends EventEmitter {
cli.on(CryptoEvent.VerificationRequest, this.onVerificationRequest);
cli.on(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged);
const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId()!);
const requestsInProgress = cli.getCrypto()!.getVerificationRequestsToDeviceInProgress(cli.getUserId()!);
if (requestsInProgress.length) {
// If there are multiple, we take the most recent. Equally if the user sends another request from
// another device after this screen has been shown, we'll switch to the new one, so this

2
src/verification.ts
View file

@ -120,6 +120,6 @@ export function pendingVerificationRequestForUser(
): VerificationRequest | undefined {
const dmRoom = findDMForUser(matrixClient, user.userId);
if (dmRoom) {
return matrixClient.findVerificationRequestDMInProgress(dmRoom.roomId);
return matrixClient.getCrypto()!.findVerificationRequestDMInProgress(dmRoom.roomId);
}
}

6
test/components/views/settings/tabs/user/SessionManagerTab-test.tsx
View file

@ -18,7 +18,7 @@ import React from "react";
import { act, fireEvent, render, RenderResult } from "@testing-library/react";
import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
import { logger } from "matrix-js-sdk/src/logger";
import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
import { VerificationRequest } from "matrix-js-sdk/src/crypto-api";
import { defer, sleep } from "matrix-js-sdk/src/utils";
import {
ClientEvent,
@ -88,6 +88,7 @@ describe("<SessionManagerTab />", () => {
const mockCrypto = mocked({
getDeviceVerificationStatus: jest.fn(),
requestDeviceVerification: jest.fn().mockResolvedValue(mockVerificationRequest),
} as unknown as CryptoApi);
const mockClient = getMockClientWithEventEmitter({
@ -96,7 +97,6 @@ describe("<SessionManagerTab />", () => {
getDevices: jest.fn(),
getStoredDevice: jest.fn(),
getDeviceId: jest.fn().mockReturnValue(deviceId),
requestVerification: jest.fn().mockResolvedValue(mockVerificationRequest),
deleteMultipleDevices: jest.fn(),
generateClientSecret: jest.fn(),
setDeviceDetails: jest.fn(),
@ -531,7 +531,7 @@ describe("<SessionManagerTab />", () => {
// click verify button from current session section
fireEvent.click(getByTestId(`verification-status-button-${alicesMobileDevice.device_id}`));
expect(mockClient.requestVerification).toHaveBeenCalledWith(aliceId, [alicesMobileDevice.device_id]);
expect(mockCrypto.requestDeviceVerification).toHaveBeenCalledWith(aliceId, alicesMobileDevice.device_id);
expect(modalSpy).toHaveBeenCalled();
});