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

Use `crypto.isCrossSigningReady` in `CrossSigningPanel` (#11080)

pull/28788/head^2
Florian Duros 2023-06-14 11:46:14 +02:00 committed by GitHub
parent 3f52de2f5b
commit 127b542233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/settings/CrossSigningPanel.tsx
View File

@ -102,7 +102,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
const homeserverSupportsCrossSigning = await cli.doesServerSupportUnstableFeature( const homeserverSupportsCrossSigning = await cli.doesServerSupportUnstableFeature(
"org.matrix.e2e_cross_signing", "org.matrix.e2e_cross_signing",
); );
const crossSigningReady = await cli.isCrossSigningReady(); const crossSigningReady = await crypto.isCrossSigningReady();
this.setState({ this.setState({
crossSigningPublicKeysOnDevice, crossSigningPublicKeysOnDevice,

6
test/components/views/settings/CrossSigningPanel-test.tsx
View File

@ -59,10 +59,6 @@ describe("<CrossSigningPanel />", () => {
}); });
describe("when cross signing is ready", () => { describe("when cross signing is ready", () => {
beforeEach(() => {
mockClient.isCrossSigningReady.mockResolvedValue(true);
});
it("should render when keys are not backed up", async () => { it("should render when keys are not backed up", async () => {
getComponent(); getComponent();
await flushPromises(); await flushPromises();
@ -93,7 +89,7 @@ describe("<CrossSigningPanel />", () => {
describe("when cross signing is not ready", () => { describe("when cross signing is not ready", () => {
beforeEach(() => { beforeEach(() => {
mockClient.isCrossSigningReady.mockResolvedValue(false); mocked(mockClient.getCrypto()!.isCrossSigningReady).mockResolvedValue(false);
}); });
it("should render when keys are not backed up", async () => { it("should render when keys are not backed up", async () => {

1
test/test-utils/client.ts
View File

@ -167,5 +167,6 @@ export const mockClientMethodsCrypto = (): Partial<
userSigningKey: true, userSigningKey: true,
}, },
}), }),
isCrossSigningReady: jest.fn().mockResolvedValue(true),
}), }),
}); });