api: activate user account

Pedro Lucas Porcellis porcellis@eletrotupi.com 16 days ago e6b6493185741dd24cf765760d87180cb7e1f6a1

Parents: 6d8c0a7

5 file(s) changed

api/src/controllers/auth.ts +12 -3
api/src/controllers/users.ts +2 -2
api/src/schemas/auth.schema.ts +1 -2
api/src/services/auth.service.ts +3 -3
api/src/services/user.service.ts +8 -0

api/src/controllers/auth.ts

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

@@ -35,6 +36,11 @@ });
          }
    
          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
  +       }
    
          return res.json({
            token,

@@ -136,14 +142,17 @@ errors: parsed.error!.issues
            });
          }
    
  -       const user = await findUserById(parsed.data.userId);
  +       const user = await findUserByActivationCode(String(parsed.data.code));
    
          if (!user) {
            return res.status(403).json({ error: "Usuario não encontrado" })
          }
    
  -       const result = await activateUser(user, parsed.data);
  -       return res.status(200).json(result);
  +       const result = await activateUser(user);
  + 
  +       return res.status(200).json({
  +         user: result
  +       });
        } catch (err: any) {
          next(err);
        }

api/src/controllers/users.ts

@@ -50,8 +50,8 @@
          const user = await createUser(parsed.data);
          const jwtToken = generateToken(user.id, user.email);
    
  -       const code = [...Array(6)].map(() => crypto.randomInt(100))
  -         .join(" ");
  +       const code = [...Array(6)].map(() => crypto.randomInt(9))
  +         .join("");
    
          const expiresAt = addMinutes(new Date(), 5);
          await storeActivationCode(user.id, code, expiresAt);

api/src/schemas/auth.schema.ts

@@ -15,8 +15,7 @@ newPassword: z.string().min(6)
    });
    
    export const ActivateUserSchema = z.object({
  -   userId: z.number(),
  -   code: z.number().max(6)
  +   code: z.number()
    });
    
    export type LoginInput = z.infer<typeof LoginSchema>;

api/src/services/auth.service.ts

@@ -31,7 +31,7 @@ constructor() { super('Invalid or Expired reset token') }
    }
    
    export const login = async({ email, password }: LoginInput) => {
  -   const user = await findUserByEmail(email);
  +   const user = await findUserByEmail(email)!;
    
      if (!user || !bcrypt.compareSync(password, user.encryptedPassword)) {
        throw new InvalidCredentialsError();

@@ -104,13 +104,13 @@ export const generateToken = (userId: number, email: string) => {
      return createJWT(userId, email);
    };
    
  - export const activateUser = async(user: User, input: ActivateUserInput): Promise<User> => {
  + export const activateUser = async(user: User): Promise<User> => {
      return await prisma.user.update({
        where: {
          id: user.id
        },
        data: {
  -       isActive: true,
  +       active: true,
          activationCode: null,
          activationCodeExpiresAt: null
        }

api/src/services/user.service.ts

@@ -34,6 +34,14 @@ }
      });
    };
    
  + export const findUserByActivationCode = async(code: string): Promise<User | null> => {
  +   return await prisma.user.findFirst({
  +     where: {
  +       activationCode: code
  +     }
  +   });
  + }
  + 
    export const updateUser = async (input: UpdateUserInput): Promise<User> => {
      const { password, ...data } = input;
    