From e783bb4121abc57ee809176fd2c8d60766f45fa8 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <baptiste.arnaud95@gmail.com>
Date: Mon, 19 Feb 2024 10:28:57 +0100
Subject: [PATCH] :technologist: Improve sign up error message

---
 .../src/features/auth/components/SignInForm.tsx       | 11 ++++++++++-
 apps/builder/src/pages/api/auth/[...nextauth].ts      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/builder/src/features/auth/components/SignInForm.tsx b/apps/builder/src/features/auth/components/SignInForm.tsx
index b79c0b5fc..c850dcad8 100644
--- a/apps/builder/src/features/auth/components/SignInForm.tsx
+++ b/apps/builder/src/features/auth/components/SignInForm.tsx
@@ -94,11 +94,20 @@ export const SignInForm = ({
             status: 'info',
             description: t('auth.signinErrorToast.tooManyRequests'),
           })
-        else
+        else if (response.error.includes('sign-up-disabled'))
           showToast({
             title: t('auth.signinErrorToast.title'),
             description: t('auth.signinErrorToast.description'),
           })
+        else
+          showToast({
+            status: 'info',
+            description: t('errorMessage'),
+            details: {
+              content: 'Check server logs to see relevent error message.',
+              lang: 'json',
+            },
+          })
       } else {
         setIsMagicLinkSent(true)
       }
diff --git a/apps/builder/src/pages/api/auth/[...nextauth].ts b/apps/builder/src/pages/api/auth/[...nextauth].ts
index a144fad58..1225755c5 100644
--- a/apps/builder/src/pages/api/auth/[...nextauth].ts
+++ b/apps/builder/src/pages/api/auth/[...nextauth].ts
@@ -174,7 +174,7 @@ export const getAuthOptions = ({
         const { invitations, workspaceInvitations } =
           await getNewUserInvitations(prisma, user.email)
         if (invitations.length === 0 && workspaceInvitations.length === 0)
-          return false
+          throw new Error('sign-up-disabled')
       }
       const requiredGroups = getRequiredGroups(account.provider)
       if (requiredGroups.length > 0) {