Login with magic code

components/login.js

@@ -42,7 +42,7 @@ const authErrorMessages = {
   OAuthCallback: 'Error handling OAuth response. Try again or choose a different method.',
   OAuthCreateAccount: 'Could not create OAuth account. Try again or choose a different method.',
   EmailCreateAccount: 'Could not create Email account. Try again or choose a different method.',
-  Callback: 'Error in callback handler. Try again or choose a different method.',
+  Callback: 'Try again or choose a different method.',
   OAuthAccountNotLinked: 'This auth method is linked to another account. To link to this account first unlink the other account.',
   EmailSignin: 'Failed to send email. Make sure you entered your email address correctly.',
   CredentialsSignin: 'Auth failed. Try again or choose a different method.',

pages/api/auth/[...nextauth].js

@@ -329,14 +329,17 @@ export const getAuthOptions = (req, res) => ({
       // we need to find the most recent verification request for this email/identifier
       const verificationRequest = await prisma.verificationToken.findFirst({
         where: {
-          identifier
+          identifier,
+          attempts: {
+            lt: 2 // count starts at 0
+          }
         },
         orderBy: {
           createdAt: 'desc'
         }
       })
 
-      if (!verificationRequest) return null
+      if (!verificationRequest) throw new Error('No verification request found')
 
       if (verificationRequest.token === token) { // if correct delete the token and continue
         await prisma.verificationToken.delete({
@@ -345,17 +348,14 @@ export const getAuthOptions = (req, res) => ({
         return verificationRequest
       }
 
-      const newAttempts = verificationRequest.attempts + 1
-      if (newAttempts > 3) { // the moment the user has tried 3 times, delete the token
-        await prisma.verificationToken.delete({
-          where: { id: verificationRequest.id }
-        })
-      } else { // otherwise, just increment the failed attempts
-        await prisma.verificationToken.update({
-          where: { id: verificationRequest.id },
-          data: { attempts: newAttempts }
-        })
-      }
+      await prisma.verificationToken.update({
+        where: { id: verificationRequest.id },
+        data: { attempts: { increment: 1 } }
+      })
+
+      await prisma.verificationToken.deleteMany({
+        where: { id: verificationRequest.id, attempts: { gte: 2 } }
+      })
 
       return null
     }

pages/auth/error.js

@@ -27,12 +27,11 @@ export default function AuthError ({ error }) {
       <StaticLayout>
         <Image className='rounded-1 shadow-sm' width='500' height='375' src={`${process.env.NEXT_PUBLIC_ASSET_PREFIX}/double.gif`} fluid />
         <h2 className='pt-4'>Incorrect magic code</h2>
-        <h4 className='text-muted text-center pt-2'>login again and get a new magic code</h4>
         <Button
           className='align-items-center my-3'
           style={{ borderWidth: '2px' }}
           id='login'
-          onClick={() => router.push('/login')}
+          onClick={() => router.back()}
           size='lg'
         >
           try again