@flusys/nestjs-auth 0.1.0-beta.3 → 1.0.0-rc

package/cjs/services/branch.service.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "BranchService", {
 });
 const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
+const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
 const _companybranchentity = require("../entities/company-branch.entity");
 const _authconfigservice = require("./auth-config.service");
@@ -42,41 +43,15 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let BranchService = class BranchService extends _classes.RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns CompanyBranch entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return _companybranchentity.CompanyBranch;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns AuthDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // ==================== Entity Conversion ====================
-    async convertSingleDtoToEntity(dto, _user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        let branch = new _companybranchentity.CompanyBranch();
-        if ('id' in dto && dto.id && typeof dto.id === 'string') {
-            const dbData = await this.repository.findOne({
-                where: {
-                    id: dto.id
-                }
-            });
-            if (!dbData) {
-                throw new _common.NotFoundException('Branch not found');
-            }
-            branch = dbData;
-        }
-        return {
-            ...branch,
-            ...dto
-        };
-    }
+    // Query Customization
     async getSelectQuery(query, _user, select) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -85,14 +60,13 @@ let BranchService = class BranchService extends _classes.RequestScopedApiService
                 'createdAt'
             ];
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        query.select(selectFields);
+        query.select(select.map((f)=>`${this.entityName}.${f}`));
         return {
             query,
             isRaw: false
         };
     }
-    async getGlobalSearchQuery(query, search, _user) {
+    async getGlobalSearchQuery(query, search) {
         query.andWhere('(company_branch.name LIKE :search OR company_branch.slug LIKE :search OR company_branch.email LIKE :search)', {
             search: `%${search}%`
         });
@@ -101,24 +75,17 @@ let BranchService = class BranchService extends _classes.RequestScopedApiService
             isRaw: false
         };
     }
-    /**
-   * Override: Filter branches by user's company
-   * Ensures users can only see branches belonging to their company
-   */ async getExtraManipulateQuery(query, _filterAndPaginationDto, user) {
-        const result = await super.getExtraManipulateQuery(query, _filterAndPaginationDto, user);
-        // Only apply company filtering if company feature is enabled and user has company context
-        const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
-        if (isCompanyFeatureEnabled && user?.companyId) {
-            query.andWhere('company_branch.company_id = :companyId', {
-                companyId: user.companyId
-            });
-        }
+    async getExtraManipulateQuery(query, filterDto, user) {
+        const result = await super.getExtraManipulateQuery(query, filterDto, user);
+        (0, _utils.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.authConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'company_branch',
+            columnName: 'company_id'
+        }, user);
         return result;
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){
-        // Repository will be set asynchronously by RequestScopedApiService
-        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), _define_property(this, "logger", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.logger = new _common.Logger(BranchService.name);
+        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;
     }
 };
 BranchService = _ts_decorate([

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

@@ -43,7 +43,7 @@ const SESSION_TTL_MS = 5 * 60 * 1000; // 5 minutes
 let CompanySelectionSessionService = class CompanySelectionSessionService {
     /**
    * Create a new session for company/branch selection
-   */ async createSession(userId, companyId) {
+   */ async createSession(userId) {
         const sessionId = (0, _crypto.randomUUID)();
         const now = new Date();
         const expiresAt = new Date(now.getTime() + SESSION_TTL_MS);

package/cjs/services/company.service.js

@@ -41,41 +41,15 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let CompanyService = class CompanyService extends _classes.RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns Company entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return _companyentity.Company;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns AuthDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // ==================== Entity Conversion ====================
-    async convertSingleDtoToEntity(dto, _user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        let company = new _companyentity.Company();
-        if ('id' in dto && dto.id && typeof dto.id === 'string') {
-            const dbData = await this.repository.findOne({
-                where: {
-                    id: dto.id
-                }
-            });
-            if (!dbData) {
-                throw new _common.NotFoundException('Company not found');
-            }
-            company = dbData;
-        }
-        return {
-            ...company,
-            ...dto
-        };
-    }
+    // Query Customization
     async getSelectQuery(query, _user, select) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -84,14 +58,13 @@ let CompanyService = class CompanyService extends _classes.RequestScopedApiServi
                 'createdAt'
             ];
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        query.select(selectFields);
+        query.select(select.map((f)=>`${this.entityName}.${f}`));
         return {
             query,
             isRaw: false
         };
     }
-    async getGlobalSearchQuery(query, search, _user) {
+    async getGlobalSearchQuery(query, search) {
         query.andWhere('(company.name LIKE :search OR company.slug LIKE :search OR company.email LIKE :search)', {
             search: `%${search}%`
         });
@@ -100,10 +73,8 @@ let CompanyService = class CompanyService extends _classes.RequestScopedApiServi
             isRaw: false
         };
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, dataSourceProvider){
-        // Repository will be set asynchronously by RequestScopedApiService
-        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), _define_property(this, "logger", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.logger = new _common.Logger(CompanyService.name);
+        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;
     }
 };
 CompanyService = _ts_decorate([

package/cjs/services/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./authentication.service"), exports);
+_export_star(require("./auth-email.service"), exports);
 _export_star(require("./company-selection-session.service"), exports);
 _export_star(require("./user.service"), exports);
 _export_star(require("./company.service"), exports);

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

@@ -39,20 +39,14 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let UserPermissionService = class UserPermissionService {
-    /**
-   * Get repository lazily - initialized on first access
-   */ async getRepository() {
+    /** Get repository lazily - initialized on first access */ async getRepository() {
         if (!this._repository) {
             this._repository = await this.dataSourceProvider.getRepository(_usercompanypermissionentity.UserCompanyPermission);
         }
         return this._repository;
     }
-    // ==========================================================================
-    // COMPANY PERMISSIONS
-    // ==========================================================================
-    /**
-   * Find all companies a user has access to
-   */ async findUserCompanies(userId) {
+    // Company Permissions
+    /** Find all companies a user has access to */ async findUserCompanies(userId) {
         const repository = await this.getRepository();
         return repository.find({
             where: {
@@ -67,9 +61,7 @@ let UserPermissionService = class UserPermissionService {
             }
         });
     }
-    /**
-   * Assign user to a company
-   */ async assignUserToCompany(dto) {
+    /** Assign user to a company */ async assignUserToCompany(dto) {
         const repository = await this.getRepository();
         // Check if already exists
         const existing = await repository.findOne({
@@ -90,9 +82,7 @@ let UserPermissionService = class UserPermissionService {
         });
         await repository.save(permission);
     }
-    /**
-   * Revoke user access to a company
-   */ async revokeCompanyAccess(userId, companyId) {
+    /** Revoke user access to a company */ async revokeCompanyAccess(userId, companyId) {
         const repository = await this.getRepository();
         const permission = await repository.findOne({
             where: {
@@ -106,12 +96,8 @@ let UserPermissionService = class UserPermissionService {
         }
         await repository.remove(permission);
     }
-    // ==========================================================================
-    // BRANCH PERMISSIONS
-    // ==========================================================================
-    /**
-   * Find all branches a user has access to
-   */ async findUserBranches(userId) {
+    // Branch Permissions
+    /** Find all branches a user has access to */ async findUserBranches(userId) {
         const repository = await this.getRepository();
         return repository.find({
             where: {
@@ -126,9 +112,7 @@ let UserPermissionService = class UserPermissionService {
             }
         });
     }
-    /**
-   * Assign user to a branch
-   */ async assignUserToBranch(dto) {
+    /** Assign user to a branch */ async assignUserToBranch(dto) {
         const repository = await this.getRepository();
         // Check if already exists
         const existing = await repository.findOne({
@@ -149,9 +133,7 @@ let UserPermissionService = class UserPermissionService {
         });
         await repository.save(permission);
     }
-    /**
-   * Revoke user access to a branch
-   */ async revokeBranchAccess(userId, branchId) {
+    /** Revoke user access to a branch */ async revokeBranchAccess(userId, branchId) {
         const repository = await this.getRepository();
         const permission = await repository.findOne({
             where: {
@@ -168,10 +150,8 @@ let UserPermissionService = class UserPermissionService {
     // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(dataSourceProvider){
         _define_property(this, "dataSourceProvider", void 0);
-        _define_property(this, "logger", void 0);
         _define_property(this, "_repository", void 0);
         this.dataSourceProvider = dataSourceProvider;
-        this.logger = new _common.Logger(UserPermissionService.name);
         this._repository = null;
     }
 };