From f5b1b80f4cce345cca6c9e043be6a5a110cd13fc Mon Sep 17 00:00:00 2001
From: pilcrowOnPaper <pilcrowonpaper@gmail.com>
Date: Sun, 6 Oct 2024 16:08:14 +0900
Subject: [PATCH] update email verification

---
 src/routes/verify-email/+page.server.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/routes/verify-email/+page.server.ts b/src/routes/verify-email/+page.server.ts
index 4cb7887..f4ed5ce 100644
--- a/src/routes/verify-email/+page.server.ts
+++ b/src/routes/verify-email/+page.server.ts
@@ -130,15 +130,6 @@ async function resendEmail(event: RequestEvent) {
 			}
 		});
 	}
-
-	if (!sendVerificationEmailBucket.consume(event.locals.user.id, 1)) {
-		return fail(429, {
-			resend: {
-				message: "Too many requests"
-			}
-		});
-	}
-
 	let verificationRequest = getUserEmailVerificationRequestFromRequest(event);
 	if (verificationRequest === null) {
 		if (event.locals.user.emailVerified) {
@@ -148,8 +139,22 @@ async function resendEmail(event: RequestEvent) {
 				}
 			});
 		}
+		if (!sendVerificationEmailBucket.consume(event.locals.user.id, 1)) {
+			return fail(429, {
+				resend: {
+					message: "Too many requests"
+				}
+			});
+		}
 		verificationRequest = createEmailVerificationRequest(event.locals.user.id, event.locals.user.email);
 	} else {
+		if (!sendVerificationEmailBucket.consume(event.locals.user.id, 1)) {
+			return fail(429, {
+				resend: {
+					message: "Too many requests"
+				}
+			});
+		}
 		verificationRequest = createEmailVerificationRequest(event.locals.user.id, verificationRequest.email);
 	}
 	sendVerificationEmail(verificationRequest.email, verificationRequest.code);