Absorb the matrix-react-sdk repository (#28192)
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com> Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Florian Duros <florian.duros@ormaz.fr> Co-authored-by: Kim Brose <kim.brose@nordeck.net> Co-authored-by: Florian Duros <florianduros@element.io> Co-authored-by: R Midhun Suresh <hi@midhun.dev> Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com> Co-authored-by: ElementRobot <releases@riot.im> Co-authored-by: dbkr <dbkr@users.noreply.github.com> Co-authored-by: David Baker <dbkr@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: David Langley <davidl@element.io> Co-authored-by: Michael Weimann <michaelw@matrix.org> Co-authored-by: Timshel <Timshel@users.noreply.github.com> Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com> Co-authored-by: Will Hunt <will@half-shot.uk> Co-authored-by: Hubert Chathi <hubert@uhoreg.ca> Co-authored-by: Andrew Ferrazzutti <andrewf@element.io> Co-authored-by: Robin <robin@robin.town> Co-authored-by: Tulir Asokan <tulir@maunium.net>
This commit is contained in:
committed by
GitHub
parent
2b99496025
commit
c05c429803
72
test/unit-tests/utils/crypto/deviceInfo-test.ts
Normal file
72
test/unit-tests/utils/crypto/deviceInfo-test.ts
Normal file
@@ -0,0 +1,72 @@
|
||||
/*
|
||||
Copyright 2024 New Vector Ltd.
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
|
||||
Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { Mocked, mocked } from "jest-mock";
|
||||
import { Device, MatrixClient } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import { getDeviceCryptoInfo, getUserDeviceIds } from "../../../../src/utils/crypto/deviceInfo";
|
||||
import { getMockClientWithEventEmitter, mockClientMethodsCrypto } from "../../../test-utils";
|
||||
|
||||
describe("getDeviceCryptoInfo()", () => {
|
||||
let mockClient: Mocked<MatrixClient>;
|
||||
|
||||
beforeEach(() => {
|
||||
mockClient = getMockClientWithEventEmitter({ ...mockClientMethodsCrypto() });
|
||||
});
|
||||
|
||||
it("should return undefined on clients with no crypto", async () => {
|
||||
jest.spyOn(mockClient, "getCrypto").mockReturnValue(undefined);
|
||||
await expect(getDeviceCryptoInfo(mockClient, "@user:id", "device_id")).resolves.toBeUndefined();
|
||||
});
|
||||
|
||||
it("should return undefined for unknown users", async () => {
|
||||
mocked(mockClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(new Map());
|
||||
await expect(getDeviceCryptoInfo(mockClient, "@user:id", "device_id")).resolves.toBeUndefined();
|
||||
});
|
||||
|
||||
it("should return undefined for unknown devices", async () => {
|
||||
mocked(mockClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(new Map([["@user:id", new Map()]]));
|
||||
await expect(getDeviceCryptoInfo(mockClient, "@user:id", "device_id")).resolves.toBeUndefined();
|
||||
});
|
||||
|
||||
it("should return the right result for known devices", async () => {
|
||||
const mockDevice = { deviceId: "device_id" } as Device;
|
||||
mocked(mockClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(
|
||||
new Map([["@user:id", new Map([["device_id", mockDevice]])]]),
|
||||
);
|
||||
await expect(getDeviceCryptoInfo(mockClient, "@user:id", "device_id")).resolves.toBe(mockDevice);
|
||||
expect(mockClient.getCrypto()!.getUserDeviceInfo).toHaveBeenCalledWith(["@user:id"], undefined);
|
||||
});
|
||||
});
|
||||
|
||||
describe("getUserDeviceIds", () => {
|
||||
let mockClient: Mocked<MatrixClient>;
|
||||
|
||||
beforeEach(() => {
|
||||
mockClient = getMockClientWithEventEmitter({ ...mockClientMethodsCrypto() });
|
||||
});
|
||||
|
||||
it("should return empty set on clients with no crypto", async () => {
|
||||
jest.spyOn(mockClient, "getCrypto").mockReturnValue(undefined);
|
||||
await expect(getUserDeviceIds(mockClient, "@user:id")).resolves.toEqual(new Set());
|
||||
});
|
||||
|
||||
it("should return empty set for unknown users", async () => {
|
||||
mocked(mockClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(new Map());
|
||||
await expect(getUserDeviceIds(mockClient, "@user:id")).resolves.toEqual(new Set());
|
||||
});
|
||||
|
||||
it("should return the right result for known users", async () => {
|
||||
const mockDevice = { deviceId: "device_id" } as Device;
|
||||
mocked(mockClient.getCrypto()!.getUserDeviceInfo).mockResolvedValue(
|
||||
new Map([["@user:id", new Map([["device_id", mockDevice]])]]),
|
||||
);
|
||||
await expect(getUserDeviceIds(mockClient, "@user:id")).resolves.toEqual(new Set(["device_id"]));
|
||||
expect(mockClient.getCrypto()!.getUserDeviceInfo).toHaveBeenCalledWith(["@user:id"]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
Copyright 2024 New Vector Ltd.
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
|
||||
Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
import { shouldForceDisableEncryption } from "../../../../src/utils/crypto/shouldForceDisableEncryption";
|
||||
import { getMockClientWithEventEmitter } from "../../../test-utils";
|
||||
|
||||
describe("shouldForceDisableEncryption()", () => {
|
||||
const mockClient = getMockClientWithEventEmitter({
|
||||
getClientWellKnown: jest.fn(),
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
mockClient.getClientWellKnown.mockReturnValue(undefined);
|
||||
});
|
||||
|
||||
it("should return false when there is no e2ee well known", () => {
|
||||
expect(shouldForceDisableEncryption(mockClient)).toEqual(false);
|
||||
});
|
||||
|
||||
it("should return false when there is no force_disable property", () => {
|
||||
mockClient.getClientWellKnown.mockReturnValue({
|
||||
"io.element.e2ee": {
|
||||
// empty
|
||||
},
|
||||
});
|
||||
expect(shouldForceDisableEncryption(mockClient)).toEqual(false);
|
||||
});
|
||||
|
||||
it("should return false when force_disable property is falsy", () => {
|
||||
mockClient.getClientWellKnown.mockReturnValue({
|
||||
"io.element.e2ee": {
|
||||
force_disable: false,
|
||||
},
|
||||
});
|
||||
expect(shouldForceDisableEncryption(mockClient)).toEqual(false);
|
||||
});
|
||||
|
||||
it("should return false when force_disable property is not equal to true", () => {
|
||||
mockClient.getClientWellKnown.mockReturnValue({
|
||||
"io.element.e2ee": {
|
||||
force_disable: 1,
|
||||
},
|
||||
});
|
||||
expect(shouldForceDisableEncryption(mockClient)).toEqual(false);
|
||||
});
|
||||
|
||||
it("should return true when force_disable property is true", () => {
|
||||
mockClient.getClientWellKnown.mockReturnValue({
|
||||
"io.element.e2ee": {
|
||||
force_disable: true,
|
||||
},
|
||||
});
|
||||
expect(shouldForceDisableEncryption(mockClient)).toEqual(true);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user