|
|
@ -6,17 +6,17 @@ import { TOKEN_COOKIE_NAME } from '../../lib/utils'; |
|
|
|
const EmailLoginForm: FunctionComponent<{}> = () => { |
|
|
|
const EmailLoginForm: FunctionComponent<{}> = () => { |
|
|
|
const [email, setEmail] = useState<string>(''); |
|
|
|
const [email, setEmail] = useState<string>(''); |
|
|
|
const [password, setPassword] = useState<string>(''); |
|
|
|
const [password, setPassword] = useState<string>(''); |
|
|
|
|
|
|
|
const [showVerifiedError, setShowVerifiedError] = useState<boolean>(false); |
|
|
|
|
|
|
|
const [message, setMessage] = useState<string>(''); |
|
|
|
|
|
|
|
|
|
|
|
const [error, setError] = useState<{ |
|
|
|
const [error, setError] = useState<{ |
|
|
|
message: string; |
|
|
|
message: string; |
|
|
|
status: number; |
|
|
|
status: number; |
|
|
|
} | null>(null); |
|
|
|
} | null>(null); |
|
|
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
const handleFormSubmit = async (e: Event) => { |
|
|
|
<form |
|
|
|
|
|
|
|
className="w-full" |
|
|
|
|
|
|
|
onSubmit={(e) => { |
|
|
|
|
|
|
|
e.preventDefault(); |
|
|
|
e.preventDefault(); |
|
|
|
fetch('http://localhost:8080/v1-login', { |
|
|
|
const res = await fetch('http://localhost:8080/v1-login', { |
|
|
|
method: 'POST', |
|
|
|
method: 'POST', |
|
|
|
headers: { |
|
|
|
headers: { |
|
|
|
'Content-Type': 'application/json', |
|
|
|
'Content-Type': 'application/json', |
|
|
@ -25,26 +25,89 @@ const EmailLoginForm: FunctionComponent<{}> = () => { |
|
|
|
email, |
|
|
|
email, |
|
|
|
password, |
|
|
|
password, |
|
|
|
}), |
|
|
|
}), |
|
|
|
}) |
|
|
|
}); |
|
|
|
.then(async (res) => { |
|
|
|
|
|
|
|
const json = await res.json(); |
|
|
|
const json = await res.json(); |
|
|
|
if (res.status === 200) { |
|
|
|
|
|
|
|
|
|
|
|
// If the response isn't ok, we'll throw an error
|
|
|
|
|
|
|
|
if (json.type === 'user_not_verified') { |
|
|
|
|
|
|
|
setError(null); |
|
|
|
|
|
|
|
setMessage(''); |
|
|
|
|
|
|
|
setShowVerifiedError(true); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
setShowVerifiedError(false); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (json.token) { |
|
|
|
|
|
|
|
// If the response is ok, we'll set the token in a cookie
|
|
|
|
Cookies.set(TOKEN_COOKIE_NAME, json.token); |
|
|
|
Cookies.set(TOKEN_COOKIE_NAME, json.token); |
|
|
|
window.location.href = '/'; |
|
|
|
window.location.href = '/'; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
const error = new Error(json.message) as any; |
|
|
|
setError({ |
|
|
|
error.status = res.status; |
|
|
|
message: json.message, |
|
|
|
throw error; |
|
|
|
status: res.status, |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}; |
|
|
|
.catch((err) => { |
|
|
|
|
|
|
|
|
|
|
|
const handleResendVerificationEmail = async () => { |
|
|
|
|
|
|
|
// Check if the verification-email-sent-at is less than 5 seconds ago
|
|
|
|
|
|
|
|
const verificationEmailSentAt = localStorage.getItem( |
|
|
|
|
|
|
|
'verification-email-sent-at' |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (verificationEmailSentAt) { |
|
|
|
|
|
|
|
const now = new Date(); |
|
|
|
|
|
|
|
if (Number(verificationEmailSentAt) > now.getTime()) { |
|
|
|
|
|
|
|
setMessage(''); |
|
|
|
|
|
|
|
setShowVerifiedError(false); |
|
|
|
setError({ |
|
|
|
setError({ |
|
|
|
message: err.message, |
|
|
|
message: 'Please wait before sending another verification email.', |
|
|
|
status: 400, |
|
|
|
status: 429, |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const res = await fetch( |
|
|
|
|
|
|
|
'http://localhost:8080/v1-send-verification-email', |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
method: 'POST', |
|
|
|
|
|
|
|
headers: { |
|
|
|
|
|
|
|
'Content-Type': 'application/json', |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
body: JSON.stringify({ |
|
|
|
|
|
|
|
email, |
|
|
|
|
|
|
|
}), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
const json = await res.json(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// If the response isn't ok, we'll throw an error
|
|
|
|
|
|
|
|
if (!res.ok) { |
|
|
|
|
|
|
|
setError({ |
|
|
|
|
|
|
|
message: json.message, |
|
|
|
|
|
|
|
status: res.status, |
|
|
|
}); |
|
|
|
}); |
|
|
|
}} |
|
|
|
} |
|
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
// If the response is ok, we'll set the token in a cookie
|
|
|
|
|
|
|
|
setShowVerifiedError(false); |
|
|
|
|
|
|
|
setMessage('Verification instructions have been sent to your email.'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Current time + 5 seconds, save it to localStorage
|
|
|
|
|
|
|
|
const now = new Date(); |
|
|
|
|
|
|
|
const time = now.getTime(); |
|
|
|
|
|
|
|
const expireTime = time + 5000; |
|
|
|
|
|
|
|
now.setTime(expireTime); |
|
|
|
|
|
|
|
localStorage.setItem( |
|
|
|
|
|
|
|
'verification-email-sent-at', |
|
|
|
|
|
|
|
now.getTime().toString() |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
|
|
|
|
<form className="w-full" onSubmit={handleFormSubmit}> |
|
|
|
<label htmlFor="email" className="sr-only"> |
|
|
|
<label htmlFor="email" className="sr-only"> |
|
|
|
Email address |
|
|
|
Email address |
|
|
|
</label> |
|
|
|
</label> |
|
|
@ -78,6 +141,22 @@ const EmailLoginForm: FunctionComponent<{}> = () => { |
|
|
|
<div className="mt-2 text-sm text-red-500">{error.message}</div> |
|
|
|
<div className="mt-2 text-sm text-red-500">{error.message}</div> |
|
|
|
)} |
|
|
|
)} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{message && <div className="mt-2 text-sm text-slate-600">{message}</div>} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{showVerifiedError && ( |
|
|
|
|
|
|
|
<div className="mt-2 text-sm text-slate-600"> |
|
|
|
|
|
|
|
Your account is not verified. Please click the verification link in |
|
|
|
|
|
|
|
your email. Or{' '} |
|
|
|
|
|
|
|
<button |
|
|
|
|
|
|
|
type="button" |
|
|
|
|
|
|
|
className="text-blue-600 hover:text-blue-500" |
|
|
|
|
|
|
|
onClick={handleResendVerificationEmail} |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
resend verification email. |
|
|
|
|
|
|
|
</button> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
)} |
|
|
|
|
|
|
|
|
|
|
|
<button |
|
|
|
<button |
|
|
|
type="submit" |
|
|
|
type="submit" |
|
|
|
className="mt-3 inline-flex h-10 w-full items-center justify-center rounded-lg border border-slate-300 bg-black p-2 text-sm font-medium text-white outline-none transition duration-150 ease-in-out focus:ring-2 focus:ring-black focus:ring-offset-1 disabled:opacity-60" |
|
|
|
className="mt-3 inline-flex h-10 w-full items-center justify-center rounded-lg border border-slate-300 bg-black p-2 text-sm font-medium text-white outline-none transition duration-150 ease-in-out focus:ring-2 focus:ring-black focus:ring-offset-1 disabled:opacity-60" |
|
|
|