fix: auth

services/auth.service.js

@@ -9,72 +9,66 @@ const JWTService = require('../utils/jwt');
 
 class AuthService {
   // Register
-  static async register({ fullname, name, email, phone, password }) {
+  static async register(data) {
     try {
-      const existingUser = await getUserByUserEmailDb(email);
-      if (existingUser) {
-        throw new ErrorHandler(400, 'Email already registered');
+      const existingEmail = await getUserByUserEmailDb(data.user_email);
+      const existingUsername = await getUserByUsernameDb(data.user_name);
+
+      if (existingUsername) {
+        throw new ErrorHandler(400, 'Username is already taken');
+      }
+      if (existingEmail) {
+        throw new ErrorHandler(400, 'Email is already taken');
       }
 
-      const hashedPassword = await hashPassword(password);
+      const hashedPassword = await hashPassword(data.user_password);
 
       const userId = await createUserDb({
-        user_fullname: fullname,
-        user_name: name,
-        user_email: email,
-        user_phone: phone,
+        user_fullname: data.user_fullname,
+        user_name: data.user_name,
+        user_email: data.user_email,
+        user_phone: data.user_phone,
         user_password: hashedPassword,
-        role_id: null,
-        is_sa: 0,
-        is_active: 1,
-        is_approve: 0,
-        approved_by: null,
-        approved_at: null
       });
 
       const newUser = {
         user_id: userId,
-        user_fullname: fullname,
-        user_name: name,
-        user_email: email,
-        user_phone: phone
+        user_fullname: data.user_fullname,
+        user_name: data.user_name,
+        user_email: data.user_email,
+        user_phone: data.user_phone
       };
 
-      const tokens = JWTService.generateTokenPair(newUser);
-
-      return { user: newUser, tokens };
+      return { user: newUser };
     } catch (error) {
       throw new ErrorHandler(error.statusCode, error.message);
     }
   }
 
   // Login
-  static async login({ identifier, password }) {
+  static async login(data) {
     try {
-      let user;
+      const { identifier, password, captcha, captchaText } = data;
 
+      if (!captcha || captcha.toLowerCase() !== captchaText.toLowerCase()) {
+        throw new ErrorHandler(400, 'Invalid captcha');
+      }
+
+      let user;
       if (identifier.includes('@')) {
         user = await getUserByUserEmailDb(identifier);
       } else {
         user = await getUserByUsernameDb(identifier);
       }
 
-      if (!user) {
-        throw new ErrorHandler(401, 'Invalid credentials');
-      }
+      if (!user) throw new ErrorHandler(401, 'Invalid credentials');
 
       const passwordMatch = await comparePassword(password, user.user_password);
-      if (!passwordMatch) {
-        throw new ErrorHandler(401, 'Invalid credentials');
-      }
+      if (!passwordMatch) throw new ErrorHandler(401, 'Invalid credentials');
 
-      if (!user.is_active) {
-        throw new ErrorHandler(403, 'User is inactive');
-      }
-
-      if (!user.is_approve) {
+      if (!user.is_active) throw new ErrorHandler(403, 'User is inactive');
+      if (!user.is_approve)
         throw new ErrorHandler(403, 'Your account has not been approved by admin yet.');
-      }
 
       const payload = {
         user_id: user.user_id,
@@ -88,7 +82,6 @@ class AuthService {
       };
 
       const tokens = JWTService.generateTokenPair(payload);
-
       return { user: payload, tokens };
     } catch (error) {
       throw new ErrorHandler(error.statusCode, error.message);
@@ -98,10 +91,6 @@ class AuthService {
   // Refresh Token
   static async refreshToken(refreshToken) {
     try {
-      if (!refreshToken) {
-        throw new ErrorHandler(401, 'Refresh token is required');
-      }
-
       let decoded;
       try {
         decoded = JWTService.verifyRefreshToken(refreshToken);