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

Author: t3chguy

src/ScalarMessaging.ts

@@ -626,7 +626,8 @@ async function setBotPower(
             success: true,
         });
     } catch (err) {
-        sendError(event, err instanceof Error ? err.message : _t("Failed to send request."), err);
+        const error = err instanceof Error ? err : undefined;
+        sendError(event, error?.message ?? _t("Failed to send request."), error);
     }
 }
 

src/SlashCommands.tsx

@@ -1105,7 +1105,7 @@ export const Commands = [
             try {
                 cli.forceDiscardSession(roomId);
             } catch (e) {
-                return reject(e.message);
+                return reject(e instanceof Error ? e.message : e);
             }
             return success();
         },
@@ -1134,7 +1134,7 @@ export const Commands = [
                     }),
                 );
             } catch (e) {
-                return reject(e.message);
+                return reject(e instanceof Error ? e.message : e);
             }
         },
         category: CommandCategories.advanced,

src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx

@@ -20,10 +20,11 @@ import FileSaver from "file-saver";
 import { logger } from "matrix-js-sdk/src/logger";
 import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
 import { TrustInfo } from "matrix-js-sdk/src/crypto/backup";
-import { CrossSigningKeys, MatrixError, UIAFlow } from "matrix-js-sdk/src/matrix";
+import { CrossSigningKeys, IAuthDict, MatrixError, UIAFlow } from "matrix-js-sdk/src/matrix";
 import { IRecoveryKey } from "matrix-js-sdk/src/crypto/api";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
 import classNames from "classnames";
+import { UIAResponse } from "matrix-js-sdk/src/@types/uia";
 
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import { _t, _td } from "../../../../languageHandler";
@@ -90,7 +91,7 @@ interface IState {
     accountPasswordCorrect: boolean | null;
     canSkip: boolean;
     passPhraseKeySelected: string;
-    error?: string;
+    error?: boolean;
 }
 
 /*
@@ -279,7 +280,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
         });
     };
 
-    private doBootstrapUIAuth = async (makeRequest: (authData: any) => Promise<{}>): Promise<void> => {
+    private doBootstrapUIAuth = async (
+        makeRequest: (authData: IAuthDict) => Promise<UIAResponse<void>>,
+    ): Promise<void> => {
         if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
             await makeRequest({
                 type: "m.login.password",
@@ -385,7 +388,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     phase: Phase.Migrate,
                 });
             } else {
-                this.setState({ error: e });
+                this.setState({ error: true });
             }
             logger.error("Error bootstrapping secret storage", e);
         }

src/components/structures/auth/Registration.tsx

@@ -246,11 +246,11 @@ export default class Registration extends React.Component<IProps, IState> {
             }
         } catch (e) {
             if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
-            if (e.httpStatus === 401) {
+            if (e instanceof MatrixError && e.httpStatus === 401) {
                 this.setState({
                     flows: e.data.flows,
                 });
-            } else if (e.httpStatus === 403 || e.errcode === "M_FORBIDDEN") {
+            } else if (e instanceof MatrixError && (e.httpStatus === 403 || e.errcode === "M_FORBIDDEN")) {
                 // Check for 403 or M_FORBIDDEN, Synapse used to send 403 M_UNKNOWN but now sends 403 M_FORBIDDEN.
                 // At this point registration is pretty much disabled, but before we do that let's
                 // quickly check to see if the server supports SSO instead. If it does, we'll send

src/components/views/dialogs/ChangelogDialog.tsx

@@ -60,7 +60,7 @@ export default class ChangelogDialog extends React.Component<IProps, State> {
             const body = await res.json();
             this.setState({ [repo]: body.commits });
         } catch (err) {
-            this.setState({ [repo]: err.message });
+            this.setState({ [repo]: err instanceof Error ? err.message : _t("Unknown error") });
         }
     }
 

src/components/views/dialogs/LogoutDialog.tsx

@@ -39,7 +39,6 @@ interface IState {
     shouldLoadBackupStatus: boolean;
     loading: boolean;
     backupInfo: IKeyBackupInfo | null;
-    error?: string;
 }
 
 export default class LogoutDialog extends React.Component<IProps, IState> {
@@ -75,7 +74,6 @@ export default class LogoutDialog extends React.Component<IProps, IState> {
             logger.log("Unable to fetch key backup status", e);
             this.setState({
                 loading: false,
-                error: e,
             });
         }
     }

src/components/views/dialogs/ReportEventDialog.tsx

@@ -272,7 +272,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
             logger.error(e);
             this.setState({
                 busy: false,
-                err: e.message,
+                err: e instanceof Error ? e.message : String(e),
             });
         }
     };

src/components/views/dialogs/security/CreateCrossSigningDialog.tsx

@@ -18,7 +18,8 @@ limitations under the License.
 import React from "react";
 import { CrossSigningKeys } from "matrix-js-sdk/src/client";
 import { logger } from "matrix-js-sdk/src/logger";
-import { UIAFlow } from "matrix-js-sdk/src/matrix";
+import { AuthDict, MatrixError, UIAFlow } from "matrix-js-sdk/src/matrix";
+import { UIAResponse } from "matrix-js-sdk/src/@types/uia";
 
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import { _t } from "../../../../languageHandler";
@@ -79,7 +80,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
             // no keys which would be a no-op.
             logger.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
         } catch (error) {
-            if (!error.data || !error.data.flows) {
+            if (!(error instanceof MatrixError) || !error.data || !error.data.flows) {
                 logger.log("uploadDeviceSigningKeys advertised no flows!");
                 return;
             }
@@ -92,7 +93,9 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
         }
     }
 
-    private doBootstrapUIAuth = async (makeRequest: (authData: any) => Promise<{}>): Promise<void> => {
+    private doBootstrapUIAuth = async (
+        makeRequest: (authData: AuthDict) => Promise<UIAResponse<void>>,
+    ): Promise<void> => {
         if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
             await makeRequest({
                 type: "m.login.password",

src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx

@@ -55,7 +55,7 @@ interface IState {
     backupInfo: IKeyBackupInfo | null;
     backupKeyStored: Record<string, ISecretStorageKeyInfo> | null;
     loading: boolean;
-    loadError: string | null;
+    loadError: boolean | null;
     restoreError: {
         errcode: string;
     } | null;
@@ -66,7 +66,7 @@ interface IState {
     passPhrase: string;
     restoreType: RestoreType | null;
     progress: {
-        stage: ProgressState;
+        stage: ProgressState | string;
         total?: number;
         successes?: number;
         failures?: number;
@@ -304,7 +304,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
         } catch (e) {
             logger.log("Error loading backup status", e);
             this.setState({
-                loadError: e,
+                loadError: true,
                 loading: false,
             });
         }

src/components/views/elements/LazyRenderList.tsx

@@ -92,7 +92,7 @@ export default class LazyRenderList<T = any> extends React.Component<IProps<T>,
         this.state = LazyRenderList.getDerivedStateFromProps(props, {} as IState) as IState;
     }
 
-    public static getDerivedStateFromProps(props: IProps<unknown>, state: IState): Partial<IState> | null {
+    public static getDerivedStateFromProps<T>(props: IProps<T>, state: IState): Partial<IState> | null {
         const range = LazyRenderList.getVisibleRangeFromProps(props);
         const intersectRange = range.expand(props.overflowMargin);
         const renderRange = range.expand(props.overflowItems);
@@ -105,7 +105,7 @@ export default class LazyRenderList<T = any> extends React.Component<IProps<T>,
         return null;
     }
 
-    private static getVisibleRangeFromProps(props: IProps<unknown>): ItemRange {
+    private static getVisibleRangeFromProps<T>(props: IProps<T>): ItemRange {
         const { items, itemHeight, scrollTop, height } = props;
         const length = items ? items.length : 0;
         const topCount = Math.min(Math.max(0, Math.floor(scrollTop / itemHeight)), length);