Merge pull request #1152 from Open-Earth-Foundation/fix/email-redirec…

…t-url Fix/email redirect url
Open-Earth-Foundation · Feb 24, 2025 · 0cf43c3 · 0cf43c3
2 parents 3a0d3af + 055057a
commit 0cf43c3
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/src/app/[lng]/auth/login/page.tsx b/app/src/app/[lng]/auth/login/page.tsx
@@ -90,6 +90,27 @@ export default function Login({
     }
   };
 
+  // Extract doesInvitedUserExist from callback params\
+  // If it is true, redirect to /user/invites page
+  // If it is false, redirect to /auth/signup page
+  // Check if the callbackUrl contains a query string
+  const hasQueryString = callbackUrl.includes("?");
+  // Split the URL into path and query string (if query string exists)
+  const [path, queryString] = hasQueryString
+    ? callbackUrl.split("?")
+    : [callbackUrl, ""];
+  const callbackUrlParams = new URLSearchParams(queryString);
+  const doesInvitedUserExist = callbackUrlParams.get("doesInvitedUserExist");
+
+  if (doesInvitedUserExist && doesInvitedUserExist !== "true") {
+    // remove the doesInvitedUserExist param from the callbackUrl
+    callbackUrlParams.delete("doesInvitedUserExist");
+    const updatedCallbackUrl = `${path}?${callbackUrlParams.toString()}`;
+    return router.push(
+      "/auth/signup/?callbackUrl=" + encodeURIComponent(updatedCallbackUrl),
+    );
+  }
+
   return (
     <Box>
       <Heading size="xl">{t("login-heading")}</Heading>

diff --git a/app/src/app/api/v0/user/invites/route.ts b/app/src/app/api/v0/user/invites/route.ts
@@ -123,8 +123,23 @@ export const POST = apiHandler(async (req, { params, session }) => {
             }
           }),
         );
+        // Check if invited user exists then flag that user if they don't exist in the database
+
+        const doesInvitedUserExist = await db.models.User.findOne({
+          where: { email },
+        });
         const host = process.env.HOST ?? "http://localhost:3000";
-        const url = `${host}/user/invites?cityIds=${encodeURIComponent(invites.map((i) => i.cityId).join(","))}&token=${encodeURIComponent(invitationCode)}&email=${encodeURIComponent(email)}`;
+        const params = new URLSearchParams();
+
+        // Add query parameters
+        params.set("cityIds", invites.map((i) => i.cityId).join(","));
+        params.set("token", invitationCode);
+        params.set("email", email);
+        params.set(
+          "doesInvitedUserExist",
+          doesInvitedUserExist ? "true" : "false",
+        );
+        const url = `${host}/user/invites?${params.toString()}`;
         const sendInvite = await sendEmail({
           to: email!,
           subject: "City Catalyst - City Invitation",