🚸 (signin) Better disabled signups behavior

If DISABLE_SIGNUP is set to "true" will directly see a clear error message Closes #111
baptisteArno · Nov 3, 2022 · 570a780 · 570a780 · vercel · Nov 3, 2022
1 parent 3747f68
commit 570a780
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/apps/builder/components/auth/SignInForm.tsx b/apps/builder/components/auth/SignInForm.tsx
@@ -60,15 +60,20 @@ export const SignInForm = ({
   const handleEmailSubmit = async (e: FormEvent) => {
     e.preventDefault()
     setAuthLoading(true)
-    await signIn('email', {
+    const response = await signIn('email', {
       email: emailValue,
       redirect: false,
     })
-    showToast({
-      status: 'success',
-      title: 'Success!',
-      description: 'Check your inbox to sign in',
-    })
+    response?.error
+      ? showToast({
+          title: 'Unauthorized',
+          description: 'Sign ups are disabled.',
+        })
+      : showToast({
+          status: 'success',
+          title: 'Success!',
+          description: 'Check your inbox to sign in',
+        })
     setAuthLoading(false)
   }
   if (isLoadingProviders) return <Spinner />

diff --git a/apps/builder/pages/api/auth/[...nextauth].ts b/apps/builder/pages/api/auth/[...nextauth].ts
@@ -127,8 +127,10 @@ const handler = (req: NextApiRequest, res: NextApiResponse) => {
           user: userFromDb,
         }
       },
-      signIn: async ({ account }) => {
-        if (!account) return false
+      signIn: async ({ account, user }) => {
+        const userExists = user?.graphNavigation !== undefined
+        if (!account || (process.env.DISABLE_SIGNUP === 'true' && !userExists))
+          return false
         const requiredGroups = getRequiredGroups(account.provider)
         if (requiredGroups.length > 0) {
           const userGroups = await getUserGroups(account)

diff --git a/packages/db/package.json b/packages/db/package.json
@@ -5,7 +5,7 @@
   "main": "./index.ts",
   "types": "./index.ts",
   "scripts": {
-    "dev": "dotenv -e ../../apps/builder/.env.local prisma db push && pnpm generate:schema",
+    "dev": "dotenv -e ../../apps/builder/.env.local prisma db push && pnpm generate:schema && pnpm start:sutdio",
     "build": "pnpm generate:schema",
     "start:sutdio": "dotenv -e ../../apps/builder/.env.local -v BROWSER=none prisma studio",
     "generate:schema": "dotenv -e ../../apps/builder/.env.local prisma generate",