imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify isDeviceVerified definitions (#10594)

Browse source 
* Simplify `isDeviceVerified` definitions

Currently, we have two similar but different definitions of `isDeviceVerified`,
and they both do a lot of wrangling that relies on js-sdk internals. We can
simplify it a lot by just calling `MatrixClientPeg.checkDeviceTrust`.

* fix tests

* more test fixes
This commit is contained in:
Richard van der Hoff 2023-04-14 10:46:37 +01:00 • committed by GitHub
parent e4ebcf5731
commit 70b87f8bde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/toasts/UnverifiedSessionToast-test.tsx
View file

@ -20,7 +20,7 @@ import userEvent from "@testing-library/user-event";
import { mocked, Mocked } from "jest-mock";
import { IMyDevice, MatrixClient } from "matrix-js-sdk/src/matrix";
import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning";
import { DeviceTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning";
import dis from "../../src/dispatcher/dispatcher";
import { showToast } from "../../src/toasts/UnverifiedSessionToast";
@ -55,11 +55,7 @@ describe("UnverifiedSessionToast", () => {
return null;
});
client.getStoredCrossSigningForUser.mockReturnValue({
checkDeviceTrust: jest.fn().mockReturnValue({
isCrossSigningVerified: jest.fn().mockReturnValue(true),
}),
} as unknown as CrossSigningInfo);
client.checkDeviceTrust.mockReturnValue(new DeviceTrustLevel(true, false, false, false));
jest.spyOn(dis, "dispatch");
jest.spyOn(DeviceListener.sharedInstance(), "dismissUnverifiedSessions");
});