api: update user password and data

Pedro Lucas Porcellis porcellis@eletrotupi.com 1 month ago 4ad3b1e9ec83ec2f5e944d38157d375ca9158c4d

Parents: ac4f34f

2 file(s) changed

api/src/controllers/users.ts +25 -17
api/src/models/user.ts +11 -0

api/src/controllers/users.ts

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

api/src/models/user.ts

@@ -20,6 +20,8 @@ type UserOptions = {
      email: string;
      firstName: string;
      lastName: string;
  +   password?: string;
  +   encryptedPassword?: string;
    };
    
    const createUser = async (email: string, firstName: string, lastName: string, password: string) => {

@@ -146,6 +148,15 @@ return { success: true };
    };
    
    const updateUser = async (user: any, data: UserOptions) => {
  +   const { password } = data;
  + 
  +   if (password) {
  +     const encryptedPassword = bcrypt.hashSync(password, 10);
  + 
  +     delete data.password;
  +     data = { ...data, encryptedPassword }
  +   }
  + 
      return await prisma.user.update({
        where: { id: user.id },
        data