From d3586c9039f0db20ed8337259547ea197688269a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Omar=20L=C3=B3pez?= <zomars@me.com>
Date: Wed, 21 Jun 2023 16:29:53 -0700
Subject: [PATCH] Revert "fix: redirect to 404 page for invalid email
 verification token" (#9703)

---
 apps/web/pages/404.tsx                        | 12 +-----------
 apps/web/pages/api/auth/verify-email.ts       |  4 ++--
 apps/web/public/static/locales/en/common.json |  2 --
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/apps/web/pages/404.tsx b/apps/web/pages/404.tsx
index b61b43ba01..5d461f1691 100644
--- a/apps/web/pages/404.tsx
+++ b/apps/web/pages/404.tsx
@@ -42,10 +42,6 @@ export default function Custom404() {
   const isSubpage = router.asPath.includes("/", 2) || isSuccessPage;
   const isSignup = router.asPath.startsWith("/signup");
   const isCalcom = process.env.NEXT_PUBLIC_WEBAPP_URL === "https://app.cal.com";
-
-  // In case of invalid email verification token, we intentionally redirect to 404 from the API
-  const isInvalidToken = router.asPath === "/404";
-
   /**
    * If we're on 404 and the route is insights it means it is disabled
    * TODO: Abstract this for all disabled features
@@ -204,18 +200,12 @@ export default function Custom404() {
                   {t("error_404")}
                 </p>
                 <h1 className="font-cal text-emphasis mt-2 text-4xl font-extrabold sm:text-5xl">
-                  {isSuccessPage
-                    ? t("booking_not_found")
-                    : isInvalidToken
-                    ? t("invalid_verification_link")
-                    : t("page_doesnt_exist")}
+                  {isSuccessPage ? "Booking not found" : t("page_doesnt_exist")}
                 </h1>
                 {isSubpage ? (
                   <span className="mt-2 inline-block text-lg ">
                     {t("check_spelling_mistakes_or_go_back")}
                   </span>
-                ) : isInvalidToken ? (
-                  <span className="mt-2 inline-block text-lg">{t("token_invalid_expired")}</span>
                 ) : isCalcom ? (
                   <a target="_blank" href={url} className="mt-2 inline-block text-lg" rel="noreferrer">
                     {t("the_username")}{" "}
diff --git a/apps/web/pages/api/auth/verify-email.ts b/apps/web/pages/api/auth/verify-email.ts
index c43ce0aac2..3890cdd6a7 100644
--- a/apps/web/pages/api/auth/verify-email.ts
+++ b/apps/web/pages/api/auth/verify-email.ts
@@ -19,11 +19,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   });
 
   if (!foundToken) {
-    return res.redirect(`${WEBAPP_URL}/404`);
+    return res.status(401).json({ message: "No token found" });
   }
 
   if (dayjs(foundToken?.expires).isBefore(dayjs())) {
-    return res.redirect(`${WEBAPP_URL}/404`);
+    return res.status(401).json({ message: "Token expired" });
   }
 
   const user = await prisma.user.update({
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 331cc033d0..f1161d3d1f 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -349,7 +349,6 @@
   "no_status_bookings_yet_description": "You have no {{status}} bookings. {{description}}",
   "event_between_users": "{{eventName}} between {{host}} and {{attendeeName}}",
   "bookings": "Bookings",
-  "booking_not_found":"Booking not found",
   "bookings_description": "See upcoming and past events booked through your event type links.",
   "upcoming_bookings": "As soon as someone books a time with you it will show up here.",
   "recurring_bookings": "As soon as someone books a recurring meeting with you it will show up here.",
@@ -1729,7 +1728,6 @@
   "app_is_connected": "{{dependencyName}} is connected",
   "requires_app": "Requires {{dependencyName}}",
   "verification_code": "Verification code",
-  "invalid_verification_link": "Invalid verification link",
   "can_you_try_again": "Can you try again with a different time?",
   "verify": "Verify",
   "timezone_info": "The timezone of the person receiving",