cca-auth-module 0.1.85 → 0.1.87

package/dist/index.d.mts

@@ -232,8 +232,9 @@ declare class AuthController {
     private readonly twoFactorVerifyUseCase;
     private readonly twoFactorDisableUseCase;
     constructor(loginUseCase: LoginUseCase, adminLoginUseCase: LoginAdminUseCase, logoutUseCase: LogoutUseCase, registerUseCase: RegisterUseCase, refreshTokenUseCase: RefreshTokenUseCase, twoFactorSetupUseCase: TwoFactorSetupUseCase, twoFactorEnableUseCase: TwoFactorEnableUseCase, twoFactorVerifyUseCase: TwoFactorVerifyUseCase, twoFactorDisableUseCase: TwoFactorDisableUseCase);
-    private createSuccessResponse;
+    private createResponse;
     private createAuthData;
+    private sendResponse;
     login: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     adminLogin: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     logout: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.d.ts

@@ -232,8 +232,9 @@ declare class AuthController {
     private readonly twoFactorVerifyUseCase;
     private readonly twoFactorDisableUseCase;
     constructor(loginUseCase: LoginUseCase, adminLoginUseCase: LoginAdminUseCase, logoutUseCase: LogoutUseCase, registerUseCase: RegisterUseCase, refreshTokenUseCase: RefreshTokenUseCase, twoFactorSetupUseCase: TwoFactorSetupUseCase, twoFactorEnableUseCase: TwoFactorEnableUseCase, twoFactorVerifyUseCase: TwoFactorVerifyUseCase, twoFactorDisableUseCase: TwoFactorDisableUseCase);
-    private createSuccessResponse;
+    private createResponse;
     private createAuthData;
+    private sendResponse;
     login: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     adminLogin: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     logout: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -732,6 +732,32 @@ var _TwoFactorDisableUseCase = class _TwoFactorDisableUseCase {
 __name(_TwoFactorDisableUseCase, "TwoFactorDisableUseCase");
 var TwoFactorDisableUseCase = _TwoFactorDisableUseCase;
 
+// src/presentation/constants/constants.ts
+var HTTP_STATUS = {
+  OK: 200,
+  CREATED: 201
+};
+var AUTH_STATUS = {
+  BASIC_AUTH: "basic_auth",
+  NEEDS_SETUP: "needs_setup",
+  PENDING_VERIFICATION: "pending_verification",
+  FULL_AUTH: "full_auth",
+  LOGGED_OUT: "logged_out",
+  REGISTERED: "registered",
+  TOKEN_REFRESHED: "token_refreshed"
+};
+var MESSAGES = {
+  LOGIN_SUCCESS: "Login successful",
+  ADMIN_LOGIN_SUCCESS: "Admin login successful",
+  LOGOUT_SUCCESS: "Logged out successfully",
+  REGISTER_SUCCESS: "User registered successfully",
+  TOKEN_REFRESH_SUCCESS: "Token refreshed successfully",
+  TWO_FA_SETUP_SUCCESS: "Two-factor authentication setup initiated",
+  TWO_FA_ENABLE_SUCCESS: "Two-factor authentication enabled",
+  TWO_FA_VERIFY_SUCCESS: "Two-factor authentication verified successfully",
+  TWO_FA_DISABLE_SUCCESS: "Two-factor authentication disabled"
+};
+
 // src/presentation/controller/AuthController.ts
 var _AuthController = class _AuthController {
   constructor(loginUseCase, adminLoginUseCase, logoutUseCase, registerUseCase, refreshTokenUseCase, twoFactorSetupUseCase, twoFactorEnableUseCase, twoFactorVerifyUseCase, twoFactorDisableUseCase) {
@@ -739,19 +765,23 @@ var _AuthController = class _AuthController {
       try {
         const loginDTO = req.body;
         const result = await this.loginUseCase.execute(loginDTO);
-        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);
+        const twoFactorEnabled = result.enabled ?? false;
+        const loginData = {
+          accessToken: result.accessToken,
+          userId: result.id,
+          expiresAt: result.expiresAt,
+          enabled: twoFactorEnabled,
+          auth: this.createAuthData(
+            true,
+            // hasAccessToken
+            twoFactorEnabled,
+            // enable (2FA enabled status)
+            twoFactorEnabled ? AUTH_STATUS.PENDING_VERIFICATION : AUTH_STATUS.BASIC_AUTH,
+            false
+            // verified - always false for basic login
+          )
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.LOGIN_SUCCESS, loginData);
       } catch (error) {
         next(error);
       }
@@ -763,11 +793,20 @@ var _AuthController = class _AuthController {
           throw new ForbiddenError("Admin password is required");
         }
         const result = await this.adminLoginUseCase.execute(loginDTO, adminPassword);
-        const response = this.createSuccessResponse(
-          "Admin login successful",
-          result
-        );
-        res.status(201).json(response);
+        const adminLoginData = {
+          message: result,
+          // Assuming result is a string message
+          auth: this.createAuthData(
+            true,
+            // hasAccessToken
+            false,
+            // enable - assuming 2FA not enabled for admin login
+            AUTH_STATUS.BASIC_AUTH,
+            false
+            // verified
+          )
+        };
+        this.sendResponse(res, HTTP_STATUS.CREATED, MESSAGES.ADMIN_LOGIN_SUCCESS, adminLoginData);
       } catch (error) {
         next(error);
       }
@@ -775,8 +814,18 @@ var _AuthController = class _AuthController {
     this.logout = /* @__PURE__ */ __name(async (req, res, next) => {
       try {
         await this.logoutUseCase.execute(req.body.id);
-        const response = this.createSuccessResponse("Logged out successfully");
-        res.status(200).json(response);
+        const logoutData = {
+          auth: this.createAuthData(
+            false,
+            // hasAccessToken - no token after logout
+            false,
+            // enable - 2FA status irrelevant after logout
+            AUTH_STATUS.LOGGED_OUT,
+            false
+            // verified - false after logout
+          )
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.LOGOUT_SUCCESS, logoutData);
       } catch (error) {
         next(error);
       }
@@ -785,12 +834,24 @@ var _AuthController = class _AuthController {
       try {
         const { email, name, password, role, adminPassword } = req.body;
         await this.registerUseCase.execute(email, name, password, role, adminPassword);
-        const response = this.createSuccessResponse(
-          "User registered successfully",
-          null,
-          { status: "success" }
+        const registerData = {
+          auth: this.createAuthData(
+            false,
+            // hasAccessToken - no token after registration
+            false,
+            // enable - 2FA not enabled for new users
+            AUTH_STATUS.REGISTERED,
+            false
+            // verified - false after registration
+          )
+        };
+        this.sendResponse(
+          res,
+          HTTP_STATUS.OK,
+          MESSAGES.REGISTER_SUCCESS,
+          registerData,
+          { status: true }
         );
-        res.status(200).json(response);
       } catch (error) {
         next(error);
       }
@@ -799,11 +860,20 @@ var _AuthController = class _AuthController {
       try {
         const { refreshToken } = req.body;
         const result = await this.refreshTokenUseCase.execute(refreshToken);
-        const response = this.createSuccessResponse(
-          "Token refreshed successfully",
-          result
-        );
-        res.json(response);
+        if (!result) {
+          throw new Error("Failed to refresh token");
+        }
+        const refreshData = {
+          accessToken: result.accessToken,
+          refreshToken: result.refreshToken,
+          auth: this.createAuthData(
+            true,
+            false,
+            AUTH_STATUS.BASIC_AUTH,
+            false
+          )
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.TOKEN_REFRESH_SUCCESS, refreshData);
       } catch (error) {
         next(error);
       }
@@ -814,18 +884,15 @@ var _AuthController = class _AuthController {
           throw new ForbiddenError("User authentication required");
         }
         const result = await this.twoFactorSetupUseCase.execute(req.auth.id);
-        const response = this.createSuccessResponse(
-          "Two-factor authentication setup initiated",
-          {
-            qrCode: result.qrCodeUrl,
-            auth: this.createAuthData(true, false, "needs_setup")
-          },
-          {
-            nextStep: "Scan the QR code and enter your first code to verify",
-            redirectTo: "/2fa-setup"
-          }
-        );
-        res.status(200).json(response);
+        const setupData = {
+          qrCode: result.qrCodeUrl,
+          auth: this.createAuthData(true, false, AUTH_STATUS.NEEDS_SETUP)
+        };
+        const meta = {
+          nextStep: "Scan the QR code and enter your first code to verify",
+          redirectTo: "/2fa-enable"
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.TWO_FA_SETUP_SUCCESS, setupData, meta);
       } catch (error) {
         next(error);
       }
@@ -834,19 +901,16 @@ var _AuthController = class _AuthController {
       try {
         const dto = { ...req.body, userId: req.auth?.id };
         await this.twoFactorEnableUseCase.execute(dto);
-        const response = this.createSuccessResponse(
-          "Two-factor authentication enabled",
-          {
-            isEnabled: true,
-            enabledAt: (/* @__PURE__ */ new Date()).toISOString(),
-            auth: this.createAuthData(true, true, "pending_verification")
-          },
-          {
-            nextStep: "Proceed to verify with a valid 2FA token",
-            redirectTo: "/verify-2fa"
-          }
-        );
-        res.status(200).json(response);
+        const enableData = {
+          isEnabled: true,
+          enabledAt: (/* @__PURE__ */ new Date()).toISOString(),
+          auth: this.createAuthData(true, true, AUTH_STATUS.PENDING_VERIFICATION)
+        };
+        const meta = {
+          nextStep: "Proceed to verify with a valid 2FA token",
+          redirectTo: "/verify-2fa"
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.TWO_FA_ENABLE_SUCCESS, enableData, meta);
       } catch (error) {
         next(error);
       }
@@ -855,25 +919,22 @@ var _AuthController = class _AuthController {
       try {
         const dto = req.body;
         const result = await this.twoFactorVerifyUseCase.execute(dto);
-        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: this.createAuthData(true, true, "full_auth", true)
+        const verifyData = {
+          token: result?.token,
+          refreshToken: result?.refreshToken,
+          user: {
+            id: result?.data?.id,
+            email: result?.data?.email,
+            name: result?.data?.name,
+            role: result?.data?.role
           },
-          {
-            recommendation: "You're fully authenticated",
-            redirectTo: "/"
-          }
-        );
-        res.status(200).json(response);
+          auth: this.createAuthData(true, true, AUTH_STATUS.FULL_AUTH, true)
+        };
+        const meta = {
+          recommendation: "You're fully authenticated",
+          redirectTo: "/"
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.TWO_FA_VERIFY_SUCCESS, verifyData, meta);
       } catch (error) {
         next(error);
       }
@@ -883,18 +944,15 @@ var _AuthController = class _AuthController {
         const userId = req.auth.id;
         const dto = req.body;
         await this.twoFactorDisableUseCase.execute(userId, dto);
-        const response = this.createSuccessResponse(
-          "Two-factor authentication disabled",
-          {
-            disabledAt: (/* @__PURE__ */ new Date()).toISOString(),
-            auth: this.createAuthData(true, false, "basic_auth", false)
-          },
-          {
-            securityNote: "Account now relies only on password. Re-enable 2FA for better security.",
-            redirectTo: "/login"
-          }
-        );
-        res.status(200).json(response);
+        const disableData = {
+          disabledAt: (/* @__PURE__ */ new Date()).toISOString(),
+          auth: this.createAuthData(true, false, AUTH_STATUS.BASIC_AUTH, false)
+        };
+        const meta = {
+          securityNote: "Account now relies only on password. Re-enable 2FA for better security.",
+          redirectTo: "/login"
+        };
+        this.sendResponse(res, HTTP_STATUS.OK, MESSAGES.TWO_FA_DISABLE_SUCCESS, disableData, meta);
       } catch (error) {
         next(error);
       }
@@ -909,7 +967,7 @@ var _AuthController = class _AuthController {
     this.twoFactorVerifyUseCase = twoFactorVerifyUseCase;
     this.twoFactorDisableUseCase = twoFactorDisableUseCase;
   }
-  createSuccessResponse(message, data, meta) {
+  createResponse(message, data, meta) {
     return {
       success: true,
       message,
@@ -928,6 +986,10 @@ var _AuthController = class _AuthController {
       ...verified !== void 0 && { verified }
     };
   }
+  sendResponse(res, statusCode, message, data, meta) {
+    const response = this.createResponse(message, data, meta);
+    res.status(statusCode).json(response);
+  }
 };
 __name(_AuthController, "AuthController");
 var AuthController = _AuthController;