fix: auth

controllers/auth.controller.js

@@ -1,6 +1,6 @@
 const AuthService = require('../services/auth.service');
-const { registerSchema, loginSchema } = require('../validate/auth.schema');
 const { setResponse, checkValidate } = require('../helpers/utils');
+const { registerSchema, loginSchema } = require('../validate/auth.schema');
 const { createCaptcha } = require('../utils/captcha');
 
 class AuthController {
@@ -12,30 +12,21 @@ class AuthController {
       return res.status(400).json(setResponse(error, 'Validation failed', 400));
     }
 
-    if (value.phone && value.phone.startsWith('0')) {
-      value.phone = '+62' + value.phone.slice(1);
+    // Format nomor HP Indonesia
+    if (value.user_phone && value.user_phone.startsWith('0')) {
+      value.user_phone = '+62' + value.user_phone.slice(1);
     }
 
-    const { user, tokens } = await AuthService.register(value);
-
-    // Set refresh token di cookie
-    res.cookie('refreshToken', tokens.refreshToken, {
-      httpOnly: true,
-      secure: false, // masih dev
-      sameSite: 'lax',
-      maxAge: 7 * 24 * 60 * 60 * 1000 // 7 hari
-    });
+    const results = await AuthService.register(value);
 
     const response = await setResponse(
       {
-        user: { ...user, approved: false },
-        accessToken: tokens.accessToken
+        user: { ...results.user, approved: false },
       },
-      'User registered successfully. Waiting for admin approval.',
-      201
+      'User registered successfully. Waiting for admin approval.'
     );
 
-    return res.status(response.statusCode).json(response);
+    res.status(response.statusCode).json(response);
   }
 
   // Login
@@ -46,32 +37,25 @@ class AuthController {
       return res.status(400).json(setResponse(error, 'Validation failed', 400));
     }
 
-    const { identifier, password, captcha, captchaText } = value;
+    const results = await AuthService.login(value);
 
-    if (!captcha || captcha.toLowerCase() !== captchaText.toLowerCase()) {
-      return res.status(400).json(setResponse([], 'Invalid captcha', 400));
-    }
-
-    const { user, tokens } = await AuthService.login({ identifier, password });
-
-    // Set refresh token di cookie
-    res.cookie('refreshToken', tokens.refreshToken, {
+    // Simpan refresh token di cookie
+    res.cookie('refreshToken', results.tokens.refreshToken, {
       httpOnly: true,
-      secure: false, // masih dev
+      secure: false,
       sameSite: 'lax',
-      maxAge: 7 * 24 * 60 * 60 * 1000 // 7 hari
+      maxAge: 7 * 24 * 60 * 60 * 1000
     });
 
     const response = await setResponse(
       {
-        user: { ...user, approved: true },
-        accessToken: tokens.accessToken
+        user: { ...results.user, approved: true },
+        accessToken: results.tokens.accessToken
       },
-      'Login successful',
-      200
+      'Login successful'
     );
 
-    return res.status(response.statusCode).json(response);
+    res.status(response.statusCode).json(response);
   }
 
   // Refresh Token
@@ -82,10 +66,10 @@ class AuthController {
       return res.status(401).json(setResponse(null, 'Refresh token is required', 401));
     }
 
-    const result = await AuthService.refreshToken(refreshToken);
-    const response = await setResponse(result, 'Token refreshed successfully', 200);
+    const results = await AuthService.refreshToken(refreshToken);
+    const response = await setResponse(results, 'Token refreshed successfully');
 
-    return res.status(response.statusCode).json(response);
+    res.status(response.statusCode).json(response);
   }
 
   // Logout
@@ -96,19 +80,19 @@ class AuthController {
       secure: true
     });
 
-    const response = await setResponse(null, 'Logged out successfully', 200);
-    return res.status(response.statusCode).json(response);
+    const response = await setResponse(null, 'Logged out successfully');
+    res.status(response.statusCode).json(response);
   }
 
   // Captcha
   static async generateCaptcha(req, res) {
     const { svg, text } = createCaptcha();
 
-    // munculkan di header untuk keperluan dev
+    // Tampilkan captcha di header untuk dev
     res.setHeader('X-Captcha-Text', text);
 
-    const response = await setResponse({ svg, text }, 'Captcha generated', 200);
-    return res.status(response.statusCode).json(response);
+    const response = await setResponse({ svg, text }, 'Captcha generated');
+    res.status(response.statusCode).json(response);
   }
 }