mirror of
https://github.com/pterodactyl/panel.git
synced 2024-11-23 01:22:30 +01:00
fix: duplicate 2FA error messages (https://github.com/pterodactyl/panel/issues/2455)
This commit is contained in:
parent
c370e08f65
commit
f859d37b25
@ -1,7 +1,6 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { Link, RouteComponentProps } from 'react-router-dom';
|
import { Link, RouteComponentProps } from 'react-router-dom';
|
||||||
import loginCheckpoint from '@/api/auth/loginCheckpoint';
|
import loginCheckpoint from '@/api/auth/loginCheckpoint';
|
||||||
import { httpErrorToHuman } from '@/api/http';
|
|
||||||
import LoginFormContainer from '@/components/auth/LoginFormContainer';
|
import LoginFormContainer from '@/components/auth/LoginFormContainer';
|
||||||
import { ActionCreator } from 'easy-peasy';
|
import { ActionCreator } from 'easy-peasy';
|
||||||
import { StaticContext } from 'react-router';
|
import { StaticContext } from 'react-router';
|
||||||
@ -20,8 +19,7 @@ interface Values {
|
|||||||
type OwnProps = RouteComponentProps<Record<string, string | undefined>, StaticContext, { token?: string }>
|
type OwnProps = RouteComponentProps<Record<string, string | undefined>, StaticContext, { token?: string }>
|
||||||
|
|
||||||
type Props = OwnProps & {
|
type Props = OwnProps & {
|
||||||
addError: ActionCreator<FlashStore['addError']['payload']>;
|
clearAndAddHttpError: ActionCreator<FlashStore['clearAndAddHttpError']['payload']>;
|
||||||
clearFlashes: ActionCreator<FlashStore['clearFlashes']['payload']>;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const LoginCheckpointContainer = () => {
|
const LoginCheckpointContainer = () => {
|
||||||
@ -79,9 +77,7 @@ const LoginCheckpointContainer = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const EnhancedForm = withFormik<Props, Values>({
|
const EnhancedForm = withFormik<Props, Values>({
|
||||||
handleSubmit: ({ code, recoveryCode }, { setSubmitting, props: { addError, clearFlashes, location } }) => {
|
handleSubmit: ({ code, recoveryCode }, { setSubmitting, props: { clearAndAddHttpError, location } }) => {
|
||||||
clearFlashes();
|
|
||||||
|
|
||||||
loginCheckpoint(location.state?.token || '', code, recoveryCode)
|
loginCheckpoint(location.state?.token || '', code, recoveryCode)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
if (response.complete) {
|
if (response.complete) {
|
||||||
@ -95,7 +91,7 @@ const EnhancedForm = withFormik<Props, Values>({
|
|||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
setSubmitting(false);
|
setSubmitting(false);
|
||||||
addError({ message: httpErrorToHuman(error) });
|
clearAndAddHttpError({ error: error });
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -106,7 +102,7 @@ const EnhancedForm = withFormik<Props, Values>({
|
|||||||
})(LoginCheckpointContainer);
|
})(LoginCheckpointContainer);
|
||||||
|
|
||||||
export default ({ history, location, ...props }: OwnProps) => {
|
export default ({ history, location, ...props }: OwnProps) => {
|
||||||
const { addError, clearFlashes } = useFlash();
|
const { clearAndAddHttpError } = useFlash();
|
||||||
|
|
||||||
if (!location.state?.token) {
|
if (!location.state?.token) {
|
||||||
history.replace('/auth/login');
|
history.replace('/auth/login');
|
||||||
@ -115,8 +111,7 @@ export default ({ history, location, ...props }: OwnProps) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return <EnhancedForm
|
return <EnhancedForm
|
||||||
addError={addError}
|
clearAndAddHttpError={clearAndAddHttpError}
|
||||||
clearFlashes={clearFlashes}
|
|
||||||
history={history}
|
history={history}
|
||||||
location={location}
|
location={location}
|
||||||
{...props}
|
{...props}
|
||||||
|
Loading…
Reference in New Issue
Block a user