OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use the non-deprecated importRoomKeys method on CryptoApi (#12232) 

* Use the non-deprecated importRoomKeys method on CryptoApi

* Assert that we have crypto in import dialog
pull/28217/head
Andy Balaam 2024-02-09 13:13:26 +00:00 committed by GitHub
parent 552c65db98
commit d1928079cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/async-components/views/dialogs/security/ImportE2eKeysDialog.tsx
View File

@ -108,7 +108,7 @@ export default class ImportE2eKeysDialog extends React.Component<IProps, IState>
return MegolmExportEncryption.decryptMegolmKeyFile(arrayBuffer, passphrase);
})
.then((keys) => {
return this.props.matrixClient.importRoomKeys(JSON.parse(keys));
return this.props.matrixClient.getCrypto()!.importRoomKeys(JSON.parse(keys));
})
.then(() => {
// TODO: it would probably be nice to give some feedback about what we've imported here.

30
test/components/views/dialogs/security/ImportE2eKeysDialog-test.tsx
View File

@ -15,10 +15,12 @@ limitations under the License.
*/
import React from "react";
import { fireEvent, render } from "@testing-library/react";
import { fireEvent, render, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { CryptoApi } from "matrix-js-sdk/src/matrix";
import ImportE2eKeysDialog from "../../../../../src/async-components/views/dialogs/security/ImportE2eKeysDialog";
import * as MegolmExportEncryption from "../../../../../src/utils/MegolmExportEncryption";
import { createTestClient } from "../../../../test-utils";
describe("ImportE2eKeysDialog", () => {
@ -64,4 +66,30 @@ describe("ImportE2eKeysDialog", () => {
await userEvent.paste("passphrase");
expect(container.querySelector("[type=submit]")!).toBeEnabled();
});
it("should import exported keys on submit", async () => {
const cli = createTestClient();
const onFinished = jest.fn();
const file = new File(["test"], "file.txt", { type: "text/plain" });
const importRoomKeys = jest.fn();
cli.getCrypto = () => {
return {
importRoomKeys,
} as unknown as CryptoApi;
};
// Mock the result of decrypting the sessions, to avoid needing to
// create encrypted input data.
jest.spyOn(MegolmExportEncryption, "decryptMegolmKeyFile").mockResolvedValue("[]");
const { container } = render(<ImportE2eKeysDialog matrixClient={cli} onFinished={onFinished} />);
fireEvent.change(container.querySelector("[type=file]")!, {
target: { files: [file] },
});
await userEvent.click(container.querySelector("[type=password]")!);
await userEvent.paste("passphrase");
fireEvent.click(container.querySelector("[type=submit]")!);
await waitFor(() => expect(importRoomKeys).toHaveBeenCalled());
});
});