rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable strict lints

Browse Source 
An attempt to fix https://github.com/vector-im/element-call/issues/1132
This commit is contained in:
Daniel Abramov
2023-06-30 16:43:28 +01:00
parent d86d3de95e
commit 0105162ffa
68 changed files with 970 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/auth/LoginPage.tsx
View File

@@ -35,8 +35,8 @@ export const LoginPage: FC = () => {
const { setClient } = useClient();
const login = useInteractiveLogin();
const homeserver = Config.defaultHomeserverUrl(); // TODO: Make this configurable
const usernameRef = useRef<HTMLInputElement>();
const passwordRef = useRef<HTMLInputElement>();
const usernameRef = useRef<HTMLInputElement>(null);
const passwordRef = useRef<HTMLInputElement>(null);
const history = useHistory();
const location = useLocation();
const [loading, setLoading] = useState(false);
@@ -49,12 +49,27 @@ export const LoginPage: FC = () => {
e.preventDefault();
setLoading(true);
if (!homeserver || !usernameRef.current || !passwordRef.current) {
setError(Error("Login parameters are undefined"));
setLoading(false);
return;
}
login(homeserver, usernameRef.current.value, passwordRef.current.value)
.then(([client, session]) => {
setClient(client, session);
if (!setClient) {
return;
}
if (location.state && location.state.from) {
history.push(location.state.from);
setClient({ client, session });
const locationState = location.state;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (locationState && locationState.from) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
history.push(locationState.from);
} else {
history.push("/");
}

34
src/auth/RegisterPage.tsx
View File

@@ -30,7 +30,7 @@ import { Trans, useTranslation } from "react-i18next";
import { FieldRow, InputField, ErrorMessage } from "../input/Input";
import { Button } from "../button";
import { useClient } from "../ClientContext";
import { useClientLegacy } from "../ClientContext";
import { useInteractiveRegistration } from "./useInteractiveRegistration";
import styles from "./LoginPage.module.css";
import { ReactComponent as Logo } from "../icons/LogoLarge.svg";
@@ -45,9 +45,10 @@ export const RegisterPage: FC = () => {
const { t } = useTranslation();
usePageTitle(t("Register"));
const { loading, isAuthenticated, isPasswordlessUser, client, setClient } =
useClient();
const confirmPasswordRef = useRef<HTMLInputElement>();
const { loading, authenticated, passwordlessUser, client, setClient } =
useClientLegacy();
const confirmPasswordRef = useRef<HTMLInputElement>(null);
const history = useHistory();
const location = useLocation();
const [registering, setRegistering] = useState(false);
@@ -75,10 +76,15 @@ export const RegisterPage: FC = () => {
userName,
password,
userName,
recaptchaResponse
recaptchaResponse,
passwordlessUser
);
if (client && isPasswordlessUser) {
if (!client || !client.groupCallEventHandler || !setClient) {
return;
}
if (passwordlessUser) {
// Migrate the user's rooms
for (const groupCall of client.groupCallEventHandler.groupCalls.values()) {
const roomId = groupCall.room.roomId;
@@ -86,7 +92,11 @@ export const RegisterPage: FC = () => {
try {
await newClient.joinRoom(roomId);
} catch (error) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (error.errcode === "M_LIMIT_EXCEEDED") {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await sleep(error.data.retry_after_ms);
await newClient.joinRoom(roomId);
} else {
@@ -97,13 +107,17 @@ export const RegisterPage: FC = () => {
}
}
setClient(newClient, session);
setClient({ client: newClient, session });
PosthogAnalytics.instance.eventSignup.cacheSignupEnd(new Date());
};
submit()
.then(() => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (location.state?.from) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
history.push(location.state?.from);
} else {
history.push("/");
@@ -119,7 +133,7 @@ export const RegisterPage: FC = () => {
register,
location,
history,
isPasswordlessUser,
passwordlessUser,
reset,
execute,
client,
@@ -136,10 +150,10 @@ export const RegisterPage: FC = () => {
}, [password, passwordConfirmation, t]);
useEffect(() => {
if (!loading && isAuthenticated && !isPasswordlessUser && !registering) {
if (!loading && authenticated && !passwordlessUser && !registering) {
history.push("/");
}
}, [loading, history, isAuthenticated, isPasswordlessUser, registering]);
}, [loading, history, authenticated, passwordlessUser, registering]);
if (loading) {
return <LoadingView />;

6
src/auth/useInteractiveLogin.ts
View File

@@ -41,8 +41,10 @@ export const useInteractiveLogin = () =>
},
password,
}),
stateUpdated: null,
requestEmailToken: null,
stateUpdated: (...args) => {},
requestEmailToken: (...args): Promise<{ sid: string }> => {
return Promise.resolve({ sid: "" });
},
});
// XXX: This claims to return an IAuthData which contains none of these

32
src/auth/useInteractiveRegistration.ts
View File

@@ -23,28 +23,32 @@ import { Session } from "../ClientContext";
import { Config } from "../config/Config";
export const useInteractiveRegistration = (): {
privacyPolicyUrl: string;
recaptchaKey: string;
privacyPolicyUrl?: string;
recaptchaKey?: string;
register: (
username: string,
password: string,
displayName: string,
recaptchaResponse: string,
passwordlessUser?: boolean
passwordlessUser: boolean
) => Promise<[MatrixClient, Session]>;
} => {
const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string>();
const [recaptchaKey, setRecaptchaKey] = useState<string>();
const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string | undefined>(
undefined
);
const [recaptchaKey, setRecaptchaKey] = useState<string | undefined>(
undefined
);
const authClient = useRef<MatrixClient>();
if (!authClient.current) {
authClient.current = createClient({
baseUrl: Config.defaultHomeserverUrl(),
baseUrl: Config.defaultHomeserverUrl()!,
});
}
useEffect(() => {
authClient.current.registerRequest({}).catch((error) => {
authClient.current!.registerRequest({}).catch((error) => {
setPrivacyPolicyUrl(
error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en?.url
);
@@ -58,12 +62,12 @@ export const useInteractiveRegistration = (): {
password: string,
displayName: string,
recaptchaResponse: string,
passwordlessUser?: boolean
passwordlessUser: boolean
): Promise<[MatrixClient, Session]> => {
const interactiveAuth = new InteractiveAuth({
matrixClient: authClient.current,
matrixClient: authClient.current!,
doRequest: (auth) =>
authClient.current.registerRequest({
authClient.current!.registerRequest({
username,
password,
auth: auth || undefined,
@@ -84,7 +88,9 @@ export const useInteractiveRegistration = (): {
});
}
},
requestEmailToken: null,
requestEmailToken: (...args) => {
return Promise.resolve({ sid: "dummy" });
},
});
// XXX: This claims to return an IAuthData which contains none of these
@@ -95,7 +101,7 @@ export const useInteractiveRegistration = (): {
const client = await initClient(
{
baseUrl: Config.defaultHomeserverUrl(),
baseUrl: Config.defaultHomeserverUrl()!,
accessToken: access_token,
userId: user_id,
deviceId: device_id,
@@ -117,7 +123,7 @@ export const useInteractiveRegistration = (): {
session.tempPassword = password;
}
const user = client.getUser(client.getUserId());
const user = client.getUser(client.getUserId()!)!;
user.setRawDisplayName(displayName);
user.setDisplayName(displayName);

6
src/auth/useRecaptcha.ts
View File

@@ -34,7 +34,7 @@ interface RecaptchaPromiseRef {
reject: (error: Error) => void;
}
export const useRecaptcha = (sitekey: string) => {
export const useRecaptcha = (sitekey?: string) => {
const { t } = useTranslation();
const [recaptchaId] = useState(() => randomString(16));
const promiseRef = useRef<RecaptchaPromiseRef>();
@@ -68,9 +68,9 @@ export const useRecaptcha = (sitekey: string) => {
}
}, [recaptchaId, sitekey]);
const execute = useCallback(() => {
const execute = useCallback((): Promise<string> => {
if (!sitekey) {
return Promise.resolve(null);
return Promise.resolve("");
}
if (!window.grecaptcha) {

10
src/auth/useRegisterPasswordlessUser.ts
View File

@@ -23,9 +23,9 @@ import { generateRandomName } from "../auth/generateRandomName";
import { useRecaptcha } from "../auth/useRecaptcha";
interface UseRegisterPasswordlessUserType {
privacyPolicyUrl: string;
privacyPolicyUrl?: string;
registerPasswordlessUser: (displayName: string) => Promise<void>;
recaptchaId: string;
recaptchaId?: string;
}
export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
@@ -36,6 +36,10 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
const registerPasswordlessUser = useCallback(
async (displayName: string) => {
if (!setClient) {
throw new Error("No client context");
}
try {
const recaptchaResponse = await execute();
const userName = generateRandomName();
@@ -46,7 +50,7 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
recaptchaResponse,
true
);
setClient(client, session);
setClient({ client, session });
} catch (e) {
reset();
throw e;