cca-auth-module 0.1.81 → 0.1.83

package/dist/index.mjs

@@ -704,16 +704,19 @@ var _AuthController = class _AuthController {
       try {
         const loginDTO = req.body;
         const result = await this.loginUseCase.execute(loginDTO);
-        res.status(200).json({
-          status: "success",
-          message: "Login successful",
-          data: {
+        const response = this.createSuccessResponse(
+          "Login successful",
+          {
             accessToken: result.accessToken,
             userId: result.id,
             expiresAt: result.expiresAt,
             enabled: result.enabled
+          },
+          {
+            status: "success"
           }
-        });
+        );
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -725,7 +728,11 @@ var _AuthController = class _AuthController {
           throw new ForbiddenError("Admin password is required");
         }
         const result = await this.adminLoginUseCase.execute(loginDTO, adminPassword);
-        res.status(201).json(result);
+        const response = this.createSuccessResponse(
+          "Admin login successful",
+          result
+        );
+        res.status(201).json(response);
       } catch (error) {
         next(error);
       }
@@ -733,10 +740,8 @@ var _AuthController = class _AuthController {
     this.logout = /* @__PURE__ */ __name(async (req, res, next) => {
       try {
         await this.logoutUseCase.execute(req.body.id);
-        res.status(200).json({
-          status: "success",
-          message: "Logged out successfully"
-        });
+        const response = this.createSuccessResponse("Logged out successfully");
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -745,37 +750,47 @@ var _AuthController = class _AuthController {
       try {
         const { email, name, password, role, adminPassword } = req.body;
         await this.registerUseCase.execute(email, name, password, role, adminPassword);
-        res.status(200).json({ status: "success" });
+        const response = this.createSuccessResponse(
+          "User registered successfully",
+          null,
+          { status: "success" }
+        );
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
     }, "register");
-    this.refreshToken = /* @__PURE__ */ __name(async (req, res) => {
-      const { refreshToken } = req.body;
-      const result = await this.refreshTokenUseCase.execute(refreshToken);
-      res.json(result);
+    this.refreshToken = /* @__PURE__ */ __name(async (req, res, next) => {
+      try {
+        const { refreshToken } = req.body;
+        const result = await this.refreshTokenUseCase.execute(refreshToken);
+        const response = this.createSuccessResponse(
+          "Token refreshed successfully",
+          result
+        );
+        res.json(response);
+      } catch (error) {
+        next(error);
+      }
     }, "refreshToken");
     this.setup2FA = /* @__PURE__ */ __name(async (req, res, next) => {
       try {
-        if (!req.auth?.id) throw new ForbiddenError("User authentication required");
+        if (!req.auth?.id) {
+          throw new ForbiddenError("User authentication required");
+        }
         const result = await this.twoFactorSetupUseCase.execute(req.auth.id);
-        res.status(200).json({
-          success: true,
-          message: "Two-factor authentication setup initiated",
-          data: {
+        const response = this.createSuccessResponse(
+          "Two-factor authentication setup initiated",
+          {
             qrCode: result.qrCodeUrl,
-            auth: {
-              hasAccessToken: true,
-              enable: false,
-              status: "needs_setup"
-            }
+            auth: this.createAuthData(true, false, "needs_setup")
           },
-          meta: {
-            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          {
             nextStep: "Scan the QR code and enter your first code to verify",
             redirectTo: "/2fa-setup"
           }
-        });
+        );
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -784,24 +799,19 @@ var _AuthController = class _AuthController {
       try {
         const dto = { ...req.body, userId: req.auth?.id };
         await this.twoFactorEnableUseCase.execute(dto);
-        res.status(200).json({
-          success: true,
-          message: "Two-factor authentication enabled",
-          data: {
+        const response = this.createSuccessResponse(
+          "Two-factor authentication enabled",
+          {
             isEnabled: true,
             enabledAt: (/* @__PURE__ */ new Date()).toISOString(),
-            auth: {
-              hasAccessToken: true,
-              enable: true,
-              status: "pending_verification"
-            }
+            auth: this.createAuthData(true, true, "pending_verification")
           },
-          meta: {
-            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          {
             nextStep: "Proceed to verify with a valid 2FA token",
             redirectTo: "/verify-2fa"
           }
-        });
+        );
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -810,31 +820,25 @@ var _AuthController = class _AuthController {
       try {
         const dto = req.body;
         const result = await this.twoFactorVerifyUseCase.execute(dto);
-        res.status(200).json({
-          success: true,
-          message: "Two-factor authentication verified successfully",
-          data: {
-            verified: true,
+        const response = this.createSuccessResponse(
+          "Two-factor authentication verified successfully",
+          {
             token: result?.token,
             refreshToken: result?.refreshToken,
             user: {
               id: result?.data?.id,
               email: result?.data?.email,
+              name: result?.data?.name,
               role: result?.data?.role
             },
-            auth: {
-              hasAccessToken: true,
-              enable: true,
-              verified: true,
-              status: "full_auth"
-            }
+            auth: this.createAuthData(true, true, "full_auth", true)
           },
-          meta: {
-            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          {
             recommendation: "You're fully authenticated",
             redirectTo: "/"
           }
-        });
+        );
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -844,25 +848,18 @@ var _AuthController = class _AuthController {
         const userId = req.auth.id;
         const dto = req.body;
         await this.twoFactorDisableUseCase.execute(userId, dto);
-        res.status(200).json({
-          success: true,
-          message: "Two-factor authentication disabled",
-          data: {
-            isEnabled: false,
+        const response = this.createSuccessResponse(
+          "Two-factor authentication disabled",
+          {
             disabledAt: (/* @__PURE__ */ new Date()).toISOString(),
-            auth: {
-              hasAccessToken: true,
-              enable: false,
-              verified: false,
-              status: "basic_auth"
-            }
+            auth: this.createAuthData(true, false, "basic_auth", false)
           },
-          meta: {
-            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          {
             securityNote: "Account now relies only on password. Re-enable 2FA for better security.",
             redirectTo: "/login"
           }
-        });
+        );
+        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -877,6 +874,25 @@ var _AuthController = class _AuthController {
     this.twoFactorVerifyUseCase = twoFactorVerifyUseCase;
     this.twoFactorDisableUseCase = twoFactorDisableUseCase;
   }
+  createSuccessResponse(message, data, meta) {
+    return {
+      success: true,
+      message,
+      data,
+      meta: {
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        ...meta
+      }
+    };
+  }
+  createAuthData(hasAccessToken, enable, status, verified) {
+    return {
+      hasAccessToken,
+      enable,
+      status,
+      ...verified !== void 0 && { verified }
+    };
+  }
 };
 __name(_AuthController, "AuthController");
 var AuthController = _AuthController;