api: update user and drop old create-app

Pedro Lucas Porcellis porcellis@eletrotupi.com 2 months ago 090c04dfa3141e1224b12a76d3c2aaee605a1e88

Parents: cc08a06

5 file(s) changed

api/src/controllers/users.ts +35 -2
api/src/createApp.ts +3 -0
api/src/index.ts +1 -1
api/src/models/user.ts +24 -4
api/src/routes/users.ts +1 -0

api/src/controllers/users.ts

@@ -1,6 +1,9 @@
    import { Request, Response, NextFunction } from 'express';
    import {
      createUser,
  +   findUserById,
  +   findUserByEmail,
  +   updateUser,
      generateToken
    } from '@app/models/user';
    

@@ -11,11 +14,11 @@
    export const UsersController = {
      create: async (req: Request, res: Response, next: NextFunction) => {
        try {
  -       const { email, password, first_name: firstName, last_name: lastName } = req.body;
  +       const { email, password, firstName, lastName } = req.body;
    
          // Validate required fields
          const requiredValidation = validateRequiredFields(req.body, [
  -         'email', 'password', 'first_name'
  +         'email', 'password', 'firstName'
          ]);
    
          if (!requiredValidation.valid) {

@@ -32,6 +35,36 @@
          const jwtToken = generateToken(user.id, user.email);
    
          res.status(201).json({ token: jwtToken });
  +     } catch (err) {
  +       next(err);
  +     }
  +   },
  + 
  +   update: async (req: Request, res: Response, next: NextFunction) => {
  +     try {
  +       const { id } = req.params
  +       const { email, password, firstName, lastName } = req.body;
  + 
  +       const user = await findUserById(Number(id));
  + 
  +       if (!user) {
  +         return res.status(404).json({
  +           error: "Usuário não encontrado"
  +         })
  +       }
  + 
  +       if (email || password || firstName || lastName) {
  +         const response = await updateUser(user, {
  +           email, firstName, lastName
  +         })
  +       }
  + 
  +       const updated = await findUserById(Number(id))
  + 
  +       // TODO: Drop encrypted password & token here
  +       return res.status(200).json({
  +         user: updated
  +       })
        } catch (err) {
          next(err);
        }

api/src/createApp.ts

@@ -1,5 +1,6 @@
    import express from 'express';
    import cors from 'cors';
  + import bodyParser from 'body-parser';
    import morgan from 'morgan';
    import userRouter from '@app/routes/users';
    import authRouter from '@app/routes/auth';

@@ -16,6 +17,7 @@ credentials: true
      }));
    
      app.use(express.json());
  +   app.use(bodyParser.json());
    
      // Only use morgan in non-test environments
      if (process.env.NODE_ENV !== 'test') {

@@ -33,4 +35,4 @@
      app.use(errorHandler); // always last
    
      return app;
  - }
  + }

api/src/index.ts

@@ -1,4 +1,4 @@
  - import { createApp } from '@app/create-app';
  + import { createApp } from '@app/createApp';
    
    const port = process.env.PORT || 3000;
    

api/src/models/user.ts

@@ -16,6 +16,12 @@ } from "@app/utils/validators";
    
    import { InvalidEmailError, ShortPasswordError } from '@app/lib/errors/UserErrors'
    
  + type UserOptions = {
  +   email: string;
  +   firstName: string;
  +   lastName: string;
  + };
  + 
    const createUser = async (email: string, firstName: string, lastName: string, password: string) => {
      // Validate email format
      if (!isValidEmail(email)) {

@@ -26,7 +32,7 @@ // Validate password strength
      if (!isValidPassword(password)) {
        throw new ShortPasswordError()
      }
  -   
  + 
      const encryptedPassword = bcrypt.hashSync(password, 10);
    
      try {

@@ -41,14 +47,19 @@ });
    
        return user;
      } catch (err: any) {
  -     console.log(err)
  -     throw new Error("Something was off when creating user")
  +     throw err;
      }
    }
    
    const generateToken = (userId: number, email: string) => {
      return createJWT(userId, email);
    }
  + 
  + const findUserById = async (id: number) => {
  +   return await prisma.user.findUnique({
  +     where: { id }
  +   });
  + };
    
    const findUserByEmail = async (email: string) => {
      return await prisma.user.findUnique({

@@ -134,11 +145,20 @@
      return { success: true };
    };
    
  + const updateUser = async (user: any, data: UserOptions) => {
  +   return await prisma.user.update({
  +     where: { id: user.id },
  +     data
  +   });
  + }
  + 
    export {
      createUser,
  +   findUserById,
      generateToken,
      findUserByEmail,
      authenticateUser,
      initiatePasswordReset,
  -   resetPassword
  +   resetPassword,
  +   updateUser
    }

api/src/routes/users.ts

@@ -4,5 +4,6 @@
    const router = Router();
    
    router.post('/', UsersController.create);
  + router.put('/:id', UsersController.update);
    
    export default router;