Conform more of the codebase to strict types (#11191)

test/components/structures/auth/Registration-test.tsx

@@ -17,8 +17,7 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, screen, waitForElementToBeRemoved } from "@testing-library/react";
-import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
-import { MatrixError } from "matrix-js-sdk/src/http-api/errors";
+import { createClient, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
 import fetchMock from "fetch-mock-jest";
 
@@ -26,7 +25,10 @@ import SdkConfig, { DEFAULTS } from "../../../../src/SdkConfig";
 import { mkServerConfig, mockPlatformPeg, unmockPlatformPeg } from "../../../test-utils";
 import Registration from "../../../../src/components/structures/auth/Registration";
 
-jest.mock("matrix-js-sdk/src/matrix");
+jest.mock("matrix-js-sdk/src/matrix", () => ({
+    ...jest.requireActual("matrix-js-sdk/src/matrix"),
+    createClient: jest.fn(),
+}));
 jest.useFakeTimers();
 
 describe("Registration", function () {

test/components/views/dialogs/CreateRoomDialog-test.tsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, screen, within } from "@testing-library/react";
-import { Preset, Visibility } from "matrix-js-sdk/src/matrix";
+import { MatrixError, Preset, Visibility } from "matrix-js-sdk/src/matrix";
 
 import CreateRoomDialog from "../../../../src/components/views/dialogs/CreateRoomDialog";
 import { flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../test-utils";
@@ -29,7 +29,7 @@ describe("<CreateRoomDialog />", () => {
         getClientWellKnown: jest.fn(),
         doesServerForceEncryptionForPreset: jest.fn(),
         // make every alias available
-        getRoomIdForAlias: jest.fn().mockRejectedValue({ errcode: "M_NOT_FOUND" }),
+        getRoomIdForAlias: jest.fn().mockRejectedValue(new MatrixError({ errcode: "M_NOT_FOUND" })),
     });
 
     const getE2eeEnableToggleInputElement = () => screen.getByLabelText("Enable end-to-end encryption");

test/components/views/dialogs/InteractiveAuthDialog-test.tsx

@@ -131,7 +131,7 @@ describe("InteractiveAuthDialog", function () {
             const successfulResult = { test: 1 };
             const makeRequest = jest
                 .fn()
-                .mockRejectedValueOnce(new MatrixError({ data: { flows: [{ stages: ["m.login.sso"] }] } }, 401))
+                .mockRejectedValueOnce(new MatrixError({ flows: [{ stages: ["m.login.sso"] }] }, 401))
                 .mockResolvedValue(successfulResult);
 
             mockClient.credentials = { userId: "@user:id" };

test/components/views/settings/devices/deleteDevices-test.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { UIAFlow } from "matrix-js-sdk/src/matrix";
+import { MatrixError, UIAFlow } from "matrix-js-sdk/src/matrix";
 
 import { deleteDevicesWithInteractiveAuth } from "../../../../../src/components/views/settings/devices/deleteDevices";
 import Modal from "../../../../../src/Modal";
@@ -30,7 +30,7 @@ describe("deleteDevices()", () => {
 
     const modalSpy = jest.spyOn(Modal, "createDialog") as jest.SpyInstance;
 
-    const interactiveAuthError = { httpStatus: 401, data: { flows: [] as UIAFlow[] } };
+    const interactiveAuthError = new MatrixError({ flows: [] as UIAFlow[] }, 401);
 
     beforeEach(() => {
         jest.clearAllMocks();

test/components/views/settings/tabs/user/SessionManagerTab-test.tsx

@@ -31,6 +31,7 @@ import {
     UNSTABLE_MSC3882_CAPABILITY,
     CryptoApi,
     DeviceVerificationStatus,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
 
@@ -722,10 +723,12 @@ describe("<SessionManagerTab />", () => {
         });
 
         describe("other devices", () => {
-            const interactiveAuthError = {
-                httpStatus: 401,
-                data: { flows: [{ stages: ["m.login.password"] }] },
-            };
+            const interactiveAuthError = new MatrixError(
+                {
+                    flows: [{ stages: ["m.login.password"] }],
+                },
+                401,
+            );
 
             beforeEach(() => {
                 mockClient.deleteMultipleDevices.mockReset();

test/utils/MultiInviter-test.ts

@@ -32,8 +32,8 @@ const MXID3 = "@user3:server";
 
 const MXID_PROFILE_STATES: Record<string, Promise<any>> = {
     [MXID1]: Promise.resolve({}),
-    [MXID2]: Promise.reject({ errcode: "M_FORBIDDEN" }),
-    [MXID3]: Promise.reject({ errcode: "M_NOT_FOUND" }),
+    [MXID2]: Promise.reject(new MatrixError({ errcode: "M_FORBIDDEN" })),
+    [MXID3]: Promise.reject(new MatrixError({ errcode: "M_NOT_FOUND" })),
 };
 
 jest.mock("../../src/Modal", () => ({