@flusys/nestjs-auth 3.0.0 → 4.0.0-rc

package/cjs/services/branch.service.js

@@ -89,7 +89,7 @@ let BranchService = class BranchService extends _classes.RequestScopedApiService
         return result;
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){
-        super('company_branch', null, cacheManager, utilsService, BranchService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig;
+        super('company_branch', null, cacheManager, utilsService, BranchService.name, true, 'auth'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig;
     }
 };
 BranchService = _ts_decorate([

package/cjs/services/company-selection-session.service.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "CompanySelectionSessionService", {
         return CompanySelectionSessionService;
     }
 });
+const _nestjsshared = require("@flusys/nestjs-shared");
 const _classes = require("@flusys/nestjs-shared/classes");
 const _common = require("@nestjs/common");
 const _crypto = require("crypto");
@@ -41,9 +42,7 @@ function _ts_param(paramIndex, decorator) {
 }
 const SESSION_TTL_MS = 5 * 60 * 1000; // 5 minutes
 let CompanySelectionSessionService = class CompanySelectionSessionService {
-    /**
-   * Create a new session for company/branch selection
-   */ async createSession(userId) {
+    async createSession(userId) {
         const sessionId = (0, _crypto.randomUUID)();
         const now = new Date();
         const expiresAt = new Date(now.getTime() + SESSION_TTL_MS);
@@ -68,9 +67,7 @@ let CompanySelectionSessionService = class CompanySelectionSessionService {
         }
         return session;
     }
-    /**
-   * Get and delete session (one-time use)
-   */ async consumeSession(sessionId) {
+    async consumeSession(sessionId) {
         const session = await this.getSession(sessionId);
         if (session) {
             await this.deleteSession(sessionId);
@@ -92,6 +89,28 @@ let CompanySelectionSessionService = class CompanySelectionSessionService {
         this.cacheManager = cacheManager;
     }
 };
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'session.create',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], CompanySelectionSessionService.prototype, "createSession", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'session.consume',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], CompanySelectionSessionService.prototype, "consumeSession", null);
 CompanySelectionSessionService = _ts_decorate([
     (0, _common.Injectable)(),
     _ts_param(0, (0, _common.Inject)('CACHE_INSTANCE')),

package/cjs/services/company.service.js

@@ -74,7 +74,7 @@ let CompanyService = class CompanyService extends _classes.RequestScopedApiServi
         };
     }
     constructor(cacheManager, utilsService, dataSourceProvider){
-        super('company', null, cacheManager, utilsService, CompanyService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider;
+        super('company', null, cacheManager, utilsService, CompanyService.name, true, 'auth'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider;
     }
 };
 CompanyService = _ts_decorate([

package/cjs/services/user-permission.service.js

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "UserPermissionService", {
         return UserPermissionService;
     }
 });
+const _nestjsshared = require("@flusys/nestjs-shared");
 const _common = require("@nestjs/common");
+const _config = require("../config");
 const _usercompanypermissionentity = require("../entities/user-company-permission.entity");
 const _authdatasourceprovider = require("./auth-datasource.provider");
 function _define_property(obj, key, value) {
@@ -72,7 +74,13 @@ let UserPermissionService = class UserPermissionService {
             }
         });
         if (existing) {
-            throw new _common.ConflictException(`User already assigned to this ${typeName}`);
+            throw new _common.ConflictException({
+                message: `User already assigned to this ${typeName}`,
+                messageKey: _config.USER_PERMISSION_MESSAGES.ALREADY_ASSIGNED,
+                messageParams: {
+                    type: typeName
+                }
+            });
         }
         try {
             await repository.save(repository.create({
@@ -82,8 +90,15 @@ let UserPermissionService = class UserPermissionService {
                 metadata
             }));
         } catch (error) {
-            if (error?.code === 'ER_DUP_ENTRY' || error?.message?.includes('Duplicate entry')) {
-                throw new _common.ConflictException(`User already assigned to this ${typeName}. Please refresh and try again.`);
+            const err = error;
+            if (err?.code === 'ER_DUP_ENTRY' || String(err?.message).includes('Duplicate entry')) {
+                throw new _common.ConflictException({
+                    message: `User already assigned to this ${typeName}. Please refresh and try again.`,
+                    messageKey: _config.USER_PERMISSION_MESSAGES.ALREADY_ASSIGNED,
+                    messageParams: {
+                        type: typeName
+                    }
+                });
             }
             throw error;
         }
@@ -99,7 +114,13 @@ let UserPermissionService = class UserPermissionService {
             }
         });
         if (!permission) {
-            throw new _common.NotFoundException(`${typeName.charAt(0).toUpperCase() + typeName.slice(1)} permission not found`);
+            throw new _common.NotFoundException({
+                message: `${typeName.charAt(0).toUpperCase() + typeName.slice(1)} permission not found`,
+                messageKey: _config.USER_PERMISSION_MESSAGES.PERMISSION_NOT_FOUND,
+                messageParams: {
+                    type: typeName.charAt(0).toUpperCase() + typeName.slice(1)
+                }
+            });
         }
         await repository.remove(permission);
     }
@@ -127,6 +148,33 @@ let UserPermissionService = class UserPermissionService {
         this.findUserCompanies = (userId)=>this.findUserPermissions(userId, _usercompanypermissionentity.PermissionType.COMPANY);
     }
 };
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.assignPermission',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        String,
+        typeof _usercompanypermissionentity.PermissionType === "undefined" ? Object : _usercompanypermissionentity.PermissionType,
+        typeof Record === "undefined" ? Object : Record
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserPermissionService.prototype, "assignPermission", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.revokePermission',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        String,
+        typeof _usercompanypermissionentity.PermissionType === "undefined" ? Object : _usercompanypermissionentity.PermissionType
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserPermissionService.prototype, "revokePermission", null);
 UserPermissionService = _ts_decorate([
     (0, _common.Injectable)({
         scope: _common.Scope.REQUEST

package/cjs/services/user.service.js

@@ -9,13 +9,16 @@ Object.defineProperty(exports, "UserService", {
     }
 });
 const _classes = require("@flusys/nestjs-shared/classes");
+const _nestjsshared = require("@flusys/nestjs-shared");
+const _interfaces = require("@flusys/nestjs-shared/interfaces");
 const _modules = require("@flusys/nestjs-shared/modules");
-const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
+const _constants = require("@flusys/nestjs-shared/constants");
+const _config = require("../config");
 const _bcrypt = /*#__PURE__*/ _interop_require_wildcard(require("bcrypt"));
 const _authconfigservice = require("./auth-config.service");
 const _authdatasourceprovider = require("./auth-datasource.provider");
-const _config = require("../config");
+const _userdto = require("../dtos/user.dto");
 const _enums = require("../enums");
 const _userenricherinterface = require("../interfaces/user-enricher.interface");
 const _usercompanypermissionentity = require("../entities/user-company-permission.entity");
@@ -109,7 +112,10 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
     }
     async getUserForProfile(userId, user) {
         if (userId !== user.id) {
-            throw new _common.ForbiddenException('Cannot access another user\'s profile');
+            throw new _common.ForbiddenException({
+                message: 'Cannot access another user\'s profile',
+                messageKey: _config.AUTH_MESSAGES.PROFILE_ACCESS_DENIED
+            });
         }
         await this.ensureRepositoryInitialized();
         const userEntity = await this.repository.findOne({
@@ -118,7 +124,10 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
             }
         });
         if (!userEntity) {
-            throw new _common.NotFoundException('User not found');
+            throw new _common.NotFoundException({
+                message: 'User not found',
+                messageKey: _config.USER_MESSAGES.NOT_FOUND
+            });
         }
         return userEntity;
     }
@@ -156,7 +165,10 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
                 }
             });
             if (!permission) {
-                throw new _common.NotFoundException('User company permission not found');
+                throw new _common.NotFoundException({
+                    message: 'User company permission not found',
+                    messageKey: _config.USER_PERMISSION_MESSAGES.PERMISSION_NOT_FOUND
+                });
             }
             permission.isActive = isActive;
             await this.permissionRepository.save(permission);
@@ -286,7 +298,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
     async insert(dto, user) {
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
         if (!isCompanyFeatureEnabled || !this.dataSource || !user?.companyId || !this.permissionRepository) {
-            return super.insert(dto, user);
+            return await super.insert(dto, user);
         }
         const queryRunner = this.dataSource.createQueryRunner();
         await queryRunner.connect();
@@ -335,10 +347,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
             return this.convertEntityToResponseDto(savedUser, false);
         } catch (error) {
             await queryRunner.rollbackTransaction();
-            _utils.ErrorHandler.logError(this.logger, error, 'insert', {
-                entity: this.entityName
-            });
-            _utils.ErrorHandler.rethrowError(error);
+            throw error;
         } finally{
             await queryRunner.release();
         }
@@ -385,10 +394,16 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
     async updateProfileSection(userId, sectionId, data, user) {
         const userEntity = await this.getUserForProfile(userId, user);
         if (!this.dataSource) {
-            throw new _common.BadRequestException('DataSource not available');
+            throw new _common.BadRequestException({
+                message: 'DataSource not available',
+                messageKey: _constants.SYSTEM_MESSAGES.DATASOURCE_NOT_AVAILABLE
+            });
         }
         if (!this.userEnricher?.updateProfileSection) {
-            throw new _common.BadRequestException('Profile sections not supported');
+            throw new _common.BadRequestException({
+                message: 'Profile sections not supported',
+                messageKey: _config.AUTH_MESSAGES.PROFILE_SECTIONS_NOT_SUPPORTED
+            });
         }
         const queryRunner = this.dataSource.createQueryRunner();
         await queryRunner.connect();
@@ -401,11 +416,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
             ]);
         } catch (error) {
             await queryRunner.rollbackTransaction();
-            _utils.ErrorHandler.logError(this.logger, error, 'updateProfileSection', {
-                entity: this.entityName,
-                sectionId
-            });
-            _utils.ErrorHandler.rethrowError(error);
+            throw error;
         } finally{
             await queryRunner.release();
         }
@@ -420,7 +431,10 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
     async profile(dto, user) {
         await this.ensureRepositoryInitialized();
         if (!this.dataSource) {
-            throw new _common.BadRequestException('DataSource not available');
+            throw new _common.BadRequestException({
+                message: 'DataSource not available',
+                messageKey: _constants.SYSTEM_MESSAGES.DATASOURCE_NOT_AVAILABLE
+            });
         }
         const userId = dto.id ?? user.id;
         if (dto.extras && this.userEnricher?.validateProfileExtras) {
@@ -436,17 +450,26 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
                 }
             });
             if (!findUser) {
-                throw new _common.NotFoundException('User not found');
+                throw new _common.NotFoundException({
+                    message: 'User not found',
+                    messageKey: _config.USER_MESSAGES.NOT_FOUND
+                });
             }
             if (dto.password) {
                 const isOwnProfile = !dto.id || dto.id === user.id;
                 if (isOwnProfile) {
                     if (!dto.oldPassword) {
-                        throw new _common.BadRequestException('Current password is required to change your password');
+                        throw new _common.BadRequestException({
+                            message: 'Current password is required to change your password',
+                            messageKey: _config.AUTH_MESSAGES.PASSWORD_CHANGE_CURRENT_REQUIRED
+                        });
                     }
                     const isPasswordValid = await _bcrypt.compare(dto.oldPassword, findUser.password);
                     if (!isPasswordValid) {
-                        throw new _common.BadRequestException('Current password is incorrect');
+                        throw new _common.BadRequestException({
+                            message: 'Current password is incorrect',
+                            messageKey: _config.AUTH_MESSAGES.PASSWORD_CHANGE_INVALID_CURRENT
+                        });
                     }
                 }
                 findUser.password = await _bcrypt.hash(dto.password, _config.BCRYPT_SALT_ROUNDS);
@@ -464,18 +487,91 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
             return findUser.id;
         } catch (error) {
             await queryRunner.rollbackTransaction();
-            _utils.ErrorHandler.logError(this.logger, error, 'profile', {
-                entity: this.entityName
-            });
-            _utils.ErrorHandler.rethrowError(error);
+            throw error;
         } finally{
             await queryRunner.release();
         }
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig, userEnricher){
-        super('user', null, cacheManager, utilsService, UserService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.userEnricher = userEnricher;
+        super('user', null, cacheManager, utilsService, UserService.name, true, 'auth'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.userEnricher = userEnricher;
     }
 };
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.verifyEmail',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserService.prototype, "verifyEmail", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.verifyPhone',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserService.prototype, "verifyPhone", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.updateStatus',
+        module: 'auth'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        Boolean,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserService.prototype, "updateStatus", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.create',
+        module: 'auth',
+        includeParams: false
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _userdto.CreateUserDto === "undefined" ? Object : _userdto.CreateUserDto,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserService.prototype, "insert", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.updateProfileSection',
+        module: 'auth',
+        includeParams: false
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        String,
+        typeof Record === "undefined" ? Object : Record,
+        typeof _interfaces.ILoggedUserInfo === "undefined" ? Object : _interfaces.ILoggedUserInfo
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserService.prototype, "updateProfileSection", null);
+_ts_decorate([
+    (0, _nestjsshared.LogAction)({
+        action: 'user.updateProfile',
+        module: 'auth',
+        includeParams: false
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        Object,
+        typeof _interfaces.ILoggedUserInfo === "undefined" ? Object : _interfaces.ILoggedUserInfo
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserService.prototype, "profile", null);
 UserService = _ts_decorate([
     (0, _common.Injectable)({
         scope: _common.Scope.REQUEST

package/cjs/strategies/jwt.strategy.js

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "JwtStrategy", {
         return JwtStrategy;
     }
 });
+const _constants = require("@flusys/nestjs-shared/constants");
 const _common = require("@nestjs/common");
+const _config = require("../config");
 const _core = require("@nestjs/core");
 const _passport = require("@nestjs/passport");
 const _passportjwt = require("passport-jwt");
@@ -52,7 +54,10 @@ let JwtStrategy = class JwtStrategy extends (0, _passport.PassportStrategy)(_pas
             }
         });
         if (!user) {
-            throw new _common.UnauthorizedException('User not found or inactive');
+            throw new _common.UnauthorizedException({
+                message: 'User not found or inactive',
+                messageKey: _config.USER_MESSAGES.NOT_FOUND
+            });
         }
         return this.buildUserInfo(payload);
     }
@@ -65,9 +70,15 @@ let JwtStrategy = class JwtStrategy extends (0, _passport.PassportStrategy)(_pas
                 return provider.getRepository(_userentity.User);
             }
         } catch  {
-            throw new _common.UnauthorizedException('Unable to access user data');
+            throw new _common.UnauthorizedException({
+                message: 'Unable to access user data',
+                messageKey: _constants.SYSTEM_MESSAGES.SERVICE_NOT_AVAILABLE
+            });
         }
-        throw new _common.UnauthorizedException('User repository not available');
+        throw new _common.UnauthorizedException({
+            message: 'User repository not available',
+            messageKey: _constants.SYSTEM_MESSAGES.REPOSITORY_NOT_AVAILABLE
+        });
     }
     async checkTokenRevocation(payload) {
         if (!payload.iat) return;
@@ -76,7 +87,10 @@ let JwtStrategy = class JwtStrategy extends (0, _passport.PassportStrategy)(_pas
                 strict: false
             });
             if (authService && await authService.isTokenRevoked(payload.id, payload.iat)) {
-                throw new _common.UnauthorizedException('Token has been revoked');
+                throw new _common.UnauthorizedException({
+                    message: 'Token has been revoked',
+                    messageKey: _config.AUTH_MESSAGES.TOKEN_REVOKED
+                });
             }
         } catch (err) {
             if (err instanceof _common.UnauthorizedException) throw err;

package/config/index.d.ts

@@ -1 +1,2 @@
 export * from './auth.constants';
+export * from './message-keys';