Apply strictNullChecks to src/utils/*!exportUtils (#10455

Kerry · web-flow · commit 81a4498a8ff4 · 2023-04-03T09:26:55.000+01:00
* Apply `strictNullChecks` to `src/utils/exportUtils`

* strict fix

* fix strictNullChecks issues in some utils

* fix error message

* test coverage

* lint

* more strictNullChecks

* small optimisation for getUniqueRoomsWithIndividuals

* tidy

* test coverage
diff --git a/src/components/structures/InteractiveAuth.tsx b/src/components/structures/InteractiveAuth.tsx
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React, { createRef } from "react";
 import {
     AuthType,
     IAuthData,
@@ -23,8 +24,8 @@ import {
     IStageStatus,
 } from "matrix-js-sdk/src/interactive-auth";
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import React, { createRef } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
+import { UIAResponse } from "matrix-js-sdk/src/@types/uia";
 
 import getEntryComponentForLoginType, { IStageComponent } from "../views/auth/InteractiveAuthEntryComponents";
 import Spinner from "../views/elements/Spinner";
@@ -39,7 +40,7 @@ type InteractiveAuthCallbackSuccess = (
 type InteractiveAuthCallbackFailure = (success: false, response: IAuthData | Error) => void;
 export type InteractiveAuthCallback = InteractiveAuthCallbackSuccess & InteractiveAuthCallbackFailure;
 
-interface IProps {
+export interface InteractiveAuthProps<T> {
     // matrix client to use for UI auth requests
     matrixClient: MatrixClient;
     // response from initial request. If not supplied, will do a request on mount.
@@ -61,7 +62,7 @@ interface IProps {
     continueText?: string;
     continueKind?: string;
     // callback
-    makeRequest(auth: IAuthData | null): Promise<IAuthData>;
+    makeRequest(auth?: IAuthData): Promise<UIAResponse<T>>;
     // callback called when the auth process has finished,
     // successfully or unsuccessfully.
     // @param {boolean} status True if the operation requiring
@@ -92,14 +93,14 @@ interface IState {
     submitButtonEnabled: boolean;
 }
 
-export default class InteractiveAuthComponent extends React.Component<IProps, IState> {
+export default class InteractiveAuthComponent<T> extends React.Component<InteractiveAuthProps<T>, IState> {
     private readonly authLogic: InteractiveAuth;
     private readonly intervalId: number | null = null;
     private readonly stageComponent = createRef<IStageComponent>();
 
     private unmounted = false;
 
-    public constructor(props: IProps) {
+    public constructor(props: InteractiveAuthProps<T>) {
         super(props);
 
         this.state = {
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.tsx b/src/components/views/dialogs/InteractiveAuthDialog.tsx
@@ -22,7 +22,11 @@ import { AuthType, IAuthData } from "matrix-js-sdk/src/interactive-auth";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
-import InteractiveAuth, { ERROR_USER_CANCELLED, InteractiveAuthCallback } from "../../structures/InteractiveAuth";
+import InteractiveAuth, {
+    ERROR_USER_CANCELLED,
+    InteractiveAuthCallback,
+    InteractiveAuthProps,
+} from "../../structures/InteractiveAuth";
 import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
 import BaseDialog from "./BaseDialog";
 
@@ -37,17 +41,11 @@ type DialogAesthetics = Partial<{
     };
 }>;
 
-export interface InteractiveAuthDialogProps {
+export interface InteractiveAuthDialogProps<T = unknown>
+    extends Pick<InteractiveAuthProps<T>, "makeRequest" | "authData"> {
     // matrix client to use for UI auth requests
     matrixClient: MatrixClient;
 
-    // response from initial request. If not supplied, will do a request on
-    // mount.
-    authData?: IAuthData;
-
-    // callback
-    makeRequest: (auth: IAuthData) => Promise<IAuthData>;
-
     // Optional title and body to show when not showing a particular stage
     title?: string;
     body?: string;
@@ -83,8 +81,8 @@ interface IState {
     uiaStagePhase: number | null;
 }
 
-export default class InteractiveAuthDialog extends React.Component<InteractiveAuthDialogProps, IState> {
-    public constructor(props: InteractiveAuthDialogProps) {
+export default class InteractiveAuthDialog<T> extends React.Component<InteractiveAuthDialogProps<T>, IState> {
+    public constructor(props: InteractiveAuthDialogProps<T>) {
         super(props);
 
         this.state = {
diff --git a/src/utils/AutoDiscoveryUtils.tsx b/src/utils/AutoDiscoveryUtils.tsx
@@ -20,7 +20,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { IClientWellKnown } from "matrix-js-sdk/src/matrix";
 
 import { _t, UserFriendlyError } from "../languageHandler";
-import { makeType } from "./TypeUtils";
 import SdkConfig from "../SdkConfig";
 import { ValidatedServerConfig } from "./ValidatedServerConfig";
 
@@ -43,7 +42,7 @@ export default class AutoDiscoveryUtils {
      * @param {string | Error} error The error to check
      * @returns {boolean} True if the error is a liveliness error.
      */
-    public static isLivelinessError(error: string | Error): boolean {
+    public static isLivelinessError(error?: string | Error | null): boolean {
         if (!error) return false;
         return !!LIVELINESS_DISCOVERY_ERRORS.find((e) =>
             typeof error === "string" ? e === error : e === error.message,
@@ -197,7 +196,7 @@ export default class AutoDiscoveryUtils {
     ): ValidatedServerConfig {
         if (!discoveryResult || !discoveryResult["m.homeserver"]) {
             // This shouldn't happen without major misconfiguration, so we'll log a bit of information
-            // in the log so we can find this bit of codee but otherwise tell teh user "it broke".
+            // in the log so we can find this bit of code but otherwise tell the user "it broke".
             logger.error("Ended up in a state of not knowing which homeserver to connect to.");
             throw new UserFriendlyError("Unexpected error resolving homeserver configuration");
         }
@@ -216,7 +215,7 @@ export default class AutoDiscoveryUtils {
         // of Element.
         let preferredIdentityUrl = defaultConfig && defaultConfig["isUrl"];
         if (isResult && isResult.state === AutoDiscovery.SUCCESS) {
-            preferredIdentityUrl = isResult["base_url"];
+            preferredIdentityUrl = isResult["base_url"] ?? undefined;
         } else if (isResult && isResult.state !== AutoDiscovery.PROMPT) {
             logger.error("Error determining preferred identity server URL:", isResult);
             if (isResult.state === AutoDiscovery.FAIL_ERROR) {
@@ -244,6 +243,12 @@ export default class AutoDiscoveryUtils {
         }
 
         const preferredHomeserverUrl = hsResult["base_url"];
+
+        if (!preferredHomeserverUrl) {
+            logger.error("No homeserver URL configured");
+            throw new UserFriendlyError("Unexpected error resolving homeserver configuration");
+        }
+
         let preferredHomeserverName = serverName ? serverName : hsResult["server_name"];
 
         const url = new URL(preferredHomeserverUrl);
@@ -255,14 +260,14 @@ export default class AutoDiscoveryUtils {
             throw new UserFriendlyError("Unexpected error resolving homeserver configuration");
         }
 
-        return makeType(ValidatedServerConfig, {
+        return {
             hsUrl: preferredHomeserverUrl,
             hsName: preferredHomeserverName,
             hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
             isDefault: false,
             warning: hsResult.error,
             isNameResolvable: !isSynthetic,
-        });
+        } as ValidatedServerConfig;
     }
 }
diff --git a/src/utils/DMRoomMap.ts b/src/utils/DMRoomMap.ts
@@ -103,8 +103,6 @@ export default class DMRoomMap {
     }
 
     private onAccountData = (ev: MatrixEvent): void => {
-        console.log("onAccountData");
-
         if (ev.getType() == EventType.Direct) {
             this.setMDirectFromContent(ev.getContent());
             this.userToRooms = null;
@@ -207,13 +205,16 @@ export default class DMRoomMap {
 
     public getUniqueRoomsWithIndividuals(): { [userId: string]: Room } {
         if (!this.roomToUser) return {}; // No rooms means no map.
-        return Object.keys(this.roomToUser)
-            .map((r) => ({ userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r) }))
-            .filter((r) => r.userId && r.room?.getInvitedAndJoinedMemberCount() === 2)
-            .reduce((obj, r) => {
-                obj[r.userId] = r.room;
-                return obj;
-            }, {} as Record<string, Room>);
+        // map roomToUser to valid rooms with two participants
+        return Object.keys(this.roomToUser).reduce((acc, roomId: string) => {
+            const userId = this.getUserIdForRoomId(roomId);
+            const room = this.matrixClient.getRoom(roomId);
+            const hasTwoMembers = room?.getInvitedAndJoinedMemberCount() === 2;
+            if (userId && room && hasTwoMembers) {
+                acc[userId] = room;
+            }
+            return acc;
+        }, {} as Record<string, Room>);
     }
 
     /**
@@ -236,9 +237,7 @@ export default class DMRoomMap {
                 // to avoid multiple devices fighting to correct
                 // the account data, only try to send the corrected
                 // version once.
-                logger.warn(
-                    `Invalid m.direct account data detected ` + `(self-chats that shouldn't be), patching it up.`,
-                );
+                logger.warn(`Invalid m.direct account data detected (self-chats that shouldn't be), patching it up.`);
                 if (neededPatching && !this.hasSentOutPatchDirectAccountDataPatch) {
                     this.hasSentOutPatchDirectAccountDataPatch = true;
                     this.matrixClient.setAccountData(EventType.Direct, userToRooms);
diff --git a/src/utils/IdentityServerUtils.ts b/src/utils/IdentityServerUtils.ts
@@ -21,8 +21,8 @@ import SdkConfig from "../SdkConfig";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import { Policies } from "../Terms";
 
-export function getDefaultIdentityServerUrl(): string {
-    return SdkConfig.get("validated_server_config").isUrl;
+export function getDefaultIdentityServerUrl(): string | undefined {
+    return SdkConfig.get("validated_server_config")?.isUrl;
 }
 
 export function setToDefaultIdentityServer(): void {
diff --git a/src/utils/MediaEventHelper.ts b/src/utils/MediaEventHelper.ts
@@ -102,7 +102,10 @@ export class MediaEventHelper implements IDestroyable {
             }
         }
 
-        return fetch(this.media.thumbnailHttp).then((r) => r.blob());
+        const thumbnailHttp = this.media.thumbnailHttp;
+        if (!thumbnailHttp) return Promise.resolve(null);
+
+        return fetch(thumbnailHttp).then((r) => r.blob());
     };
 
     public static isEligible(event: MatrixEvent): boolean {
diff --git a/src/utils/TypeUtils.ts b/src/utils/TypeUtils.ts
diff --git a/src/utils/UserInteractiveAuth.ts b/src/utils/UserInteractiveAuth.ts
@@ -24,7 +24,7 @@ type FunctionWithUIA<R, A> = (auth?: IAuthData, ...args: A[]) => Promise<UIAResp
 
 export function wrapRequestWithDialog<R, A = any>(
     requestFunction: FunctionWithUIA<R, A>,
-    opts: Omit<InteractiveAuthDialogProps, "makeRequest" | "onFinished">,
+    opts: Omit<InteractiveAuthDialogProps<R>, "makeRequest" | "onFinished">,
 ): (...args: A[]) => Promise<R> {
     return async function (...args): Promise<R> {
         return new Promise((resolve, reject) => {
diff --git a/src/utils/WidgetUtils.ts b/src/utils/WidgetUtils.ts
@@ -119,6 +119,7 @@ export default class WidgetUtils {
                 if (
                     testUrl.protocol === scalarUrl.protocol &&
                     testUrl.host === scalarUrl.host &&
+                    scalarUrl.pathname &&
                     testUrl.pathname?.startsWith(scalarUrl.pathname)
                 ) {
                     return true;
diff --git a/src/utils/leave-behaviour.ts b/src/utils/leave-behaviour.ts
@@ -61,6 +61,12 @@ export async function leaveRoomBehaviour(roomId: string, retry = true, spinner =
     }
 
     const room = cli.getRoom(roomId);
+
+    // should not encounter this
+    if (!room) {
+        throw new Error(`Expected to find room for id ${roomId}`);
+    }
+
     // await any queued messages being sent so that they do not fail
     await Promise.all(
         room
diff --git a/src/utils/location/map.ts b/src/utils/location/map.ts
@@ -85,12 +85,14 @@ export const createMapSiteLinkFromEvent = (event: MatrixEvent): string | null =>
     if (mLocation !== undefined) {
         const uri = mLocation["uri"];
         if (uri !== undefined) {
-            return makeMapSiteLink(parseGeoUri(uri));
+            const geoCoords = parseGeoUri(uri);
+            return geoCoords ? makeMapSiteLink(geoCoords) : null;
         }
     } else {
         const geoUri = content["geo_uri"];
         if (geoUri) {
-            return makeMapSiteLink(parseGeoUri(geoUri));
+            const geoCoords = parseGeoUri(geoUri);
+            return geoCoords ? makeMapSiteLink(geoCoords) : null;
         }
     }
     return null;
diff --git a/src/utils/location/parseGeoUri.ts b/src/utils/location/parseGeoUri.ts
@@ -28,16 +28,23 @@ export const parseGeoUri = (uri: string): GeolocationCoordinates | undefined =>
     if (!m) return;
     const parts = m[1].split(";");
     const coords = parts[0].split(",");
-    let uncertainty: number | null;
+    let uncertainty: number | null | undefined = undefined;
     for (const param of parts.slice(1)) {
         const m = param.match(/u=(.*)/);
         if (m) uncertainty = parse(m[1]);
     }
+    const latitude = parse(coords[0]);
+    const longitude = parse(coords[1]);
+
+    if (latitude === null || longitude === null) {
+        return;
+    }
+
     return {
-        latitude: parse(coords[0]),
-        longitude: parse(coords[1]),
+        latitude: latitude!,
+        longitude: longitude!,
         altitude: parse(coords[2]),
-        accuracy: uncertainty,
+        accuracy: uncertainty!,
         altitudeAccuracy: null,
         heading: null,
         speed: null,
diff --git a/src/utils/stringOrderField.ts b/src/utils/stringOrderField.ts
@@ -120,7 +120,7 @@ export const reorderLexicographically = (
         // verify the right move would be sufficient
         if (
             rightBoundIdx === newOrder.length - 1 &&
-            (newOrder[rightBoundIdx] ? stringToBase(newOrder[rightBoundIdx].order) : BigInt(Number.MAX_VALUE)) -
+            (newOrder[rightBoundIdx]?.order ? stringToBase(newOrder[rightBoundIdx].order!) : BigInt(Number.MAX_VALUE)) -
                 prevBase <=
                 rightBoundIdx - toIndex
         ) {
diff --git a/src/utils/threepids.ts b/src/utils/threepids.ts
@@ -65,6 +65,9 @@ export const lookupThreePids = async (
     if (threePids.length === 0) return [];
 
     const token = await client.identityServer.getAccessToken();
+
+    if (!token) return [];
+
     const lookedUp = await client.bulkLookupThreePids(
         threePids.map((t) => [t.isEmail ? "email" : "msisdn", t.userId]),
         token,
diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
@@ -47,7 +47,6 @@ import { MapperOpts } from "matrix-js-sdk/src/event-mapper";
 
 import type { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall";
 import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg";
-import { makeType } from "../../src/utils/TypeUtils";
 import { ValidatedServerConfig } from "../../src/utils/ValidatedServerConfig";
 import { EnhancedMap } from "../../src/utils/maps";
 import { AsyncStoreWithClient } from "../../src/stores/AsyncStoreWithClient";
@@ -591,13 +590,13 @@ export function mkStubRoom(
     } as unknown as Room;
 }
 
-export function mkServerConfig(hsUrl: string, isUrl: string) {
-    return makeType(ValidatedServerConfig, {
+export function mkServerConfig(hsUrl: string, isUrl: string): ValidatedServerConfig {
+    return {
         hsUrl,
         hsName: "TEST_ENVIRONMENT",
         hsNameIsDifferent: false, // yes, we lie
         isUrl,
-    });
+    } as ValidatedServerConfig;
 }
 
 // These methods make some use of some private methods on the AsyncStoreWithClient to simplify getting into a consistent
diff --git a/test/utils/DMRoomMap-test.ts b/test/utils/DMRoomMap-test.ts
diff --git a/test/utils/location/map-test.ts b/test/utils/location/map-test.ts
diff --git a/test/utils/location/parseGeoUri-test.ts b/test/utils/location/parseGeoUri-test.ts

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import SdkConfig from "../SdkConfig";`
`21`	`21`	`import { MatrixClientPeg } from "../MatrixClientPeg";`
`22`	`22`	`import { Policies } from "../Terms";`
`23`	`23`
`24`		`-export function getDefaultIdentityServerUrl(): string {`
`25`		`- return SdkConfig.get("validated_server_config").isUrl;`
	`24`	`+export function getDefaultIdentityServerUrl(): string \| undefined {`
	`25`	`+ return SdkConfig.get("validated_server_config")?.isUrl;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`export function setToDefaultIdentityServer(): void {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,10 @@ export class MediaEventHelper implements IDestroyable {`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- return fetch(this.media.thumbnailHttp).then((r) => r.blob());`
	`105`	`+ const thumbnailHttp = this.media.thumbnailHttp;`
	`106`	`+ if (!thumbnailHttp) return Promise.resolve(null);`
	`107`	`+`
	`108`	`+ return fetch(thumbnailHttp).then((r) => r.blob());`
`106`	`109`	`};`
`107`	`110`
`108`	`111`	`public static isEligible(event: MatrixEvent): boolean {`