From a93fed448f6aadeb279d9f837271bd121faa6536 Mon Sep 17 00:00:00 2001
From: Piyush Gupta <56182734+gupta-piyush19@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:58:32 +0530
Subject: [PATCH] fix: user delete bug (#4550)

Co-authored-by: pandeymangg <anshuman.pandey9999@gmail.com>
---
 apps/web/app/(app)/environments/[environmentId]/layout.tsx | 2 +-
 apps/web/app/page.tsx                                      | 4 +++-
 apps/web/i18n/request.ts                                   | 7 +++----
 .../account/components/DeleteAccountModal/index.tsx        | 6 +++++-
 apps/web/modules/ui/components/client-logout/index.tsx     | 2 ++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/layout.tsx b/apps/web/app/(app)/environments/[environmentId]/layout.tsx
index fdabd0338b..9507064fd7 100644
--- a/apps/web/app/(app)/environments/[environmentId]/layout.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/layout.tsx
@@ -31,7 +31,7 @@ const EnvLayout = async (props: {
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    return redirect(`/auth/login`);
   }
 
   const hasAccess = await hasUserEnvironmentAccess(session.user.id, params.environmentId);
diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx
index 69a800b8a2..4d094ba18f 100644
--- a/apps/web/app/page.tsx
+++ b/apps/web/app/page.tsx
@@ -9,6 +9,7 @@ import { getIsFreshInstance } from "@formbricks/lib/instance/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getOrganizationsByUserId } from "@formbricks/lib/organization/service";
+import { getUser } from "@formbricks/lib/user/service";
 
 const Page = async () => {
   const session: Session | null = await getServerSession(authOptions);
@@ -22,7 +23,8 @@ const Page = async () => {
     }
   }
 
-  if (!session?.user) {
+  const user = await getUser(session.user.id);
+  if (!user) {
     return <ClientLogout />;
   }
 
diff --git a/apps/web/i18n/request.ts b/apps/web/i18n/request.ts
index c1ca7d78ec..d906da7519 100644
--- a/apps/web/i18n/request.ts
+++ b/apps/web/i18n/request.ts
@@ -7,11 +7,10 @@ import { findMatchingLocale } from "@formbricks/lib/utils/locale";
 
 export default getRequestConfig(async () => {
   const session = await getServerSession(authOptions);
-  const locale = session ? await getUserLocale(session.user?.id) : await findMatchingLocale();
+  let locale = session ? await getUserLocale(session.user?.id) : await findMatchingLocale();
+  locale = locale ? locale : DEFAULT_LOCALE;
   // Lazy load the locale-specific messages
-  const messages = await import(`@formbricks/lib/messages/${locale ?? DEFAULT_LOCALE}.json`).then(
-    (module) => module.default
-  );
+  const messages = await import(`@formbricks/lib/messages/${locale}.json`).then((module) => module.default);
 
   return {
     locale,
diff --git a/apps/web/modules/account/components/DeleteAccountModal/index.tsx b/apps/web/modules/account/components/DeleteAccountModal/index.tsx
index b078f00666..2d997c0412 100644
--- a/apps/web/modules/account/components/DeleteAccountModal/index.tsx
+++ b/apps/web/modules/account/components/DeleteAccountModal/index.tsx
@@ -88,7 +88,11 @@ export const DeleteAccountModal = ({
           )}
           <li>{t("environments.settings.profile.warning_cannot_undo")}</li>
         </ul>
-        <form>
+        <form
+          onSubmit={async (e) => {
+            e.preventDefault();
+            await deleteAccount();
+          }}>
           <label htmlFor="deleteAccountConfirmation">
             {t("environments.settings.profile.please_enter_email_to_confirm_account_deletion", {
               email: user.email,
diff --git a/apps/web/modules/ui/components/client-logout/index.tsx b/apps/web/modules/ui/components/client-logout/index.tsx
index 04b0c45810..41a7ddfd82 100644
--- a/apps/web/modules/ui/components/client-logout/index.tsx
+++ b/apps/web/modules/ui/components/client-logout/index.tsx
@@ -1,10 +1,12 @@
 "use client";
 
+import { formbricksLogout } from "@/app/lib/formbricks";
 import { signOut } from "next-auth/react";
 import { useEffect } from "react";
 
 export const ClientLogout = () => {
   useEffect(() => {
+    formbricksLogout();
     signOut();
   });
   return null;