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

package/fesm/services/branch.service.js

@@ -27,46 +27,21 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
+import { Inject, Injectable, Scope } from '@nestjs/common';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export class BranchService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns CompanyBranch entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return 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 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 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',
@@ -75,14 +50,13 @@ export class BranchService extends 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}%`
         });
@@ -91,24 +65,17 @@ export class BranchService extends 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);
+        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 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/fesm/services/company-selection-session.service.js

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

package/fesm/services/company.service.js

@@ -27,45 +27,19 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { Inject, Injectable, Scope } from '@nestjs/common';
 import { Company } from '../entities/company.entity';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export class CompanyService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns Company entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return 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 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 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',
@@ -74,14 +48,13 @@ export class CompanyService extends 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.name LIKE :search OR company.slug LIKE :search OR company.email LIKE :search)', {
             search: `%${search}%`
         });
@@ -90,10 +63,8 @@ export class CompanyService extends RequestScopedApiService {
             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 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/fesm/services/index.js

@@ -1,4 +1,5 @@
 export * from './authentication.service';
+export * from './auth-email.service';
 export * from './company-selection-session.service';
 export * from './user.service';
 export * from './company.service';

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

@@ -25,24 +25,18 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import { PermissionType, UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export 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(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: {
@@ -57,9 +51,7 @@ export 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({
@@ -80,9 +72,7 @@ export 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: {
@@ -96,12 +86,8 @@ export 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: {
@@ -116,9 +102,7 @@ export 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({
@@ -139,9 +123,7 @@ export 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: {
@@ -158,10 +140,8 @@ export 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 Logger(UserPermissionService.name);
         this._repository = null;
     }
 }