api: move sign up to service & use zod schemas

Pedro Lucas Porcellis porcellis@eletrotupi.com 1 month ago 88d7ba76dc54469a8a0bf8d1f5da7ba67d8b612a

Parents: 7e976ff

6 file(s) changed

api/src/controllers/users.ts +16 -17
api/src/lib/jwt.ts +1 -0
api/src/models/user.ts +0 -30
api/src/schemas/index.ts +8 -0
api/src/schemas/user.schema.ts +19 -0
api/src/services/user.service.ts +18 -0

api/src/controllers/users.ts

@@ -1,6 +1,5 @@
    import { Request, Response, NextFunction } from 'express';
    import {
  -   createUser,
      findUserById,
      findUserByEmail,
      updateUser,

@@ -12,34 +11,34 @@ validateRequiredFields
    } from '@app/utils/validators'
    
    import { getQueue, MailJobName } from '@app/lib/queue';
  + import {
  +   CreateUserSchema
  + } from '@app/schemas';
  + 
  + import {
  +   createUser
  + } from '@app/services/user.service';
    
    export const UsersController = {
      create: async (req: Request, res: Response, next: NextFunction) => {
        try {
  -       const { email, password, firstName, lastName } = req.body;
  +       const parsed = CreateUserSchema.safeParse(req.body.user);
    
  -       // Validate required fields
  -       const requiredValidation = validateRequiredFields(req.body, [
  -         'email', 'password', 'firstName'
  -       ]);
  - 
  -       if (!requiredValidation.valid) {
  -         return res.status(400).json({
  -           error: "Campos faltantes",
  -           missing: requiredValidation.missing
  -         });
  +       if (!parsed.success) {
  +         return res.status(422).json({
  +           errors: parsed.error!.issues
  +         })
          }
    
  -       const user = await createUser(
  -         email, firstName, lastName, password
  -       );
  - 
  +       const user = await createUser(parsed.data);
          const jwtToken = generateToken(user.id, user.email);
    
          const mailQueue = getQueue('mail');
          const job = await mailQueue.add(MailJobName.WelcomeEmail, { userId: user.id });
    
  -       res.status(201).json({ token: jwtToken });
  +       res.status(201).json({
  +         token: jwtToken
  +       });
        } catch (err) {
          next(err);
        }

api/src/lib/jwt.ts

@@ -31,4 +31,4 @@ };
    
    export const isTokenExpired = (expirationDate: Date): boolean => {
      return new Date() > expirationDate;
  - };
  + };

api/src/models/user.ts

@@ -24,35 +24,6 @@ password?: string;
      encryptedPassword?: string;
    };
    
  - const createUser = async (email: string, firstName: string, lastName: string, password: string) => {
  -   // Validate email format
  -   if (!isValidEmail(email)) {
  -     throw new InvalidEmailError()
  -   }
  - 
  -   // Validate password strength
  -   if (!isValidPassword(password)) {
  -     throw new ShortPasswordError()
  -   }
  - 
  -   const encryptedPassword = bcrypt.hashSync(password, 10);
  - 
  -   try {
  -     const user = await prisma.user.create({
  -       data: {
  -         email,
  -         firstName,
  -         lastName,
  -         encryptedPassword
  -       }
  -     });
  - 
  -     return user;
  -   } catch (err: any) {
  -     throw err;
  -   }
  - }
  - 
    const generateToken = (userId: number, email: string) => {
      return createJWT(userId, email);
    }

@@ -165,7 +136,6 @@ });
    }
    
    export {
  -   createUser,
      findUserById,
      generateToken,
      findUserByEmail,

api/src/schemas/index.ts

@@ -6,3 +6,11 @@
    export type {
      CreateMoodInput
    } from '@app/schemas/mood.schema';
  + 
  + export {
  +   CreateUserSchema
  + } from '@app/schemas/user.schema';
  + 
  + export type {
  +   CreateUserInput
  + } from '@app/schemas/user.schema';

api/src/schemas/user.schema.ts

@@ -0,0 +1,19 @@
  + import { z } from 'zod';
  + 
  + export const CreateUserSchema = z.object({
  +   firstName: z.string(),
  +   lastName: z.string().optional(),
  +   email: z.string().email(),
  +   password: z.string().min(6)
  + });
  + 
  + export type CreateUserInput = z.infer<typeof CreateUserSchema>;
  + 
  + export const UpdateUserSchema = z.object({
  +   firstName: z.string(),
  +   lastName: z.string().optional(),
  +   email: z.string().email(),
  +   password: z.string().min(6)
  + });
  + 
  + export type UpdateUserInput = z.infer<typeof UpdateUserSchema>;

api/src/services/user.service.ts

@@ -0,0 +1,18 @@
  + import { prisma } from '@app/lib/prisma';
  + import { User } from '@prisma/client';
  + import bcrypt from 'bcryptjs';
  + 
  + import {
  +   CreateUserInput
  + } from "@app/schemas";
  + 
  + export const createUser = async(input: CreateUserInput): Promise<User> => {
  +   const { password, ...data } = input;
  +   const encryptedPassword = bcrypt.hashSync(password, 10);
  + 
  +   return await prisma.user.create({
  +     data: {
  +       ...data, encryptedPassword
  +     }
  +   })
  + }