@flusys/nestjs-auth 4.1.0 → 5.0.0

package/cjs/config/message-keys.js

@@ -13,15 +13,6 @@ _export(exports, {
     get AUTH_MESSAGES () {
         return AUTH_MESSAGES;
     },
-    get AUTH_MODULE_MESSAGES () {
-        return AUTH_MODULE_MESSAGES;
-    },
-    get BRANCH_MESSAGES () {
-        return BRANCH_MESSAGES;
-    },
-    get COMPANY_MESSAGES () {
-        return COMPANY_MESSAGES;
-    },
     get EMAIL_VERIFICATION_MESSAGES () {
         return EMAIL_VERIFICATION_MESSAGES;
     },
@@ -34,31 +25,29 @@ _export(exports, {
 });
 const AUTH_MESSAGES = {
     LOGIN_SUCCESS: 'auth.login.success',
-    LOGIN_FAILED: 'auth.login.failed',
+    LOGIN_REQUIRES_SELECTION: 'auth.login.requires.selection',
     LOGIN_INVALID_CREDENTIALS: 'auth.login.invalid.credentials',
     LOGIN_EMAIL_NOT_VERIFIED: 'auth.login.email.not.verified',
-    LOGIN_REQUIRES_SELECTION: 'auth.login.requires.selection',
     LOGIN_ACCOUNT_DEACTIVATED: 'auth.login.account.deactivated',
     LOGOUT_SUCCESS: 'auth.logout.success',
     REGISTER_SUCCESS: 'auth.register.success',
     REGISTER_FAILED: 'auth.register.failed',
+    REFRESH_SUCCESS: 'auth.refresh.success',
+    ME_SUCCESS: 'auth.me.success',
+    SELECT_SUCCESS: 'auth.select.success',
+    SWITCH_COMPANY_SUCCESS: 'auth.switch.company.success',
     REGISTER_EMAIL_EXISTS: 'auth.register.email.exists',
     REGISTER_COMPANY_ALREADY_ASSIGNED: 'auth.register.company.already.assigned',
     PASSWORD_CHANGE_SUCCESS: 'auth.password.change.success',
-    PASSWORD_CHANGE_FAILED: 'auth.password.change.failed',
     PASSWORD_CHANGE_INVALID_CURRENT: 'auth.password.change.invalid.current',
     PASSWORD_CHANGE_CURRENT_REQUIRED: 'auth.password.change.current.required',
     PASSWORD_RESET_EMAIL_SENT: 'auth.password.reset.email.sent',
     PASSWORD_RESET_SUCCESS: 'auth.password.reset.success',
-    PASSWORD_RESET_FAILED: 'auth.password.reset.failed',
-    TOKEN_REFRESH_SUCCESS: 'auth.token.refresh.success',
     TOKEN_REQUIRED: 'auth.token.required',
     TOKEN_INVALID: 'auth.token.invalid',
     TOKEN_EXPIRED: 'auth.token.expired',
     TOKEN_REVOKED: 'auth.token.revoked',
     TOKEN_TOO_LARGE: 'auth.token.too.large',
-    COMPANY_SELECT_SUCCESS: 'auth.company.select.success',
-    COMPANY_SWITCH_SUCCESS: 'auth.company.switch.success',
     COMPANY_LIST_SUCCESS: 'auth.company.list.success',
     COMPANY_NO_ACCESS: 'auth.company.no.access',
     COMPANY_NOT_FOUND: 'auth.company.not.found',
@@ -67,7 +56,6 @@ const AUTH_MESSAGES = {
     BRANCH_LIST_SUCCESS: 'auth.branch.list.success',
     BRANCH_NO_ACCESS: 'auth.branch.no.access',
     BRANCH_NOT_FOUND: 'auth.branch.not.found',
-    ME_SUCCESS: 'auth.me.success',
     EMAIL_NOT_CONFIGURED: 'auth.email.not.configured',
     EMAIL_SEND_FAILED: 'auth.email.send.failed',
     SESSION_INVALID: 'auth.session.invalid',
@@ -81,24 +69,13 @@ const AUTH_MESSAGES = {
 const EMAIL_VERIFICATION_MESSAGES = {
     VERIFICATION_SENT: 'email.verification.sent',
     VERIFICATION_SUCCESS: 'email.verification.success',
-    VERIFICATION_FAILED: 'email.verification.failed',
     VERIFICATION_TOKEN_INVALID: 'email.verification.token.invalid',
     VERIFICATION_TOKEN_EXPIRED: 'email.verification.token.expired',
     VERIFICATION_NOT_ENABLED: 'email.verification.not.enabled',
-    RESEND_SUCCESS: 'email.verification.resend.success',
-    RESEND_THROTTLED: 'email.verification.resend.throttled'
+    RESEND_SUCCESS: 'email.verification.resend.success'
 };
 const USER_MESSAGES = {
-    CREATE_SUCCESS: 'user.create.success',
-    CREATE_MANY_SUCCESS: 'user.create.many.success',
-    GET_SUCCESS: 'user.get.success',
-    GET_ALL_SUCCESS: 'user.get.all.success',
-    UPDATE_SUCCESS: 'user.update.success',
-    UPDATE_MANY_SUCCESS: 'user.update.many.success',
-    DELETE_SUCCESS: 'user.delete.success',
-    RESTORE_SUCCESS: 'user.restore.success',
     NOT_FOUND: 'user.not.found',
-    PROFILE_SUCCESS: 'user.profile.success',
     PROFILE_UPDATE_SUCCESS: 'user.profile.update.success',
     PROFILE_EXTRAS_SUCCESS: 'user.profile.extras.success',
     PROFILE_SECTIONS_SUCCESS: 'user.profile.sections.success',
@@ -109,42 +86,10 @@ const USER_MESSAGES = {
     PHONE_VERIFY_SUCCESS: 'user.phone.verify.success',
     STATUS_UPDATE_SUCCESS: 'user.status.update.success'
 };
-const COMPANY_MESSAGES = {
-    CREATE_SUCCESS: 'company.create.success',
-    CREATE_MANY_SUCCESS: 'company.create.many.success',
-    GET_SUCCESS: 'company.get.success',
-    GET_ALL_SUCCESS: 'company.get.all.success',
-    UPDATE_SUCCESS: 'company.update.success',
-    UPDATE_MANY_SUCCESS: 'company.update.many.success',
-    DELETE_SUCCESS: 'company.delete.success',
-    RESTORE_SUCCESS: 'company.restore.success',
-    NOT_FOUND: 'company.not.found'
-};
-const BRANCH_MESSAGES = {
-    CREATE_SUCCESS: 'branch.create.success',
-    CREATE_MANY_SUCCESS: 'branch.create.many.success',
-    GET_SUCCESS: 'branch.get.success',
-    GET_ALL_SUCCESS: 'branch.get.all.success',
-    UPDATE_SUCCESS: 'branch.update.success',
-    UPDATE_MANY_SUCCESS: 'branch.update.many.success',
-    DELETE_SUCCESS: 'branch.delete.success',
-    RESTORE_SUCCESS: 'branch.restore.success',
-    NOT_FOUND: 'branch.not.found'
-};
 const USER_PERMISSION_MESSAGES = {
-    COMPANY_ASSIGN_SUCCESS: 'user.permission.company.assign.success',
     COMPANY_LIST_SUCCESS: 'user.permission.company.list.success',
-    BRANCH_ASSIGN_SUCCESS: 'user.permission.branch.assign.success',
     BRANCH_LIST_SUCCESS: 'user.permission.branch.list.success',
     BATCH_SUCCESS: 'user.permission.batch.success',
     ALREADY_ASSIGNED: 'user.permission.already.assigned',
     PERMISSION_NOT_FOUND: 'user.permission.not.found'
 };
-const AUTH_MODULE_MESSAGES = {
-    AUTH: AUTH_MESSAGES,
-    EMAIL_VERIFICATION: EMAIL_VERIFICATION_MESSAGES,
-    USER: USER_MESSAGES,
-    COMPANY: COMPANY_MESSAGES,
-    BRANCH: BRANCH_MESSAGES,
-    USER_PERMISSION: USER_PERMISSION_MESSAGES
-};

package/cjs/controllers/authentication.controller.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "AuthenticationController", {
         return AuthenticationController;
     }
 });
-const _config = require("../config");
+const _nestjsshared = require("@flusys/nestjs-shared");
 const _decorators = require("@flusys/nestjs-shared/decorators");
 const _dtos = require("@flusys/nestjs-shared/dtos");
 const _guards = require("@flusys/nestjs-shared/guards");
@@ -17,6 +17,7 @@ const _common = require("@nestjs/common");
 const _swagger = require("@nestjs/swagger");
 const _throttler = require("@nestjs/throttler");
 const _express = require("express");
+const _config = require("../config");
 const _authenticationdto = require("../dtos/authentication.dto");
 const _cleartokeninterceptor = require("../interceptors/clear-token.interceptor");
 const _settokeninterceptor = require("../interceptors/set-token.interceptor");
@@ -50,24 +51,40 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let AuthenticationController = class AuthenticationController {
-    buildAuthUrl(req, path) {
-        const frontendUrl = this.authConfig?.getFrontendUrl();
-        return frontendUrl ? `${frontendUrl}${path}` : `${req.protocol}://${req.get('host')}${path}`;
-    }
     async login(loginDto) {
         const result = await this.authService.login(loginDto.email, loginDto.password);
         if ('requiresEmailVerification' in result) {
-            return result;
+            return {
+                success: true,
+                message: 'Email verification required',
+                messageKey: _config.AUTH_MESSAGES.LOGIN_EMAIL_NOT_VERIFIED,
+                data: result
+            };
         }
         if ('requiresSelection' in result) {
-            return result;
+            return {
+                success: true,
+                message: 'Company selection required',
+                messageKey: _config.AUTH_MESSAGES.LOGIN_REQUIRES_SELECTION,
+                data: result
+            };
         }
-        return result;
+        return {
+            success: true,
+            message: 'Login successful',
+            messageKey: _config.AUTH_MESSAGES.LOGIN_SUCCESS,
+            data: result
+        };
     }
     /** Register new user. If company feature enabled, can join/create company. */ async register(req, registrationDto) {
-        const verifyUrlBase = this.buildAuthUrl(req, '/auth/verify-email');
+        const verifyUrlBase = (0, _nestjsshared.buildFrontendUrl)(req, '/auth/verify-email');
         const result = await this.authService.register(registrationDto, verifyUrlBase);
-        return result;
+        return {
+            success: true,
+            message: result.requiresEmailVerification ? 'Verification email sent' : 'Registration successful',
+            messageKey: result.requiresEmailVerification ? _config.EMAIL_VERIFICATION_MESSAGES.VERIFICATION_SENT : _config.AUTH_MESSAGES.REGISTER_SUCCESS,
+            data: result
+        };
     }
     /**
    * Refresh access token.
@@ -83,10 +100,22 @@ let AuthenticationController = class AuthenticationController {
                 messageKey: _config.AUTH_MESSAGES.TOKEN_REQUIRED
             });
         }
-        return this.authService.refreshToken(refreshToken);
+        const data = await this.authService.refreshToken(refreshToken);
+        return {
+            success: true,
+            message: 'Token refreshed successfully',
+            messageKey: _config.AUTH_MESSAGES.REFRESH_SUCCESS,
+            data
+        };
     }
     /** Get current user info. Returns user, company, and branch data (no tokens). */ async getCurrentUser(user) {
-        return this.authService.getUserInfo(user.id, user.companyId, user.branchId);
+        const data = await this.authService.getUserInfo(user.id, user.companyId, user.branchId);
+        return {
+            success: true,
+            message: 'User info retrieved successfully',
+            messageKey: _config.AUTH_MESSAGES.ME_SUCCESS,
+            data
+        };
     }
     /** Logout - Clears refresh token cookie for browsers */ async logout(userId) {
         await this.authService.logout(userId);
@@ -127,97 +156,93 @@ _ts_decorate([
     (0, _swagger.ApiBody)({
         type: _authenticationdto.LoginDto
     }),
-    (0, _swagger.ApiExtraModels)(_authenticationdto.LoginResponseDto, _authenticationdto.CompanySelectionResponseDto, _authenticationdto.LoginResponseRequiresEmailVerificationDto),
     (0, _swagger.ApiResponse)({
         status: 200,
         description: 'Login successful, requires company selection, or requires email verification',
         content: {
             'application/json': {
-                schema: {
-                    oneOf: [
-                        {
-                            $ref: (0, _swagger.getSchemaPath)(_authenticationdto.LoginResponseDto)
-                        },
-                        {
-                            $ref: (0, _swagger.getSchemaPath)(_authenticationdto.CompanySelectionResponseDto)
-                        },
-                        {
-                            $ref: (0, _swagger.getSchemaPath)(_authenticationdto.LoginResponseRequiresEmailVerificationDto)
-                        }
-                    ]
-                },
                 examples: {
                     loginSuccess: {
                         summary: 'Login Success',
-                        description: 'Successful login with tokens (company/branch included when company feature enabled)',
                         value: {
-                            accessToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
-                            refreshToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
-                            user: {
-                                id: '550e8400-e29b-41d4-a716-446655440000',
-                                email: 'john@example.com',
-                                name: 'John Doe'
+                            success: true,
+                            message: 'Login successful',
+                            messageKey: 'auth.login.success',
+                            data: {
+                                accessToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
+                                user: {
+                                    id: '550e8400-e29b-41d4-a716-446655440000',
+                                    email: 'john@example.com',
+                                    name: 'John Doe'
+                                }
                             }
                         }
                     },
                     loginSuccessWithCompany: {
-                        summary: 'Login Success (Company Feature)',
-                        description: 'Login with company/branch - only when company feature is enabled',
+                        summary: 'Login Success (with company/branch)',
                         value: {
-                            accessToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
-                            refreshToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
-                            user: {
-                                id: '550e8400-e29b-41d4-a716-446655440000',
-                                email: 'john@example.com',
-                                name: 'John Doe'
-                            },
-                            company: {
-                                id: '550e8400-e29b-41d4-a716-446655440001',
-                                name: 'Acme Corporation',
-                                slug: 'acme-corp'
-                            },
-                            branch: {
-                                id: '550e8400-e29b-41d4-a716-446655440002',
-                                name: 'Main Branch',
-                                slug: 'main-branch'
+                            success: true,
+                            message: 'Login successful',
+                            messageKey: 'auth.login.success',
+                            data: {
+                                accessToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
+                                user: {
+                                    id: '550e8400-e29b-41d4-a716-446655440000',
+                                    email: 'john@example.com',
+                                    name: 'John Doe'
+                                },
+                                company: {
+                                    id: 'company-id',
+                                    name: 'Acme Corp'
+                                },
+                                branch: {
+                                    id: 'branch-id',
+                                    name: 'Main Branch'
+                                }
                             }
                         }
                     },
                     companySelection: {
-                        summary: 'Company Selection Required (Company Feature)',
-                        description: 'User has multiple companies/branches - only when company feature is enabled',
+                        summary: 'Company Selection Required',
                         value: {
-                            requiresSelection: true,
-                            sessionId: 'sess_abc123def456',
-                            expiresAt: '2024-12-18T15:30:00.000Z',
-                            user: {
-                                id: '550e8400-e29b-41d4-a716-446655440000',
-                                email: 'john@example.com',
-                                name: 'John Doe'
-                            },
-                            companies: [
-                                {
-                                    id: '550e8400-e29b-41d4-a716-446655440001',
-                                    name: 'Company A',
-                                    slug: 'company-a',
-                                    branches: [
-                                        {
-                                            id: '550e8400-e29b-41d4-a716-446655440010',
-                                            name: 'Branch 1',
-                                            slug: 'branch-1'
-                                        }
-                                    ]
-                                }
-                            ]
+                            success: true,
+                            message: 'Company selection required',
+                            messageKey: 'auth.login.requires.selection',
+                            data: {
+                                requiresSelection: true,
+                                sessionId: 'sess_abc123def456',
+                                expiresAt: '2024-12-18T15:30:00.000Z',
+                                user: {
+                                    id: '550e8400-e29b-41d4-a716-446655440000',
+                                    email: 'john@example.com'
+                                },
+                                companies: [
+                                    {
+                                        id: 'company-id',
+                                        name: 'Acme Corp',
+                                        slug: 'acme-corp',
+                                        branches: [
+                                            {
+                                                id: 'branch-id',
+                                                name: 'Main Branch',
+                                                slug: 'main-branch'
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
                         }
                     },
                     emailVerification: {
                         summary: 'Email Verification Required',
-                        description: 'User must verify email before logging in',
                         value: {
-                            requiresEmailVerification: true,
-                            email: 'john@example.com',
-                            message: 'Please verify your email address before logging in.'
+                            success: true,
+                            message: 'Email verification required',
+                            messageKey: 'auth.login.email.not.verified',
+                            data: {
+                                requiresEmailVerification: true,
+                                email: 'john@example.com'
+                            }
                         }
                     }
                 }
@@ -249,7 +274,7 @@ _ts_decorate([
     }),
     (0, _swagger.ApiResponse)({
         status: 201,
-        type: _authenticationdto.RegistrationResponseDto
+        description: 'Registration successful or email verification required'
     }),
     _ts_param(0, (0, _common.Req)()),
     _ts_param(1, (0, _common.Body)()),
@@ -293,13 +318,14 @@ Set header \`x-client-type: mobile\` or \`x-client-type: api\` to identify as no
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
-        description: 'New access token',
+        description: 'Token refreshed successfully',
         schema: {
-            type: 'object',
-            properties: {
-                accessToken: {
-                    type: 'string',
-                    example: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...'
+            example: {
+                success: true,
+                message: 'Token refreshed successfully',
+                messageKey: 'auth.refresh.success',
+                data: {
+                    accessToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...'
                 }
             }
         }
@@ -327,7 +353,7 @@ _ts_decorate([
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
-        type: _authenticationdto.MeResponseDto
+        description: 'Current user info retrieved successfully'
     }),
     _ts_param(0, (0, _decorators.CurrentUser)()),
     _ts_metadata("design:type", Function),

package/cjs/controllers/company-selection.controller.js

@@ -45,10 +45,22 @@ function _ts_param(paramIndex, decorator) {
 }
 let CompanySelectionController = class CompanySelectionController {
     async select(dto) {
-        return this.authService.select(dto.sessionId, dto.companyId, dto.branchId);
+        const data = await this.authService.select(dto.sessionId, dto.companyId, dto.branchId);
+        return {
+            success: true,
+            message: 'Company selected successfully',
+            messageKey: _config.AUTH_MESSAGES.SELECT_SUCCESS,
+            data
+        };
     }
     async switchCompany(userId, dto) {
-        return this.authService.switchCompany(userId, dto.companyId, dto.branchId);
+        const data = await this.authService.switchCompany(userId, dto.companyId, dto.branchId);
+        return {
+            success: true,
+            message: 'Company switched successfully',
+            messageKey: _config.AUTH_MESSAGES.SWITCH_COMPANY_SUCCESS,
+            data
+        };
     }
     async getUserCompanies(userId) {
         const companies = await this.authService.getUserCompanies(userId);
@@ -86,7 +98,7 @@ _ts_decorate([
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
-        type: _authenticationdto.LoginResponseDto
+        description: 'Company selected, tokens returned'
     }),
     _ts_param(0, (0, _common.Body)()),
     _ts_metadata("design:type", Function),
@@ -110,7 +122,7 @@ _ts_decorate([
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
-        type: _authenticationdto.LoginResponseDto
+        description: 'Company switched, new tokens returned'
     }),
     _ts_param(0, (0, _decorators.CurrentUser)('id')),
     _ts_param(1, (0, _common.Body)()),
@@ -130,6 +142,10 @@ _ts_decorate([
         summary: "Get user's available companies",
         description: 'Get list of companies the current user has access to'
     }),
+    (0, _swagger.ApiResponse)({
+        status: 200,
+        description: 'User companies retrieved successfully'
+    }),
     _ts_param(0, (0, _decorators.CurrentUser)('id')),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -158,6 +174,10 @@ _ts_decorate([
             ]
         }
     }),
+    (0, _swagger.ApiResponse)({
+        status: 200,
+        description: 'Company branches retrieved successfully'
+    }),
     _ts_param(0, (0, _decorators.CurrentUser)('id')),
     _ts_param(1, (0, _common.Body)('companyId')),
     _ts_metadata("design:type", Function),

package/cjs/controllers/email-verification.controller.js

@@ -8,12 +8,13 @@ Object.defineProperty(exports, "EmailVerificationController", {
         return EmailVerificationController;
     }
 });
-const _config = require("../config");
+const _nestjsshared = require("@flusys/nestjs-shared");
 const _dtos = require("@flusys/nestjs-shared/dtos");
 const _common = require("@nestjs/common");
 const _swagger = require("@nestjs/swagger");
 const _throttler = require("@nestjs/throttler");
 const _express = require("express");
+const _config = require("../config");
 const _authenticationdto = require("../dtos/authentication.dto");
 const _settokeninterceptor = require("../interceptors/set-token.interceptor");
 const _authconfigservice = require("../services/auth-config.service");
@@ -56,13 +57,9 @@ let EmailVerificationController = class EmailVerificationController {
             });
         }
     }
-    buildAuthUrl(req, path) {
-        const frontendUrl = this.authConfig.getFrontendUrl();
-        return frontendUrl ? `${frontendUrl}${path}` : `${req.protocol}://${req.get('host')}${path}`;
-    }
     async forgotPassword(req, dto) {
         this.ensureEmailVerificationEnabled();
-        return this.authEmailService.forgotPassword(dto.email, this.buildAuthUrl(req, '/auth/reset-password'));
+        return this.authEmailService.forgotPassword(dto.email, (0, _nestjsshared.buildFrontendUrl)(req, '/auth/reset-password'));
     }
     async resetPassword(dto) {
         this.ensureEmailVerificationEnabled();
@@ -70,13 +67,19 @@ let EmailVerificationController = class EmailVerificationController {
     }
     async resendVerification(req, dto) {
         this.ensureEmailVerificationEnabled();
-        return this.authEmailService.resendVerificationEmail(dto.email, this.buildAuthUrl(req, '/auth/verify-email'));
+        return this.authEmailService.resendVerificationEmail(dto.email, (0, _nestjsshared.buildFrontendUrl)(req, '/auth/verify-email'));
     }
     async verifyEmail(dto) {
         this.ensureEmailVerificationEnabled();
         const result = await this.authEmailService.verifyEmail(dto.token);
         if (result.type === 'pending') {
-            return this.authService.createUserFromPendingRegistration(result.pending);
+            const data = await this.authService.createUserFromPendingRegistration(result.pending);
+            return {
+                success: true,
+                message: 'Registration completed successfully',
+                messageKey: _config.AUTH_MESSAGES.REGISTER_SUCCESS,
+                data
+            };
         }
         return {
             success: true,
@@ -195,11 +198,7 @@ _ts_decorate([
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
-        type: _dtos.MessageResponseDto
-    }),
-    (0, _swagger.ApiResponse)({
-        status: 200,
-        type: _authenticationdto.RegistrationResponseDto
+        description: 'Email verified or registration completed'
     }),
     _ts_param(0, (0, _common.Body)()),
     _ts_metadata("design:type", Function),