Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup, fix errors

Browse source
This commit is contained in:
Matthew Penner 2021-09-12 15:56:47 -06:00
parent 8acce201d6
commit 222300ff17
No known key found for this signature in database
GPG key ID: 030E4AB751DC756F
8 changed files with 58 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/scripts/components/auth/ForgotPasswordContainer.tsx
View file

@ -18,18 +18,18 @@ interface Values {
}
export default () => {
const ref = useRef<Reaptcha>(null);
const ref = useRef<Reaptcha | null>(null);
const [ token, setToken ] = useState('');
const { clearFlashes, addFlash } = useFlash();
const { enabled: recaptchaEnabled, siteKey } = useStoreState(state => state.settings.data!.recaptcha);
useEffect(() => {
clearFlashes();
clearFlashes(undefined);
}, []);
const handleSubmission = ({ email }: Values, { setSubmitting, resetForm }: FormikHelpers<Values>) => {
clearFlashes();
clearFlashes(undefined);
// If there is no token in the state yet, request the token and then abort this submit request
// since it will be re-submitted when the recaptcha data is returned by the component.

16
resources/scripts/components/auth/LoginContainer.tsx
View file

@ -17,18 +17,18 @@ interface Values {
}
const LoginContainer = ({ history }: RouteComponentProps) => {
const ref = useRef<Reaptcha>(null);
const ref = useRef<Reaptcha | null>(null);
const [ token, setToken ] = useState('');
const { clearFlashes, clearAndAddHttpError } = useFlash();
const { enabled: recaptchaEnabled, siteKey } = useStoreState(state => state.settings.data!.recaptcha);
useEffect(() => {
clearFlashes();
clearFlashes(undefined);
}, []);
const onSubmit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
clearFlashes();
clearFlashes(undefined);
// If there is no token in the state yet, request the token and then abort this submit request
// since it will be re-submitted when the recaptcha data is returned by the component.
@ -54,7 +54,7 @@ const LoginContainer = ({ history }: RouteComponentProps) => {
history.replace('/auth/login/key', {
token: response.confirmationToken,
publicKey: response.publicKey,
hasTotp: response.methods.includes('totp'),
hasTotp: response.methods?.includes('totp'),
});
return;
}
@ -63,11 +63,11 @@ const LoginContainer = ({ history }: RouteComponentProps) => {
history.replace('/auth/login/checkpoint', { token: response.confirmationToken });
}
})
.catch(error => {
.catch(async (error) => {
console.error(error);
setToken('');
if (ref.current) ref.current.reset();
if (ref.current) await ref.current?.reset();
setSubmitting(false);
clearAndAddHttpError({ error });
@ -111,9 +111,9 @@ const LoginContainer = ({ history }: RouteComponentProps) => {
ref={ref}
size={'invisible'}
sitekey={siteKey || '_invalid_key'}
onVerify={response => {
onVerify={async (response) => {
setToken(response);
submitForm();
await submitForm();
}}
onExpire={() => {
setSubmitting(false);

2
resources/scripts/components/auth/ResetPasswordContainer.tsx
View file

@ -30,7 +30,7 @@ export default ({ match, location }: RouteComponentProps<{ token: string }>) =>
}
const submit = ({ password, passwordConfirmation }: Values, { setSubmitting }: FormikHelpers<Values>) => {
clearFlashes();
clearFlashes(undefined);
performPasswordReset(email, { token: match.params.token, password, passwordConfirmation })
.then(() => {
// @ts-ignore