|
@@ -50,8 +50,8 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
|
|
|
const [passwordForRegister, setPasswordForRegister] = useState('');
|
|
const [passwordForRegister, setPasswordForRegister] = useState('');
|
|
|
const [registerErrors, setRegisterErrors] = useState<IErrorV3[]>([]);
|
|
const [registerErrors, setRegisterErrors] = useState<IErrorV3[]>([]);
|
|
|
// For UserActivation
|
|
// For UserActivation
|
|
|
- const [emailForActivationUser, setEmailForActivationUser] = useState('');
|
|
|
|
|
- const [isSuccessToSendUserActivationEmail, setIsSuccessToSendUserActivationEmail] = useState(false);
|
|
|
|
|
|
|
+ const [emailForRegistrationOrder, setEmailForRegistrationOrder] = useState('');
|
|
|
|
|
+ const [isSuccessToSendRegistrationOrderEmail, setIsSuccessToSendRegistrationOrderEmail] = useState(false);
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
@@ -265,7 +265,8 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
|
|
|
|
|
|
|
|
const handleRegisterFormSubmit = useCallback(async(e, requestPath) => {
|
|
const handleRegisterFormSubmit = useCallback(async(e, requestPath) => {
|
|
|
e.preventDefault();
|
|
e.preventDefault();
|
|
|
- setIsSuccessToSendUserActivationEmail(false);
|
|
|
|
|
|
|
+ setEmailForRegistrationOrder('');
|
|
|
|
|
+ setIsSuccessToSendRegistrationOrderEmail(false);
|
|
|
|
|
|
|
|
const registerForm = {
|
|
const registerForm = {
|
|
|
username: usernameForRegister,
|
|
username: usernameForRegister,
|
|
@@ -279,8 +280,8 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
|
|
|
router.push(redirectTo ?? '/');
|
|
router.push(redirectTo ?? '/');
|
|
|
|
|
|
|
|
if (isEmailAuthenticationEnabled) {
|
|
if (isEmailAuthenticationEnabled) {
|
|
|
- setEmailForActivationUser(emailForRegister);
|
|
|
|
|
- setIsSuccessToSendUserActivationEmail(true);
|
|
|
|
|
|
|
+ setEmailForRegistrationOrder(emailForRegister);
|
|
|
|
|
+ setIsSuccessToSendRegistrationOrderEmail(true);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
catch (err) {
|
|
catch (err) {
|
|
@@ -342,9 +343,9 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
- (isEmailAuthenticationEnabled && isSuccessToSendUserActivationEmail) && (
|
|
|
|
|
|
|
+ (isEmailAuthenticationEnabled && isSuccessToSendRegistrationOrderEmail) && (
|
|
|
<p className="alert alert-success">
|
|
<p className="alert alert-success">
|
|
|
- <span>{t('message.successfully_send_email_auth', { email: emailForActivationUser })}</span>
|
|
|
|
|
|
|
+ <span>{t('message.successfully_send_email_auth', { email: emailForRegistrationOrder })}</span>
|
|
|
</p>
|
|
</p>
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
@@ -399,7 +400,7 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
|
|
|
</div>
|
|
</div>
|
|
|
{/* email */}
|
|
{/* email */}
|
|
|
<input type="email"
|
|
<input type="email"
|
|
|
- readOnly={!isMailerSetup && isEmailAuthenticationEnabled}
|
|
|
|
|
|
|
+ disabled={!isMailerSetup && isEmailAuthenticationEnabled}
|
|
|
className="form-control rounded-0"
|
|
className="form-control rounded-0"
|
|
|
onChange={(e) => { setEmailForRegister(e.target.value) }}
|
|
onChange={(e) => { setEmailForRegister(e.target.value) }}
|
|
|
placeholder={t('Email')}
|
|
placeholder={t('Email')}
|
|
@@ -473,8 +474,8 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
|
|
|
);
|
|
);
|
|
|
}, [
|
|
}, [
|
|
|
handleRegisterFormSubmit, isEmailAuthenticationEnabled, isMailerSetup,
|
|
handleRegisterFormSubmit, isEmailAuthenticationEnabled, isMailerSetup,
|
|
|
- isSuccessToSendUserActivationEmail, props.email, props.name, props.username,
|
|
|
|
|
- registerErrors, registrationMode, registrationWhiteList, emailForActivationUser, switchForm, t,
|
|
|
|
|
|
|
+ isSuccessToSendRegistrationOrderEmail, props.email, props.name, props.username,
|
|
|
|
|
+ registerErrors, registrationMode, registrationWhiteList, emailForRegistrationOrder, switchForm, t,
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
return (
|
|
return (
|