@flusys/nestjs-email 1.1.0-beta → 1.1.0

package/cjs/services/email-datasource.provider.js

@@ -12,8 +12,8 @@ const _modules = require("@flusys/nestjs-shared/modules");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
 const _express = require("express");
-const _interfaces = require("../interfaces");
-const _emailconstants = require("../config/email.constants");
+const _entities = require("../entities");
+const _emailconfigservice = require("./email-config.service");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -27,47 +27,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -83,10 +42,8 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let EmailDataSourceProvider = class EmailDataSourceProvider extends _modules.MultiTenantDataSourceService {
-    // ==================== Factory Methods ====================
-    /**
-   * Build parent options from EmailModuleOptions
-   */ static buildParentOptions(options) {
+    // ─── Factory Methods ────────────────────────────────────────────────────────
+    static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
             defaultDatabaseConfig: options.config?.defaultDatabaseConfig,
@@ -94,66 +51,28 @@ let EmailDataSourceProvider = class EmailDataSourceProvider extends _modules.Mul
             tenants: options.config?.tenants
         };
     }
-    // ==================== Feature Flags ====================
-    /**
-   * Get global enable company feature flag
-   */ getEnableCompanyFeature() {
-        return this.emailOptions.bootstrapAppConfig?.enableCompanyFeature ?? false;
-    }
-    /**
-   * Get enable company feature for specific tenant
-   * Falls back to global setting if not specified per-tenant
-   */ getEnableCompanyFeatureForTenant(tenant) {
-        return tenant?.enableCompanyFeature ?? this.getEnableCompanyFeature();
-    }
-    /**
-   * Get enable company feature for current request context
-   */ getEnableCompanyFeatureForCurrentTenant() {
-        return this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
-    }
-    // ==================== Entity Management ====================
-    /**
-   * Get email entities for migrations based on company feature flag
-   */ async getEmailEntities(enableCompanyFeature) {
-        const enable = enableCompanyFeature ?? this.getEnableCompanyFeature();
-        const { EmailConfig, EmailTemplate } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
-        if (enable) {
-            const { EmailConfigWithCompany, EmailTemplateWithCompany } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
-            return [
-                EmailConfigWithCompany,
-                EmailTemplateWithCompany
-            ];
-        }
-        return [
-            EmailConfig,
-            EmailTemplate
-        ];
+    // ─── Feature Flags ──────────────────────────────────────────────────────────
+    getEnableCompanyFeatureForTenant(tenant) {
+        return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    // ==================== Overrides ====================
-    /**
-   * Override to dynamically set entities based on tenant config
-   */ async createDataSourceFromConfig(config) {
+    // ─── Overrides ──────────────────────────────────────────────────────────────
+    async createDataSourceFromConfig(config) {
         const currentTenant = this.getCurrentTenant();
         const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(currentTenant ?? undefined);
-        const entities = await this.getEmailEntities(enableCompanyFeature);
+        const entities = (0, _entities.getEmailEntitiesByConfig)(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    /**
-   * Override to use Email-specific static cache
-   */ async getSingleDataSource() {
-        // Return existing initialized connection from Email-specific cache
+    async getSingleDataSource() {
         if (EmailDataSourceProvider.singleDataSource?.isInitialized) {
             return EmailDataSourceProvider.singleDataSource;
         }
-        // If another request is creating the connection, wait for it
         if (EmailDataSourceProvider.singleConnectionLock) {
             return EmailDataSourceProvider.singleConnectionLock;
         }
         const config = this.getDefaultDatabaseConfig();
         if (!config) {
-            throw new Error('No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.');
+            throw new _common.InternalServerErrorException('No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.');
         }
-        // Create connection with lock to prevent race conditions
         const connectionPromise = this.createDataSourceFromConfig(config);
         EmailDataSourceProvider.singleConnectionLock = connectionPromise;
         try {
@@ -164,20 +83,15 @@ let EmailDataSourceProvider = class EmailDataSourceProvider extends _modules.Mul
             EmailDataSourceProvider.singleConnectionLock = null;
         }
     }
-    /**
-   * Override to use Email-specific static cache for tenant connections
-   */ async getOrCreateTenantConnection(tenant) {
-        // Return existing initialized connection from Email-specific cache
+    async getOrCreateTenantConnection(tenant) {
         const existing = EmailDataSourceProvider.tenantConnections.get(tenant.id);
         if (existing?.isInitialized) {
             return existing;
         }
-        // If another request is creating this tenant's connection, wait for it
         const pendingConnection = EmailDataSourceProvider.connectionLocks.get(tenant.id);
         if (pendingConnection) {
             return pendingConnection;
         }
-        // Create connection with lock to prevent race conditions
         const config = this.buildTenantDatabaseConfig(tenant);
         const connectionPromise = this.createDataSourceFromConfig(config);
         EmailDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
@@ -189,11 +103,10 @@ let EmailDataSourceProvider = class EmailDataSourceProvider extends _modules.Mul
             EmailDataSourceProvider.connectionLocks.delete(tenant.id);
         }
     }
-    constructor(emailOptions, request){
-        super(EmailDataSourceProvider.buildParentOptions(emailOptions), request), _define_property(this, "emailOptions", void 0), _define_property(this, "logger", void 0), this.emailOptions = emailOptions, this.logger = new _common.Logger(EmailDataSourceProvider.name);
+    constructor(configService, request){
+        super(EmailDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), _define_property(this, "logger", void 0), this.configService = configService, this.logger = new _common.Logger(EmailDataSourceProvider.name);
     }
 };
-// Override parent's static properties to have Email-specific cache
 _define_property(EmailDataSourceProvider, "tenantConnections", new Map());
 _define_property(EmailDataSourceProvider, "singleDataSource", null);
 _define_property(EmailDataSourceProvider, "tenantsRegistry", new Map());
@@ -204,12 +117,12 @@ EmailDataSourceProvider = _ts_decorate([
     (0, _common.Injectable)({
         scope: _common.Scope.REQUEST
     }),
-    _ts_param(0, (0, _common.Inject)(_emailconstants.EMAIL_MODULE_OPTIONS)),
+    _ts_param(0, (0, _common.Inject)(_emailconfigservice.EmailConfigService)),
     _ts_param(1, (0, _common.Optional)()),
     _ts_param(1, (0, _common.Inject)(_core.REQUEST)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof _interfaces.EmailModuleOptions === "undefined" ? Object : _interfaces.EmailModuleOptions,
+        typeof _emailconfigservice.EmailConfigService === "undefined" ? Object : _emailconfigservice.EmailConfigService,
         typeof _express.Request === "undefined" ? Object : _express.Request
     ])
 ], EmailDataSourceProvider);

package/cjs/services/email-provider-config.service.js

@@ -10,8 +10,9 @@ Object.defineProperty(exports, "EmailProviderConfigService", {
 });
 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 _config = require("../config");
+const _emailconfigservice = require("./email-config.service");
 const _entities = require("../entities");
 const _emaildatasourceprovider = require("./email-datasource.provider");
 function _define_property(obj, key, value) {
@@ -42,29 +43,23 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let EmailProviderConfigService = class EmailProviderConfigService extends _classes.RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   */ resolveEntity() {
-        const enableCompanyFeature = this.emailConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? _entities.EmailConfigWithCompany : _entities.EmailConfig;
+    resolveEntity() {
+        return this.emailConfig.isCompanyFeatureEnabled() ? _entities.EmailConfigWithCompany : _entities.EmailConfig;
     }
-    /**
-   * Get DataSource provider for this service
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
     async convertSingleDtoToEntity(dto, user) {
-        let emailConfigEntity = {
+        const entity = {
             ...dto
         };
-        // Set company fields if company feature is enabled
         if (this.emailConfig.isCompanyFeatureEnabled()) {
-            emailConfigEntity.companyId = user?.companyId ?? null;
+            entity.companyId = user?.companyId ?? null;
         }
-        return emailConfigEntity;
+        return entity;
     }
     async getSelectQuery(query, _user, select) {
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -77,52 +72,36 @@ let EmailProviderConfigService = class EmailProviderConfigService extends _class
                 'createdAt',
                 'updatedAt'
             ];
-            if (this.emailConfig.isCompanyFeatureEnabled()) {
-                select.push('companyId');
-            }
+            if (this.emailConfig.isCompanyFeatureEnabled()) select.push('companyId');
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        query.select(selectFields);
+        query.select(select.map((field)=>`${this.entityName}.${field}`));
         return {
             query,
             isRaw: false
         };
     }
-    /**
-   * Override: Extra query manipulation - Auto-filter by user's company
-   */ async getExtraManipulateQuery(query, filterDto, user) {
+    async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        const enableCompanyFeature = this.emailConfig.isCompanyFeatureEnabled();
-        if (enableCompanyFeature && user?.companyId) {
-            query.andWhere('emailConfig.companyId = :companyId', {
-                companyId: user.companyId
-            });
-        }
+        (0, _utils.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.emailConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'emailConfig'
+        }, user);
         query.orderBy(`${this.entityName}.createdAt`, 'DESC');
         return result;
     }
-    /**
-   * Find config by ID directly (bypasses company filtering)
-   */ async findByIdDirect(id) {
+    async findByIdDirect(id) {
         await this.ensureRepositoryInitialized();
-        return await this.repository.findOne({
+        return this.repository.findOne({
             where: {
                 id
             }
         });
     }
-    /**
-   * Get default email configuration (scoped to user's company if enabled)
-   * Priority: isDefault=true > any active config (oldest first)
-   */ async getDefaultConfig(user) {
+    async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {
+        const baseWhere = (0, _utils.buildCompanyWhereCondition)({
             isActive: true
-        };
-        if (this.emailConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            baseWhere.companyId = user.companyId;
-        }
-        // First try to find config marked as default
+        }, this.emailConfig.isCompanyFeatureEnabled(), user);
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
@@ -132,29 +111,20 @@ let EmailProviderConfigService = class EmailProviderConfigService extends _class
                 createdAt: 'ASC'
             }
         });
-        if (defaultConfig) {
-            return defaultConfig;
-        }
-        // Fall back to any available active config (oldest first for consistency)
-        return await this.repository.findOne({
+        return defaultConfig || this.repository.findOne({
             where: baseWhere,
             order: {
                 createdAt: 'ASC'
             }
         });
     }
-    /**
-   * Get config by provider type
-   */ async getConfigByProvider(provider, user) {
+    async getConfigByProvider(provider, user) {
         await this.ensureRepositoryInitialized();
-        const where = {
+        const where = (0, _utils.buildCompanyWhereCondition)({
             provider,
             isActive: true
-        };
-        if (this.emailConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            where.companyId = user.companyId;
-        }
-        return await this.repository.find({
+        }, this.emailConfig.isCompanyFeatureEnabled(), user);
+        return this.repository.find({
             where
         });
     }
@@ -168,13 +138,13 @@ EmailProviderConfigService = _ts_decorate([
     }),
     _ts_param(0, (0, _common.Inject)('CACHE_INSTANCE')),
     _ts_param(1, (0, _common.Inject)(_modules.UtilsService)),
-    _ts_param(2, (0, _common.Inject)(_config.EmailConfigService)),
+    _ts_param(2, (0, _common.Inject)(_emailconfigservice.EmailConfigService)),
     _ts_param(3, (0, _common.Inject)(_emaildatasourceprovider.EmailDataSourceProvider)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _classes.HybridCache === "undefined" ? Object : _classes.HybridCache,
         typeof _modules.UtilsService === "undefined" ? Object : _modules.UtilsService,
-        typeof _config.EmailConfigService === "undefined" ? Object : _config.EmailConfigService,
+        typeof _emailconfigservice.EmailConfigService === "undefined" ? Object : _emailconfigservice.EmailConfigService,
         typeof _emaildatasourceprovider.EmailDataSourceProvider === "undefined" ? Object : _emaildatasourceprovider.EmailDataSourceProvider
     ])
 ], EmailProviderConfigService);

package/cjs/services/email-send.service.js

@@ -8,8 +8,9 @@ Object.defineProperty(exports, "EmailSendService", {
         return EmailSendService;
     }
 });
+const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
-const _config = require("../config");
+const _emailconfigservice = require("./email-config.service");
 const _providers = require("../providers");
 const _emailproviderconfigservice = require("./email-provider-config.service");
 const _emailtemplateservice = require("./email-template.service");
@@ -40,59 +41,12 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
+/** Valid identifier pattern for template variables: {{varName}} */ const VARIABLE_PATTERN = /\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g;
 let EmailSendService = class EmailSendService {
-    /**
-   * Get email provider based on config ID or default
-   */ async getEmailProviderWithConfig(emailConfigId, user) {
-        let emailConfig;
-        if (emailConfigId) {
-            const config = await this.emailProviderConfigService.findByIdDirect(emailConfigId);
-            if (!config) {
-                throw new _common.NotFoundException('Email configuration not found');
-            }
-            // Validate company ownership
-            if (this.emailConfigService.isCompanyFeatureEnabled() && user?.companyId) {
-                const configWithCompany = config;
-                if (configWithCompany.companyId && configWithCompany.companyId !== user.companyId) {
-                    throw new _common.BadRequestException('Email configuration belongs to another company');
-                }
-            }
-            if (!config.isActive) {
-                throw new _common.BadRequestException('Email configuration is inactive');
-            }
-            emailConfig = config;
-        } else {
-            const defaultConfig = await this.emailProviderConfigService.getDefaultConfig(user);
-            if (!defaultConfig) {
-                throw new _common.NotFoundException('No default email configuration found. Please create one.');
-            }
-            emailConfig = defaultConfig;
-        }
-        const providerConfig = {
-            provider: emailConfig.provider,
-            config: emailConfig.config
-        };
-        const provider = await this.emailFactory.createProvider(providerConfig);
-        return {
-            provider,
-            config: emailConfig
-        };
-    }
-    /**
-   * Interpolate variables in template content
-   * Replaces {{variableName}} with actual values
-   */ interpolateVariables(content, variables) {
-        if (!variables || Object.keys(variables).length === 0) {
-            return content;
-        }
-        return content.replace(/\{\{(\w+)\}\}/g, (match, varName)=>{
-            return variables[varName] !== undefined ? String(variables[varName]) : match;
-        });
-    }
-    /**
-   * Send email directly (without template)
-   */ async sendEmail(dto, user) {
+    // ─── Public API ─────────────────────────────────────────────────────────────
+    async sendEmail(dto, user) {
         const { provider, config } = await this.getEmailProviderWithConfig(dto.emailConfigId, user);
+        const sender = this.resolveSender(dto, config);
         const result = await provider.sendEmail({
             to: dto.to,
             cc: dto.cc,
@@ -100,59 +54,18 @@ let EmailSendService = class EmailSendService {
             subject: dto.subject,
             html: dto.html,
             text: dto.text,
-            from: dto.from || config.fromEmail || undefined,
-            fromName: dto.fromName || config.fromName || this.emailConfigService.getDefaultFromName(),
+            ...sender,
             replyTo: dto.replyTo,
-            attachments: dto.attachments?.map((a)=>({
-                    filename: a.filename,
-                    content: Buffer.from(a.content, 'base64'),
-                    contentType: a.contentType
-                }))
+            attachments: this.buildAttachments(dto.attachments)
         });
-        this.logger.log(`Email sent to ${Array.isArray(dto.to) ? dto.to.join(', ') : dto.to}: ${result.success ? 'SUCCESS' : 'FAILED'}`);
+        this.logResult(dto.to, result);
         return result;
     }
-    /**
-   * Send email using template
-   */ async sendTemplateEmail(dto, user) {
-        // Get template by ID or slug
-        let template;
-        if (dto.templateId) {
-            template = await this.emailTemplateService.findByIdDirect(dto.templateId);
-        } else if (dto.templateSlug) {
-            template = await this.emailTemplateService.findBySlug(dto.templateSlug, user);
-        } else {
-            throw new _common.BadRequestException('templateId or templateSlug is required');
-        }
-        if (!template) {
-            throw new _common.NotFoundException('Email template not found');
-        }
-        if (!template.isActive) {
-            throw new _common.BadRequestException('Email template is inactive');
-        }
-        // Validate company ownership
-        if (this.emailConfigService.isCompanyFeatureEnabled() && user?.companyId) {
-            const templateWithCompany = template;
-            if (templateWithCompany.companyId && templateWithCompany.companyId !== user.companyId) {
-                throw new _common.BadRequestException('Email template belongs to another company');
-            }
-        }
-        // Interpolate variables in subject and content
-        const subject = this.interpolateVariables(template.subject, dto.variables || {});
-        // Check isHtml to determine which content to send
-        let html;
-        let text;
-        if (template.isHtml) {
-            // HTML template - send htmlContent, with textContent as fallback
-            html = this.interpolateVariables(template.htmlContent, dto.variables || {});
-            text = template.textContent ? this.interpolateVariables(template.textContent, dto.variables || {}) : undefined;
-        } else {
-            // Plain text template - send only textContent, no HTML
-            text = template.textContent ? this.interpolateVariables(template.textContent, dto.variables || {}) : this.interpolateVariables(template.htmlContent, dto.variables || {}); // fallback to htmlContent if textContent is empty
-            html = undefined;
-        }
-        // Get provider and send
+    async sendTemplateEmail(dto, user) {
+        const template = await this.resolveTemplate(dto, user);
+        const { subject, html, text } = this.buildTemplateContent(template, dto.variables);
         const { provider, config } = await this.getEmailProviderWithConfig(dto.emailConfigId, user);
+        const sender = this.resolveSender(dto, config);
         const result = await provider.sendEmail({
             to: dto.to,
             cc: dto.cc,
@@ -160,43 +73,125 @@ let EmailSendService = class EmailSendService {
             subject,
             html,
             text,
-            from: dto.from || config.fromEmail || undefined,
-            fromName: dto.fromName || config.fromName || this.emailConfigService.getDefaultFromName(),
+            ...sender,
             replyTo: dto.replyTo,
-            attachments: dto.attachments?.map((a)=>({
-                    filename: a.filename,
-                    content: Buffer.from(a.content, 'base64'),
-                    contentType: a.contentType
-                }))
+            attachments: this.buildAttachments(dto.attachments)
         });
-        this.logger.log(`Template email sent to ${Array.isArray(dto.to) ? dto.to.join(', ') : dto.to} using template "${template.slug}": ${result.success ? 'SUCCESS' : 'FAILED'}`);
+        this.logResult(dto.to, result, template.slug);
         return result;
     }
-    /**
-   * Send test email (for testing configuration)
-   */ async sendTestEmail(emailConfigId, recipient, user) {
+    async sendTestEmail(emailConfigId, recipient, user) {
         const { provider, config } = await this.getEmailProviderWithConfig(emailConfigId, user);
+        const safeConfig = (0, _utils.escapeHtmlVariables)({
+            name: config.name,
+            provider: config.provider.toUpperCase()
+        });
         const result = await provider.sendEmail({
             to: recipient,
             subject: 'Test Email from FLUSYS',
-            html: `
-        <div style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto;">
-          <h1 style="color: #333;">Test Email</h1>
-          <p>This is a test email from FLUSYS Email Service.</p>
-          <p><strong>Configuration:</strong> ${config.name}</p>
-          <p><strong>Provider:</strong> ${config.provider.toUpperCase()}</p>
-          <p style="color: #666; font-size: 12px;">
-            If you received this email, your email configuration is working correctly.
-          </p>
-        </div>
-      `,
+            html: this.buildTestEmailHtml(safeConfig),
             text: `Test Email from FLUSYS\n\nThis is a test email.\nConfiguration: ${config.name}\nProvider: ${config.provider.toUpperCase()}`,
             from: config.fromEmail || undefined,
             fromName: config.fromName || this.emailConfigService.getDefaultFromName()
         });
-        this.logger.log(`Test email sent to ${recipient}: ${result.success ? 'SUCCESS' : 'FAILED'}`);
+        this.logResult(recipient, result);
         return result;
     }
+    // ─── Private: Provider & Config Resolution ──────────────────────────────────
+    async getEmailProviderWithConfig(emailConfigId, user) {
+        const emailConfig = emailConfigId ? await this.resolveConfigById(emailConfigId, user) : await this.resolveDefaultConfig(user);
+        const providerConfig = {
+            provider: emailConfig.provider,
+            config: emailConfig.config
+        };
+        return {
+            provider: await this.emailFactory.createProvider(providerConfig),
+            config: emailConfig
+        };
+    }
+    async resolveConfigById(id, user) {
+        const config = await this.emailProviderConfigService.findByIdDirect(id);
+        if (!config) throw new _common.NotFoundException('Email configuration not found');
+        (0, _utils.validateCompanyOwnership)(config, user, this.emailConfigService.isCompanyFeatureEnabled(), 'Email configuration');
+        if (!config.isActive) throw new _common.BadRequestException('Email configuration is inactive');
+        return config;
+    }
+    async resolveDefaultConfig(user) {
+        const config = await this.emailProviderConfigService.getDefaultConfig(user);
+        if (!config) throw new _common.NotFoundException('No default email configuration found');
+        return config;
+    }
+    // ─── Private: Template Resolution ───────────────────────────────────────────
+    async resolveTemplate(dto, user) {
+        let template = null;
+        if (dto.templateId) {
+            template = await this.emailTemplateService.findByIdDirect(dto.templateId);
+        } else if (dto.templateSlug) {
+            template = await this.emailTemplateService.findBySlug(dto.templateSlug, user);
+        } else {
+            throw new _common.BadRequestException('templateId or templateSlug is required');
+        }
+        if (!template) throw new _common.NotFoundException('Email template not found');
+        if (!template.isActive) throw new _common.BadRequestException('Email template is inactive');
+        (0, _utils.validateCompanyOwnership)(template, user, this.emailConfigService.isCompanyFeatureEnabled(), 'Email template');
+        return template;
+    }
+    buildTemplateContent(template, variables) {
+        const vars = variables || {};
+        const subject = this.interpolateVariables(template.subject, vars, false);
+        if (template.isHtml) {
+            return {
+                subject,
+                html: this.interpolateVariables(template.htmlContent, vars, true),
+                text: template.textContent ? this.interpolateVariables(template.textContent, vars, false) : undefined
+            };
+        }
+        return {
+            subject,
+            html: undefined,
+            text: template.textContent ? this.interpolateVariables(template.textContent, vars, false) : this.interpolateVariables(template.htmlContent, vars, false)
+        };
+    }
+    // ─── Private: Helpers ───────────────────────────────────────────────────────
+    resolveSender(dto, config) {
+        return {
+            from: dto.from || config.fromEmail || undefined,
+            fromName: dto.fromName || config.fromName || this.emailConfigService.getDefaultFromName()
+        };
+    }
+    buildAttachments(attachments) {
+        return attachments?.map((a)=>({
+                filename: a.filename,
+                content: Buffer.from(a.content, 'base64'),
+                contentType: a.contentType
+            }));
+    }
+    interpolateVariables(content, variables, escapeHtml) {
+        if (!variables || Object.keys(variables).length === 0) return content;
+        const safeVars = escapeHtml ? (0, _utils.escapeHtmlVariables)(variables) : variables;
+        return content.replace(VARIABLE_PATTERN, (match, varName)=>{
+            return varName in safeVars && safeVars[varName] !== undefined ? String(safeVars[varName]) : match;
+        });
+    }
+    logResult(to, result, templateSlug) {
+        const recipient = Array.isArray(to) ? to.join(', ') : to;
+        const status = result.success ? 'SUCCESS' : 'FAILED';
+        const message = templateSlug ? `Template email sent to ${recipient} using template "${templateSlug}": ${status}` : `Email sent to ${recipient}: ${status}`;
+        this.logger.log(message);
+    }
+    buildTestEmailHtml(safeConfig) {
+        return `
+      <div style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto;">
+        <h1 style="color: #333;">Test Email</h1>
+        <p>This is a test email from FLUSYS Email Service.</p>
+        <p><strong>Configuration:</strong> ${safeConfig.name}</p>
+        <p><strong>Provider:</strong> ${safeConfig.provider}</p>
+        <p style="color: #666; font-size: 12px;">
+          If you received this email, your email configuration is working correctly.
+        </p>
+      </div>
+    `;
+    }
     constructor(emailFactory, emailConfigService, emailProviderConfigService, emailTemplateService){
         _define_property(this, "emailFactory", void 0);
         _define_property(this, "emailConfigService", void 0);
@@ -215,13 +210,13 @@ EmailSendService = _ts_decorate([
         scope: _common.Scope.REQUEST
     }),
     _ts_param(0, (0, _common.Inject)(_providers.EmailFactoryService)),
-    _ts_param(1, (0, _common.Inject)(_config.EmailConfigService)),
+    _ts_param(1, (0, _common.Inject)(_emailconfigservice.EmailConfigService)),
     _ts_param(2, (0, _common.Inject)(_emailproviderconfigservice.EmailProviderConfigService)),
     _ts_param(3, (0, _common.Inject)(_emailtemplateservice.EmailTemplateService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _providers.EmailFactoryService === "undefined" ? Object : _providers.EmailFactoryService,
-        typeof _config.EmailConfigService === "undefined" ? Object : _config.EmailConfigService,
+        typeof _emailconfigservice.EmailConfigService === "undefined" ? Object : _emailconfigservice.EmailConfigService,
         typeof _emailproviderconfigservice.EmailProviderConfigService === "undefined" ? Object : _emailproviderconfigservice.EmailProviderConfigService,
         typeof _emailtemplateservice.EmailTemplateService === "undefined" ? Object : _emailtemplateservice.EmailTemplateService
     ])