Merge branch 'dev' into main

Author: gustavotoyota

apps/app-server/src/fastify/server.ts

@@ -64,8 +64,9 @@ export const fastify = once(async () => {
   });
 
   await fastify.register(import('@fastify/rate-limit'), {
-    max: 5 * 60,
-    timeWindow: 5 * 1000,
+    // Accept up to 5 requests/second within 5 minutes
+    max: 5 * 60 * 5,
+    timeWindow: 5 * 60 * 1000,
 
     redis: getRedis(),
   });

apps/app-server/src/trpc/api/sessions/login.ts

@@ -28,6 +28,8 @@ import { getUserDevice } from 'src/utils/devices';
 import { generateSessionValues } from 'src/utils/sessions';
 import { z } from 'zod';
 
+import { sendRegistrationEmail } from '../users/account/register';
+
 const baseProcedure = publicProcedure.input(
   z.object({
     email: z
@@ -90,6 +92,8 @@ export async function login({
         'users.id',
 
         'users.email_verified',
+        'users.email_verification_code',
+
         'users.encrypted_rehashed_login_hash',
 
         'users.public_keyring',
@@ -148,6 +152,20 @@ export async function login({
       });
     }
 
+    // Check if email is verified
+
+    if (!user.email_verified) {
+      await sendRegistrationEmail({
+        email: input.email,
+        emailVerificationCode: user.email_verification_code,
+      });
+
+      throw new TRPCError({
+        message: 'Email awaiting verification. New email sent.',
+        code: 'UNAUTHORIZED',
+      });
+    }
+
     // Get user device
 
     const device = await getUserDevice({

apps/app-server/src/trpc/api/users/account/index.ts

@@ -3,12 +3,14 @@ import { trpc } from 'src/trpc/server';
 import { deleteProcedure } from './delete';
 import { emailChangeRouter } from './email-change';
 import { registerProcedure } from './register';
+import { resendVerificationEmailProcedure } from './resend-verification-email';
 import { stripeRouter } from './stripe';
 import { twoFactorAuthRouter } from './two-factor-auth';
 import { verifyEmailProcedure } from './verify-email';
 
 export const accountRouter = trpc.router({
   register: registerProcedure(),
+  resendVerificationEmail: resendVerificationEmailProcedure(),
   verifyEmail: verifyEmailProcedure(),
 
   emailChange: emailChangeRouter,

apps/app-server/src/trpc/api/users/account/register.ts

@@ -38,7 +38,7 @@ export async function register({
           .where('email_verified', true)
           .orWhere('email_verification_expiration_date', '>', new Date()),
       )
-      .select('email_verified')
+      .select('email_verified', 'email_verification_code')
       .first();
 
     // Check if user already exists
@@ -52,9 +52,14 @@ export async function register({
           code: 'CONFLICT',
         });
       } else {
+        await sendRegistrationEmail({
+          email: input.email,
+          emailVerificationCode: user.email_verification_code,
+        });
+
         throw new TRPCError({
-          message: 'Email awaiting verification.',
-          code: 'CONFLICT',
+          message: 'Email awaiting verification. New email sent.',
+          code: 'UNAUTHORIZED',
         });
       }
     }
@@ -74,18 +79,28 @@ export async function register({
 
     // Send email
 
-    await sendMail({
-      from: {
-        name: 'DeepNotes',
-        email: 'account@deepnotes.app',
-      },
-      to: [input.email],
-      subject: 'Complete your registration',
-      html: `
-        Visit the following link to verify your email address:<br/>
-        <a href="https://deepnotes.app/verify-email/${user.email_verification_code}">https://deepnotes.app/verify-email/${user.email_verification_code}</a><br/>
-        The link above will expire in 1 hour.
-      `,
+    await sendRegistrationEmail({
+      email: input.email,
+      emailVerificationCode: user.email_verification_code,
     });
   });
 }
+
+export async function sendRegistrationEmail(input: {
+  email: string;
+  emailVerificationCode: string | null;
+}) {
+  await sendMail({
+    from: {
+      name: 'DeepNotes',
+      email: 'account@deepnotes.app',
+    },
+    to: [input.email],
+    subject: 'Complete your registration',
+    html: `
+      Visit the following link to verify your email address:<br/>
+      <a href="https://deepnotes.app/verify-email/${input.emailVerificationCode}">https://deepnotes.app/verify-email/${input.emailVerificationCode}</a><br/>
+      The link above expires in 1 hour.
+    `,
+  });
+}

apps/app-server/src/trpc/api/users/account/resend-verification-email.ts

@@ -0,0 +1,59 @@
+import { hashUserEmail } from '@deeplib/data';
+import { UserModel } from '@deeplib/db';
+import { w3cEmailRegex } from '@stdlib/misc';
+import { TRPCError } from '@trpc/server';
+import { once } from 'lodash';
+import type { InferProcedureOpts } from 'src/trpc/helpers';
+import { publicProcedure } from 'src/trpc/helpers';
+import { z } from 'zod';
+
+import { sendRegistrationEmail } from './register';
+
+const baseProcedure = publicProcedure.input(
+  z.object({
+    email: z
+      .string()
+      .regex(w3cEmailRegex)
+      .transform((email) => email.toLowerCase()),
+  }),
+);
+
+export const resendVerificationEmailProcedure = once(() =>
+  baseProcedure.mutation(resendVerificationEmail),
+);
+
+export async function resendVerificationEmail({
+  input,
+}: InferProcedureOpts<typeof baseProcedure>) {
+  // Get user
+
+  const user = await UserModel.query()
+    .where('email_hash', Buffer.from(hashUserEmail(input.email)))
+    .select('email_verified', 'email_verification_code')
+    .first();
+
+  // Check if user already exists
+
+  if (user == null) {
+    throw new TRPCError({
+      message: 'User not found.',
+      code: 'NOT_FOUND',
+    });
+  }
+
+  // User already exists, check if email is verified
+
+  if (user.email_verified) {
+    throw new TRPCError({
+      message: 'Email already registered.',
+      code: 'CONFLICT',
+    });
+  }
+
+  // Send email
+
+  await sendRegistrationEmail({
+    email: input.email,
+    emailVerificationCode: user.email_verification_code,
+  });
+}

apps/client/src/pages/home/FinishRegistration.vue

@@ -11,21 +11,47 @@
           Check your email to proceed.
         </div>
 
-        <Gap style="height: 32px" />
-      </template>
+        <Gap style="height: 24px" />
+
+        <DeepBtn
+          label="Resend verification email"
+          color="primary"
+          style="font-size: 16px; padding: 10px 22px"
+          @click="resendVerificationEmail()"
+        />
 
-      <DeepBtn
-        label="Go to login"
-        color="primary"
-        style="font-size: 16px; padding: 10px 22px"
-        :to="{ name: 'login' }"
-      />
+        <Gap style="height: 64px" />
+
+        <DeepBtn
+          label="Go to login"
+          color="primary"
+          style="padding: 10px 22px"
+          :to="{ name: 'login' }"
+        />
+      </template>
     </ResponsiveContainer>
   </q-page>
 </template>
 
 <script setup lang="ts">
+import { handleError } from 'src/code/utils/misc';
+
 useMeta(() => ({
   title: 'Finish registration - DeepNotes',
 }));
+
+async function resendVerificationEmail() {
+  try {
+    await trpcClient.users.account.resendVerificationEmail.mutate({
+      email: internals.sessionStorage?.getItem('email'),
+    });
+
+    $quasar().notify({
+      message: 'Verification email resent.',
+      type: 'positive',
+    });
+  } catch (error) {
+    handleError(error);
+  }
+}
 </script>