jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-28 01:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

harden implementations

Browse source
This commit is contained in:
seavor 2026-04-12 15:21:29 -05:00
parent c3ae4cffd6
commit 559a3ff1f4
25 changed files with 240 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webclient/src/containers/Login/Login.tsx
View file

@ -64,11 +64,13 @@ const Root = styled('div')(({ theme }) => ({
}
}));
const Login = ({ state, description, connectOptions }: LoginProps) => {
const Login = ({ state, description }: LoginProps) => {
const { t } = useTranslation();
const isConnected = AuthenticationService.isConnected(state);
const [pendingActivationOptions, setPendingActivationOptions] = useState<WebSocketConnectOptions | null>(null);
const [rememberLogin, setRememberLogin] = useState(null);
const [dialogState, setDialogState] = useState({
passwordResetRequestDialog: false,
@ -97,9 +99,11 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
useReduxEffect(() => {
accountActivatedToast.openToast()
closeActivateAccountDialog();
setPendingActivationOptions(null);
}, ServerTypes.ACCOUNT_ACTIVATION_SUCCESS, []);
useReduxEffect(() => {
useReduxEffect(({ options }) => {
setPendingActivationOptions(options);
closeRegistrationDialog();
openActivateAccountDialog();
}, ServerTypes.ACCOUNT_AWAITING_ACTIVATION, []);
@ -161,7 +165,7 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
const handleAccountActivationDialogSubmit = ({ token }) => {
AuthenticationService.activateAccount({
...connectOptions,
...pendingActivationOptions,
token,
});
};
@ -348,13 +352,11 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
interface LoginProps {
state: number;
description: string;
connectOptions: WebSocketConnectOptions;
}
const mapStateToProps = state => ({
state: ServerSelectors.getState(state),
description: ServerSelectors.getDescription(state),
connectOptions: ServerSelectors.getConnectOptions(state),
});
export default connect(mapStateToProps)(Login);