Replace MatrixClient.userHasCrossSigningKeys by MatrixClient.getCrypto.userHasCrossSigningKeys

src/components/structures/MatrixChat.tsx

@@ -425,7 +425,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // from another device.
             promisesList.push(
                 (async (): Promise<void> => {
-                    crossSigningIsSetUp = await cli.userHasCrossSigningKeys();
+                    crossSigningIsSetUp = Boolean(await cli.getCrypto()?.userHasCrossSigningKeys());
                 })(),
             );
         }

test/components/structures/MatrixChat-test.tsx

@@ -126,7 +126,6 @@ describe("<MatrixChat />", () => {
         }),
         getVisibleRooms: jest.fn().mockReturnValue([]),
         getRooms: jest.fn().mockReturnValue([]),
-        userHasCrossSigningKeys: jest.fn(),
         setGlobalBlacklistUnverifiedDevices: jest.fn(),
         setGlobalErrorOnUnknownDevices: jest.fn(),
         getCrypto: jest.fn().mockReturnValue({
@@ -136,6 +135,7 @@ describe("<MatrixChat />", () => {
             getUserVerificationStatus: jest.fn().mockResolvedValue(new UserVerificationStatus(false, false, false)),
             getVersion: jest.fn().mockReturnValue("1"),
             setDeviceIsolationMode: jest.fn(),
+            userHasCrossSigningKeys: jest.fn(),
         }),
         // This needs to not finish immediately because we need to test the screen appears
         bootstrapCrossSigning: jest.fn().mockImplementation(() => bootstrapDeferred.promise),
@@ -1010,18 +1010,18 @@ describe("<MatrixChat />", () => {
                         .fn()
                         .mockResolvedValue(new UserVerificationStatus(false, false, false)),
                     setDeviceIsolationMode: jest.fn(),
+                    userHasCrossSigningKeys: jest.fn().mockResolvedValue(false),
                 };
                 loginClient.isCryptoEnabled.mockReturnValue(true);
                 loginClient.getCrypto.mockReturnValue(mockCrypto as any);
-                loginClient.userHasCrossSigningKeys.mockClear().mockResolvedValue(false);
             });
 
             it("should go straight to logged in view when crypto is not enabled", async () => {
                 loginClient.isCryptoEnabled.mockReturnValue(false);
 
                 await getComponentAndLogin(true);
 
-                expect(loginClient.userHasCrossSigningKeys).not.toHaveBeenCalled();
+                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).not.toHaveBeenCalled();
             });
 
             it("should go straight to logged in view when user does not have cross signing keys and server does not support cross signing", async () => {
@@ -1042,7 +1042,7 @@ describe("<MatrixChat />", () => {
             describe("when server supports cross signing and user does not have cross signing setup", () => {
                 beforeEach(() => {
                     loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
-                    loginClient.userHasCrossSigningKeys.mockResolvedValue(false);
+                    jest.spyOn(loginClient.getCrypto()!, "userHasCrossSigningKeys").mockResolvedValue(false);
                 });
 
                 describe("when encryption is force disabled", () => {
@@ -1088,19 +1088,19 @@ describe("<MatrixChat />", () => {
 
                     await getComponentAndLogin();
 
-                    expect(loginClient.userHasCrossSigningKeys).toHaveBeenCalled();
+                    expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
 
                     // set up keys screen is rendered
                     await expect(await screen.findByText("Setting up keys")).toBeInTheDocument();
                 });
             });
 
             it("should show complete security screen when user has cross signing setup", async () => {
-                loginClient.userHasCrossSigningKeys.mockResolvedValue(true);
+                jest.spyOn(loginClient.getCrypto()!, "userHasCrossSigningKeys").mockResolvedValue(true);
 
                 await getComponentAndLogin();
 
-                expect(loginClient.userHasCrossSigningKeys).toHaveBeenCalled();
+                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
 
                 await flushPromises();
 
@@ -1113,7 +1113,7 @@ describe("<MatrixChat />", () => {
 
                 await getComponentAndLogin();
 
-                expect(loginClient.userHasCrossSigningKeys).toHaveBeenCalled();
+                expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
 
                 await flushPromises();