api: split activation code from welcome email

Pedro Lucas Porcellis porcellis@eletrotupi.com 16 days ago 10dda3b1236e6affa6cb2722043f04c66876a354

Parents: e6b6493

6 file(s) changed

api/src/controllers/auth.ts +54 -6
api/src/lib/queue/processors/mail.ts +12 -1
api/src/lib/queue/types.ts +6 -3
api/src/routes/auth.ts +2 -0
api/src/services/mail/index.ts +1 -0
api/src/services/mail/sendActivateAccountEmail.ts +33 -0

api/src/controllers/auth.ts

@@ -1,10 +1,13 @@
    import { Request, Response, NextFunction } from 'express';
  + import { AuthenticatedRequest } from '@app/middleware/auth';
  + 
    import {
      login,
      generateToken,
      requestPasswordReset,
      resetPassword,
  -   activateUser
  +   activateUser,
  +   storeActivationCode
    } from '@app/services/auth.service';
    
    import {

@@ -14,7 +17,7 @@
    import {
      findUserByEmail,
      findUserById,
  -   findUserByActivationCode
  +   findUserByActivationCode,
    } from '@app/services/user.service'
    
    import {

@@ -24,6 +27,10 @@ PasswordResetRequestSchema,
      ActivateUserSchema
    } from '@app/schemas';
    
  + import { addMinutes } from 'date-fns';
  + import { getQueue, MailJobName } from '@app/lib/queue';
  + import crypto from 'crypto';
  + 
    export const AuthController = {
      login: async (req: Request, res: Response, next: NextFunction) => {
        try {

@@ -37,9 +44,18 @@ }
    
          const { user, token } = await login(parsed.data);
    
  -       if (!user.active) {
  -         // TODO: generate a new activation code and send an email
  -         // if the code has expired
  +       if (!user.active && (new Date() > new Date(user.activationCodeExpiresAt!))) {
  +         const code = [...Array(6)].map(() => crypto.randomInt(9))
  +         .join("");
  + 
  +         const expiresAt = addMinutes(new Date(), 5);
  +         await storeActivationCode(user.id, code, expiresAt);
  + 
  +         const mailQueue = getQueue('mail');
  +         const job = await mailQueue.add(MailJobName.ActivateAccountEmail, {
  +           userId: user.id,
  +           code: code
  +         });
          }
    
          return res.json({

@@ -145,7 +161,9 @@
          const user = await findUserByActivationCode(String(parsed.data.code));
    
          if (!user) {
  -         return res.status(403).json({ error: "Usuario não encontrado" })
  +         return res.status(422).json({
  +           error: "Código incorreto. Verifique o código e tente novamente"
  +         })
          }
    
          const result = await activateUser(user);

@@ -153,6 +171,36 @@
          return res.status(200).json({
            user: result
          });
  +     } catch (err: any) {
  +       next(err);
  +     }
  +   },
  + 
  +   resendActivationCode: async (req: AuthenticatedRequest, res: Response, next: NextFunction) => {
  +     try {
  +       const user = await findUserById(req.userId!);
  + 
  +       if (!user) {
  +         return res.status(400).json({
  +           errors: "Usuário não encontrado"
  +         })
  +       }
  + 
  +       const code = [...Array(6)].map(() => crypto.randomInt(9))
  +       .join("");
  + 
  +       const expiresAt = addMinutes(new Date(), 5);
  +       await storeActivationCode(user.id, code, expiresAt);
  + 
  +       //const mailQueue = getQueue('mail');
  +       //const job = await mailQueue.add(MailJobName.ActivateAccountEmail, {
  +       //  userId: user.id,
  +       //  code: code
  +       //});
  + 
  +       res.json({
  +         user
  +       })
        } catch (err: any) {
          next(err);
        }

api/src/lib/queue/processors/mail.ts

@@ -3,11 +3,13 @@ import {
      MailJobName, MailJobData,
      WelcomeEmailPayload,
      PasswordResetPayload,
  +   ActivateAccountEmailPayload
    } from '@app/lib/queue/types';
    
    import {
      sendWelcomeEmail,
  -   sendResetPasswordEmail
  +   sendResetPasswordEmail,
  +   sendActivateAccountEmail
    } from '@app/services/mail'
    
    export async function mailProcessor(job: Job<MailJobData['data']>): Promise<void> {

@@ -18,6 +20,15 @@ const data = job.data as WelcomeEmailPayload;
          console.log("Dispatching an welcome email", data);
    
          sendWelcomeEmail(Number(data.userId), data.code);
  + 
  +       break;
  +     }
  + 
  +     case MailJobName.ActivateAccountEmail: {
  +       const data = job.data as ActivateAccountEmailPayload;
  +       console.log("Dispatching an activate account email", data);
  + 
  +       sendActivateAccountEmail(Number(data.userId), data.code);
    
          break;
        }

api/src/lib/queue/types.ts

@@ -1,12 +1,15 @@
    // Mail queue
    export enum MailJobName {
  -   WelcomeEmail    = 'mail:welcome',
  -   PasswordReset   = 'mail:password-reset',
  +   WelcomeEmail         = 'mail:welcome',
  +   PasswordReset        = 'mail:password-reset',
  +   ActivateAccountEmail = 'mail:activate-account'
    }
    
    export type WelcomeEmailPayload    = { userId: number; code: string };
    export type PasswordResetPayload   = { userId: number; token: string };
  + export type ActivateAccountEmailPayload = { userId: number; code: string };
    
    export type MailJobData =
      | { name: MailJobName.WelcomeEmail;  data: WelcomeEmailPayload }
  -   | { name: MailJobName.PasswordReset; data: PasswordResetPayload };
  +   | { name: MailJobName.PasswordReset; data: PasswordResetPayload }
  +   | { name: MailJobName.ActivateAccountEmail; data: ActivateAccountEmailPayload };

api/src/routes/auth.ts

@@ -1,5 +1,6 @@
    import { Router } from 'express';
    import { AuthController } from '@app/controllers/auth';
  + import { requireAuth } from '@app/middleware/auth';
    
    const router = Router();
    

@@ -8,5 +9,6 @@ router.post('/forgot-password', AuthController.forgotPassword);
    router.post('/reset-password', AuthController.resetPassword);
    router.get('/verify', AuthController.verify);
    router.post('/activate', AuthController.activate);
  + router.post('/resend_code', requireAuth, AuthController.resendActivationCode);
    
    export default router;

api/src/services/mail/index.ts

@@ -1,2 +1,3 @@

1 1 export { sendWelcomeEmail } from '@app/services/mail/welcome';

2 2 export { sendResetPasswordEmail } from '@app/services/mail/sendPasswordReset'

3 + export { sendActivateAccountEmail } from '@app/services/mail/sendActivateAccountEmail';

api/src/services/mail/sendActivateAccountEmail.ts

@@ -0,0 +1,33 @@
  + import { findUserById } from '@app/services/user.service';
  + import { sendEmail }  from '@app/lib/mail';
  + 
  + const email = (firstName: string, code: string) => {
  +   return (`
  + Oi, ${firstName}.
  + 
  + Você criou sua conta no nexo. Porém, precisa ativar sua conta.
  + 
  + Aqui seu código de ativação: ${code}.
  + 
  + Qualquer coisa prende o grito!
  +   `)
  + }
  + 
  + export async function sendActivateAccountEmail(userId: number, code: string): Promise<void> {
  +   const user = await findUserById(userId)!;
  + 
  +   console.log("Email/activateAccount: ", user, code);
  + 
  +   const { data, error } = await sendEmail({
  +     to: user!.email,
  +     subject: "Ative sua conta no nexo!",
  +     text: email(user!.firstName, code)
  +   });
  + 
  +   if (error) {
  +     console.error("Error sending email: ", error);
  +   }
  + 
  +   console.log("Email sent successfully!");
  +   console.log("Email ID:", data?.id);
  + }