@flusys/nestjs-email 9.1.2 → 9.2.1

package/README.md

@@ -207,6 +207,13 @@ await this.emailSend.sendEmail({
 
 `EmailModule` provides and exports `EMAIL_ADAPTER` (`nestjs-shared`), implemented by `EmailAdapter`: `send({ to, cc?, bcc?, replyTo?, emailConfigId?, subject, html?, text? }, user)` and `sendTemplate({ ...recipients, templateSlug, variables? }, user)`, both answering `{ success, messageId?, error? }`. It resolves the request-scoped `EmailSendService` per call, so singletons can inject it; a feature package injects it `@Optional()` and never imports this package (the entity builder's **Send email** flow step uses it).
 
+## 4. Caching and Company Scope
+
+- **Email configs are never cached** in the shared cache (`CACHE_INSTANCE`): rows carry SMTP passwords and API keys. Templates are cached (`findById` / `getAll`) under the `emailTemplate` stamp, which every insert / update / delete moves after commit on every instance.
+- **The send path reads the database**: `sendEmail` / `sendTemplateEmail` / `sendTestEmail` load the config and the template (by id or slug) straight from the repository, so an edited template or config is used on the next send on every instance.
+- **Provider clients** (`EmailFactoryService`) are reused per provider + SHA-256 of the full config, credentials included, so an edited config gets a new client everywhere and only identical credentials share one. Concurrent first sends share one pending client; a failed initialization is dropped so the next send retries. Clients idle for 30 minutes, or beyond the 50 most recently used, are dropped and `close()`d (SMTP transports). `clearCache()` closes every client.
+- **Company scope** (`enableCompanyFeature: true`): `getById` / `getAll` only return rows of the caller's company (the company is part of the cache key), and `update` / `delete` reject ids of another company with `entity.belongs.another.company`.
+
 ## License
 
 MIT © FLUSYS

package/controllers/email-config.controller.d.ts

@@ -4,6 +4,7 @@ declare const EmailConfigController_base: abstract new (service: EmailProviderCo
     readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: EmailProviderConfigService;
     isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
+    assertEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): void;
     insert(addDto: CreateEmailConfigDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<EmailConfigResponseDto>>;
     insertMany(addDto: CreateEmailConfigDto[], user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<EmailConfigResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<EmailConfigResponseDto>>;

package/controllers/email-template.controller.d.ts

@@ -7,6 +7,7 @@ declare const EmailTemplateController_base: abstract new (service: EmailTemplate
     readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: EmailTemplateService;
     isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
+    assertEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): void;
     insert(addDto: CreateEmailTemplateDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;
     insertMany(addDto: CreateEmailTemplateDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<EmailTemplateResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;

package/fesm/184.js

@@ -1,8 +1,8 @@
 import { Identity } from "@flusys/nestjs-shared/entities";
 import { createHash } from "crypto";
-import { SYSTEM_MESSAGES } from "@flusys/nestjs-shared/constants";
 import * as __rspack_external__flusys_nestjs_shared_393d2cae from "@flusys/nestjs-shared";
 import * as __rspack_external__flusys_nestjs_shared_classes_6076a329 from "@flusys/nestjs-shared/classes";
+import * as __rspack_external__flusys_nestjs_shared_constants_81f33d5b from "@flusys/nestjs-shared/constants";
 import * as __rspack_external__flusys_nestjs_shared_modules_24702bee from "@flusys/nestjs-shared/modules";
 import * as __rspack_external__flusys_nestjs_shared_utils_9125c1f1 from "@flusys/nestjs-shared/utils";
 import * as __rspack_external__nestjs_common_a04939da from "@nestjs/common";
@@ -464,7 +464,7 @@ function getEmailEntitiesByConfig(enableCompanyFeature) {
 
 
 },
-603(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+652(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
@@ -527,13 +527,21 @@ function _ts_metadata(metadataKey, metadataValue) {
 
 
 
+const MAX_CACHED_PROVIDERS = 50;
+const PROVIDER_IDLE_TTL_MS = 30 * 60 * 1000;
 class EmailFactoryService {
     providerCache = new Map();
     // ─── Public API ─────────────────────────────────────────────────────────────
     async createProvider(config) {
         const cacheKey = this.generateCacheKey(config);
+        const now = Date.now();
         const cached = this.providerCache.get(cacheKey);
-        if (cached) return cached;
+        if (cached) {
+            cached.lastUsed = now;
+            this.providerCache.delete(cacheKey);
+            this.providerCache.set(cacheKey, cached);
+            return cached.provider;
+        }
         const ProviderClass = EmailProviderRegistry.get(config.provider);
         if (!ProviderClass) {
             throw new common_.NotFoundException({
@@ -545,10 +553,32 @@ class EmailFactoryService {
                 }
             });
         }
+        // The pending promise is cached so concurrent first sends share one client (one SMTP transport)
+        const entry = {
+            provider: this.instantiate(ProviderClass, config),
+            lastUsed: now
+        };
+        this.providerCache.set(cacheKey, entry);
+        entry.provider.catch(()=>{
+            if (this.providerCache.get(cacheKey) === entry) this.providerCache.delete(cacheKey);
+        });
+        this.evict(now);
+        return entry.provider;
+    }
+    async clearCache() {
+        const entries = Array.from(this.providerCache.values());
+        this.providerCache.clear();
+        await Promise.allSettled(entries.map((entry)=>this.closeEntry(entry)));
+    }
+    // ─── Lifecycle ──────────────────────────────────────────────────────────────
+    async onModuleDestroy() {
+        await this.clearCache();
+    }
+    // ─── Private Helpers ────────────────────────────────────────────────────────
+    async instantiate(ProviderClass, config) {
         try {
             const instance = new ProviderClass();
             await instance.initialize?.(config.config);
-            this.providerCache.set(cacheKey, instance);
             return instance;
         } catch (error) {
             throw new common_.InternalServerErrorException({
@@ -561,27 +591,36 @@ class EmailFactoryService {
             });
         }
     }
-    // ─── Lifecycle ──────────────────────────────────────────────────────────────
-    async onModuleDestroy() {
-        const closePromises = Array.from(this.providerCache.entries()).map(([, provider])=>this.closeProvider(provider));
-        await Promise.allSettled(closePromises);
-        this.providerCache.clear();
-    }
-    // ─── Private Helpers ────────────────────────────────────────────────────────
-    generateCacheKey(config) {
-        const sortedKeys = Object.keys(config.config || {}).sort();
-        const configString = JSON.stringify(config.config, sortedKeys);
-        const hash = createHash('sha256').update(configString).digest('hex').substring(0, 16);
-        return `${config.provider}-${hash}`;
+    evict(now) {
+        for (const [key, entry] of this.providerCache){
+            const overCapacity = this.providerCache.size > MAX_CACHED_PROVIDERS;
+            if (!overCapacity && now - entry.lastUsed < PROVIDER_IDLE_TTL_MS) continue;
+            this.providerCache.delete(key);
+            void this.closeEntry(entry);
+        }
     }
-    async closeProvider(provider) {
-        if (!provider.close) return;
+    async closeEntry(entry) {
         try {
-            await provider.close();
+            const provider = await entry.provider;
+            await provider.close?.();
         } catch  {
-        // Silent failure
+        // A client that failed to initialize or to close has nothing left to release
         }
     }
+    generateCacheKey(config) {
+        const hash = createHash('sha256').update(this.stableStringify(config.config ?? {})).digest('hex');
+        return `${config.provider}:${hash}`;
+    }
+    stableStringify(value) {
+        if (value === null || value === undefined) return 'null';
+        if (Array.isArray(value)) return `[${value.map((item)=>this.stableStringify(item)).join(',')}]`;
+        if (typeof value === 'object') {
+            const record = value;
+            const entries = Object.keys(record).filter((key)=>record[key] !== undefined).sort().map((key)=>`${JSON.stringify(key)}:${this.stableStringify(record[key])}`);
+            return `{${entries.join(',')}}`;
+        }
+        return JSON.stringify(value);
+    }
     extractErrorMessage(error) {
         return error instanceof Error ? error.message : 'Unknown error';
     }
@@ -677,7 +716,8 @@ class SmtpProvider {
     }
     // ─── Private Helpers ────────────────────────────────────────────────────────
     formatFrom(from, fromName) {
-        return fromName ? `"${fromName}" <${from}>` : from;
+        if (!from) return undefined;
+        return fromName ? `"${fromName.replace(/["\\]/g, '\\$&')}" <${from}>` : from;
     }
     joinAddresses(addresses) {
         return Array.isArray(addresses) ? addresses.join(', ') : addresses;
@@ -701,8 +741,8 @@ class SmtpProvider {
     }
 }
 
-;// CONCATENATED MODULE: external "@flusys/nestjs-shared/constants"
-
+// EXTERNAL MODULE: external "@flusys/nestjs-shared/constants"
+var constants_ = __webpack_require__(140);
 // EXTERNAL MODULE: external "@flusys/nestjs-shared/utils"
 var utils_ = __webpack_require__(216);
 ;// CONCATENATED MODULE: ./projects/nestjs-email/src/providers/sendgrid-provider.ts
@@ -717,12 +757,13 @@ class SendGridProvider {
         try {
             // Optional peer dependency - loaded at runtime so bundlers don't statically resolve it
             const sgMailModule = await (0,utils_.loadOptionalModule)('@sendgrid/mail');
-            this.sgMail = sgMailModule.default || sgMailModule;
+            const MailService = sgMailModule.MailService ?? sgMailModule.default?.MailService;
+            this.sgMail = MailService ? new MailService() : sgMailModule.default || sgMailModule;
             this.sgMail.setApiKey(config.apiKey);
         } catch  {
             throw new common_.InternalServerErrorException({
                 message: 'SendGrid initialization failed. Install: npm install @sendgrid/mail',
-                messageKey: SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
+                messageKey: constants_.SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
                 messageVariables: {
                     sdk: 'sendgrid'
                 }
@@ -737,7 +778,8 @@ class SendGridProvider {
         try {
             const msg = this.buildMessage(options, true);
             const [response] = await this.sgMail.send(msg);
-            const messageId = response.headers['x-message-id'] || response.headers['X-Message-Id'];
+            const headers = response?.headers ?? {};
+            const messageId = headers['x-message-id'] || headers['X-Message-Id'];
             return {
                 success: true,
                 messageId
@@ -778,7 +820,7 @@ class SendGridProvider {
     buildMessage(options, includeExtras) {
         const msg = {
             to: this.toArray(options.to),
-            from: options.fromName ? {
+            from: options.fromName && options.from ? {
                 email: options.from,
                 name: options.fromName
             } : options.from,
@@ -839,7 +881,7 @@ class MailgunProvider {
         } catch  {
             throw new common_.InternalServerErrorException({
                 message: 'Mailgun initialization failed. Install: npm install mailgun.js form-data',
-                messageKey: SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
+                messageKey: constants_.SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
                 messageVariables: {
                     sdk: 'mailgun'
                 }
@@ -885,7 +927,7 @@ class MailgunProvider {
     // ─── Private Helpers ────────────────────────────────────────────────────────
     buildMessageData(options) {
         const data = {
-            from: options.fromName ? `${options.fromName} <${options.from}>` : options.from,
+            from: options.fromName && options.from ? `"${options.fromName.replace(/["\\]/g, '\\$&')}" <${options.from}>` : options.from,
             to: this.joinAddresses(options.to),
             subject: options.subject
         };
@@ -1075,11 +1117,12 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var _flusys_nestjs_shared_utils__rspack_import_2 = __webpack_require__(216);
 /* import */ var _nestjs_common__rspack_import_3 = __webpack_require__(157);
 /* import */ var typeorm__rspack_import_4 = __webpack_require__(158);
-/* import */ var _config_index_js__rspack_import_8 = __webpack_require__(399);
-/* import */ var _config_index_js__rspack_import_9 = __webpack_require__(887);
+/* import */ var _config_index_js__rspack_import_9 = __webpack_require__(399);
+/* import */ var _config_index_js__rspack_import_10 = __webpack_require__(887);
 /* import */ var _entities_index_js__rspack_import_5 = __webpack_require__(454);
-/* import */ var _email_config_service_js__rspack_import_6 = __webpack_require__(843);
-/* import */ var _email_datasource_provider_js__rspack_import_7 = __webpack_require__(522);
+/* import */ var _utils_company_ownership_util_js__rspack_import_6 = __webpack_require__(561);
+/* import */ var _email_config_service_js__rspack_import_7 = __webpack_require__(843);
+/* import */ var _email_datasource_provider_js__rspack_import_8 = __webpack_require__(522);
 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") {
@@ -1112,18 +1155,25 @@ function _ts_param(paramIndex, decorator) {
 
 
 
+
 class EmailProviderConfigService extends _flusys_nestjs_shared_classes__rspack_import_0.ApiService {
     cacheManager;
     utilsService;
     emailConfig;
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super(_config_index_js__rspack_import_8/* .EMAIL_EVENT_ENTITIES.CONFIG */.y.CONFIG, cacheManager, utilsService, EmailProviderConfigService.name, true, (/* inlined export .EMAIL_EVENT_MODULE */"email"), dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? _entities_index_js__rspack_import_5/* .EmailConfigWithCompany */.Ed : _entities_index_js__rspack_import_5/* .EmailConfig */.pG), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+        super(_config_index_js__rspack_import_9/* .EMAIL_EVENT_ENTITIES.CONFIG */.y.CONFIG, cacheManager, utilsService, EmailProviderConfigService.name, // Rows carry provider credentials (SMTP password, API keys) - keep them out of the shared cache
+        false, (/* inlined export .EMAIL_EVENT_MODULE */"email"), dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? _entities_index_js__rspack_import_5/* .EmailConfigWithCompany */.Ed : _entities_index_js__rspack_import_5/* .EmailConfig */.pG), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+    }
+    async beforeUpdateOperation(dto, user) {
+        await this.assertInUserCompany((Array.isArray(dto) ? dto : [
+            dto
+        ]).map((d)=>d.id), user);
     }
-    async beforeDeleteOperation(dto, _user, _queryRunner) {
+    async beforeDeleteOperation(dto, user, _queryRunner) {
         const ids = Array.isArray(dto.id) ? dto.id : [
             dto.id
         ];
-        await this.ensureDataSourceRepository();
+        await this.assertInUserCompany(ids, user);
         const defaultConfigs = await this.repository.find({
             where: {
                 id: (0,typeorm__rspack_import_4.In)(ids),
@@ -1135,7 +1185,7 @@ class EmailProviderConfigService extends _flusys_nestjs_shared_classes__rspack_i
             const names = defaultConfigs.map((c)=>c.name).join(', ');
             throw new _nestjs_common__rspack_import_3.ForbiddenException({
                 message: `Cannot delete the default email config(s): ${names}. Set another config as default first.`,
-                messageKey: _config_index_js__rspack_import_9/* .EMAIL_CONFIG_MESSAGES.DEFAULT_DELETE_FORBIDDEN */.T6.DEFAULT_DELETE_FORBIDDEN,
+                messageKey: _config_index_js__rspack_import_10/* .EMAIL_CONFIG_MESSAGES.DEFAULT_DELETE_FORBIDDEN */.T6.DEFAULT_DELETE_FORBIDDEN,
                 messageVariables: {
                     names
                 }
@@ -1143,15 +1193,14 @@ class EmailProviderConfigService extends _flusys_nestjs_shared_classes__rspack_i
         }
     }
     async convertSingleDtoToEntity(dto, user) {
-        const entity = {
-            ...dto
-        };
+        await this.ensureDataSourceRepository();
+        const entity = await super.convertSingleDtoToEntity(dto, user);
         if (this.emailConfig.isCompanyFeatureEnabled()) {
             entity.companyId = user?.companyId ?? null;
         }
         return entity;
     }
-    async getSelectQuery(query, _user, select) {
+    async getSelectQuery(query, user, select) {
         if (!select?.length) {
             select = [
                 'id',
@@ -1168,6 +1217,10 @@ class EmailProviderConfigService extends _flusys_nestjs_shared_classes__rspack_i
             if (this.emailConfig.isCompanyFeatureEnabled()) select.push('companyId');
         }
         query.select(select.map((field)=>`${this.entityName}.${field}`));
+        (0,_flusys_nestjs_shared_utils__rspack_import_2.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.emailConfig.isCompanyFeatureEnabled(),
+            entityAlias: this.entityName
+        }, user);
         return {
             query,
             isRaw: false
@@ -1175,10 +1228,6 @@ class EmailProviderConfigService extends _flusys_nestjs_shared_classes__rspack_i
     }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        (0,_flusys_nestjs_shared_utils__rspack_import_2.applyCompanyFilter)(query, {
-            isCompanyFeatureEnabled: this.emailConfig.isCompanyFeatureEnabled(),
-            entityAlias: 'emailConfig'
-        }, user);
         query.orderBy(`${this.entityName}.createdAt`, 'DESC');
         return result;
     }
@@ -1211,6 +1260,10 @@ class EmailProviderConfigService extends _flusys_nestjs_shared_classes__rspack_i
             }
         });
     }
+    async assertInUserCompany(ids, user) {
+        await this.ensureDataSourceRepository();
+        await (0,_utils_company_ownership_util_js__rspack_import_6/* .assertRowsInUserCompany */.p)(this.repository, ids.filter(Boolean), user, this.emailConfig.isCompanyFeatureEnabled(), 'Email configuration');
+    }
 }
 EmailProviderConfigService = _ts_decorate([
     (0,_nestjs_common__rspack_import_3.Injectable)({
@@ -1218,14 +1271,14 @@ EmailProviderConfigService = _ts_decorate([
     }),
     _ts_param(0, (0,_nestjs_common__rspack_import_3.Inject)('CACHE_INSTANCE')),
     _ts_param(1, (0,_nestjs_common__rspack_import_3.Inject)(_flusys_nestjs_shared_modules__rspack_import_1.UtilsService)),
-    _ts_param(2, (0,_nestjs_common__rspack_import_3.Inject)(_email_config_service_js__rspack_import_6/* .EmailConfigService */.m)),
-    _ts_param(3, (0,_nestjs_common__rspack_import_3.Inject)(_email_datasource_provider_js__rspack_import_7/* .EmailDataSourceProvider */.Z)),
+    _ts_param(2, (0,_nestjs_common__rspack_import_3.Inject)(_email_config_service_js__rspack_import_7/* .EmailConfigService */.m)),
+    _ts_param(3, (0,_nestjs_common__rspack_import_3.Inject)(_email_datasource_provider_js__rspack_import_8/* .EmailDataSourceProvider */.Z)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _flusys_nestjs_shared_classes__rspack_import_0.HybridCache === "undefined" ? Object : _flusys_nestjs_shared_classes__rspack_import_0.HybridCache,
         typeof _flusys_nestjs_shared_modules__rspack_import_1.UtilsService === "undefined" ? Object : _flusys_nestjs_shared_modules__rspack_import_1.UtilsService,
-        typeof _email_config_service_js__rspack_import_6/* .EmailConfigService */.m === "undefined" ? Object : _email_config_service_js__rspack_import_6/* .EmailConfigService */.m,
-        typeof _email_datasource_provider_js__rspack_import_7/* .EmailDataSourceProvider */.Z === "undefined" ? Object : _email_datasource_provider_js__rspack_import_7/* .EmailDataSourceProvider */.Z
+        typeof _email_config_service_js__rspack_import_7/* .EmailConfigService */.m === "undefined" ? Object : _email_config_service_js__rspack_import_7/* .EmailConfigService */.m,
+        typeof _email_datasource_provider_js__rspack_import_8/* .EmailDataSourceProvider */.Z === "undefined" ? Object : _email_datasource_provider_js__rspack_import_8/* .EmailDataSourceProvider */.Z
     ])
 ], EmailProviderConfigService);
 
@@ -1244,7 +1297,7 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var _config_index_js__rspack_import_10 = __webpack_require__(399);
 /* import */ var _email_config_service_js__rspack_import_4 = __webpack_require__(843);
 /* import */ var _dtos_index_js__rspack_import_5 = __webpack_require__(684);
-/* import */ var _providers_index_js__rspack_import_6 = __webpack_require__(603);
+/* import */ var _providers_index_js__rspack_import_6 = __webpack_require__(652);
 /* import */ var _email_provider_config_service_js__rspack_import_7 = __webpack_require__(105);
 /* import */ var _email_template_service_js__rspack_import_8 = __webpack_require__(759);
 function _ts_decorate(decorators, target, key, desc) {
@@ -1413,13 +1466,13 @@ class EmailSendService {
                 messageKey: _config_index_js__rspack_import_9/* .EMAIL_SEND_MESSAGES.TEMPLATE_NOT_FOUND */.dP.TEMPLATE_NOT_FOUND
             });
         }
+        (0,_flusys_nestjs_shared_utils__rspack_import_2.validateCompanyOwnership)(template, user, this.emailConfigService.isCompanyFeatureEnabled(), 'Email template');
         if (!template.isActive) {
             throw new _nestjs_common__rspack_import_3.BadRequestException({
                 message: 'Email template is inactive',
                 messageKey: _config_index_js__rspack_import_9/* .EMAIL_SEND_MESSAGES.TEMPLATE_INACTIVE */.dP.TEMPLATE_INACTIVE
             });
         }
-        (0,_flusys_nestjs_shared_utils__rspack_import_2.validateCompanyOwnership)(template, user, this.emailConfigService.isCompanyFeatureEnabled(), 'Email template');
         return template;
     }
     buildTemplateContent(template, variables) {
@@ -1456,7 +1509,11 @@ class EmailSendService {
         if (!variables || Object.keys(variables).length === 0) return content;
         const safeVars = escapeHtml ? (0,_flusys_nestjs_shared_utils__rspack_import_2.escapeHtmlVariables)(variables) : variables;
         return content.replace(VARIABLE_PATTERN, (match, varName)=>{
-            return varName in safeVars && safeVars[varName] !== undefined ? String(safeVars[varName]) : match;
+            if (!Object.hasOwn(safeVars, varName)) return match;
+            const value = safeVars[varName];
+            if (value === undefined) return match;
+            if (value === null) return '';
+            return typeof value === 'object' ? JSON.stringify(value) : String(value);
         });
     }
     buildTestEmailHtml(safeConfig) {
@@ -1559,10 +1616,11 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var _flusys_nestjs_shared_modules__rspack_import_1 = __webpack_require__(236);
 /* import */ var _flusys_nestjs_shared_utils__rspack_import_2 = __webpack_require__(216);
 /* import */ var _nestjs_common__rspack_import_3 = __webpack_require__(157);
-/* import */ var _config_index_js__rspack_import_7 = __webpack_require__(399);
+/* import */ var _config_index_js__rspack_import_8 = __webpack_require__(399);
 /* import */ var _entities_index_js__rspack_import_4 = __webpack_require__(454);
-/* import */ var _email_config_service_js__rspack_import_5 = __webpack_require__(843);
-/* import */ var _email_datasource_provider_js__rspack_import_6 = __webpack_require__(522);
+/* import */ var _utils_company_ownership_util_js__rspack_import_5 = __webpack_require__(561);
+/* import */ var _email_config_service_js__rspack_import_6 = __webpack_require__(843);
+/* import */ var _email_datasource_provider_js__rspack_import_7 = __webpack_require__(522);
 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") {
@@ -1594,6 +1652,7 @@ function _ts_param(paramIndex, decorator) {
 
 
 
+
 const DEFAULT_SELECT_FIELDS = [
     'id',
     'name',
@@ -1614,7 +1673,17 @@ class EmailTemplateService extends _flusys_nestjs_shared_classes__rspack_import_
     utilsService;
     emailConfig;
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super(_config_index_js__rspack_import_7/* .EMAIL_EVENT_ENTITIES.TEMPLATE */.y.TEMPLATE, cacheManager, utilsService, EmailTemplateService.name, true, (/* inlined export .EMAIL_EVENT_MODULE */"email"), dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? _entities_index_js__rspack_import_4/* .EmailTemplateWithCompany */.U7 : _entities_index_js__rspack_import_4/* .EmailTemplate */.Fy), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+        super(_config_index_js__rspack_import_8/* .EMAIL_EVENT_ENTITIES.TEMPLATE */.y.TEMPLATE, cacheManager, utilsService, EmailTemplateService.name, true, (/* inlined export .EMAIL_EVENT_MODULE */"email"), dataSourceProvider, emailConfig.isCompanyFeatureEnabled() ? _entities_index_js__rspack_import_4/* .EmailTemplateWithCompany */.U7 : _entities_index_js__rspack_import_4/* .EmailTemplate */.Fy), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
+    }
+    async beforeUpdateOperation(dto, user) {
+        await this.assertInUserCompany((Array.isArray(dto) ? dto : [
+            dto
+        ]).map((d)=>d.id), user);
+    }
+    async beforeDeleteOperation(dto, user, _queryRunner) {
+        await this.assertInUserCompany(Array.isArray(dto.id) ? dto.id : [
+            dto.id
+        ], user);
     }
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -1624,7 +1693,7 @@ class EmailTemplateService extends _flusys_nestjs_shared_classes__rspack_import_
         }
         return entity;
     }
-    async getSelectQuery(query, _user, select) {
+    async getSelectQuery(query, user, select) {
         if (!select?.length) {
             select = [
                 ...DEFAULT_SELECT_FIELDS
@@ -1632,6 +1701,10 @@ class EmailTemplateService extends _flusys_nestjs_shared_classes__rspack_import_
             if (this.emailConfig.isCompanyFeatureEnabled()) select.push('companyId');
         }
         query.select(select.map((field)=>`${this.entityName}.${field}`));
+        (0,_flusys_nestjs_shared_utils__rspack_import_2.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.emailConfig.isCompanyFeatureEnabled(),
+            entityAlias: this.entityName
+        }, user);
         return {
             query,
             isRaw: false
@@ -1639,10 +1712,6 @@ class EmailTemplateService extends _flusys_nestjs_shared_classes__rspack_import_
     }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        (0,_flusys_nestjs_shared_utils__rspack_import_2.applyCompanyFilter)(query, {
-            isCompanyFeatureEnabled: this.emailConfig.isCompanyFeatureEnabled(),
-            entityAlias: 'emailTemplate'
-        }, user);
         query.orderBy(`${this.entityName}.createdAt`, 'DESC');
         return result;
     }
@@ -1666,6 +1735,10 @@ class EmailTemplateService extends _flusys_nestjs_shared_classes__rspack_import_
         });
     }
     // ─── Private Helpers ────────────────────────────────────────────────────────
+    async assertInUserCompany(ids, user) {
+        await this.ensureDataSourceRepository();
+        await (0,_utils_company_ownership_util_js__rspack_import_5/* .assertRowsInUserCompany */.p)(this.repository, ids.filter(Boolean), user, this.emailConfig.isCompanyFeatureEnabled(), 'Email template');
+    }
     async incrementSchemaVersionIfChanged(dto, entity) {
         const updateDto = dto;
         if (!updateDto.id || !dto.schema) return;
@@ -1686,14 +1759,14 @@ EmailTemplateService = _ts_decorate([
     }),
     _ts_param(0, (0,_nestjs_common__rspack_import_3.Inject)('CACHE_INSTANCE')),
     _ts_param(1, (0,_nestjs_common__rspack_import_3.Inject)(_flusys_nestjs_shared_modules__rspack_import_1.UtilsService)),
-    _ts_param(2, (0,_nestjs_common__rspack_import_3.Inject)(_email_config_service_js__rspack_import_5/* .EmailConfigService */.m)),
-    _ts_param(3, (0,_nestjs_common__rspack_import_3.Inject)(_email_datasource_provider_js__rspack_import_6/* .EmailDataSourceProvider */.Z)),
+    _ts_param(2, (0,_nestjs_common__rspack_import_3.Inject)(_email_config_service_js__rspack_import_6/* .EmailConfigService */.m)),
+    _ts_param(3, (0,_nestjs_common__rspack_import_3.Inject)(_email_datasource_provider_js__rspack_import_7/* .EmailDataSourceProvider */.Z)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _flusys_nestjs_shared_classes__rspack_import_0.HybridCache === "undefined" ? Object : _flusys_nestjs_shared_classes__rspack_import_0.HybridCache,
         typeof _flusys_nestjs_shared_modules__rspack_import_1.UtilsService === "undefined" ? Object : _flusys_nestjs_shared_modules__rspack_import_1.UtilsService,
-        typeof _email_config_service_js__rspack_import_5/* .EmailConfigService */.m === "undefined" ? Object : _email_config_service_js__rspack_import_5/* .EmailConfigService */.m,
-        typeof _email_datasource_provider_js__rspack_import_6/* .EmailDataSourceProvider */.Z === "undefined" ? Object : _email_datasource_provider_js__rspack_import_6/* .EmailDataSourceProvider */.Z
+        typeof _email_config_service_js__rspack_import_6/* .EmailConfigService */.m === "undefined" ? Object : _email_config_service_js__rspack_import_6/* .EmailConfigService */.m,
+        typeof _email_datasource_provider_js__rspack_import_7/* .EmailDataSourceProvider */.Z === "undefined" ? Object : _email_datasource_provider_js__rspack_import_7/* .EmailDataSourceProvider */.Z
     ])
 ], EmailTemplateService);
 
@@ -1702,6 +1775,43 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 
+},
+561(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+/* import */ var _flusys_nestjs_shared_constants__rspack_import_0 = __webpack_require__(140);
+/* import */ var _nestjs_common__rspack_import_1 = __webpack_require__(157);
+/* import */ var typeorm__rspack_import_2 = __webpack_require__(158);
+
+
+
+/**
+ * ApiService write paths load rows by id alone, so a caller could update or delete another company's
+ * row by its id. Every row must belong to the caller's company - a caller without a company may only
+ * touch rows without one.
+ */ async function assertRowsInUserCompany(repository, ids, user, isCompanyFeatureEnabled, entityName) {
+    if (!isCompanyFeatureEnabled || !user || !ids.length) return;
+    const rows = await repository.find({
+        where: {
+            id: (0,typeorm__rspack_import_2.In)(ids)
+        },
+        withDeleted: true
+    });
+    const userCompanyId = user.companyId ?? null;
+    if (rows.some((row)=>(row.companyId ?? null) !== userCompanyId)) {
+        throw new _nestjs_common__rspack_import_1.ForbiddenException({
+            message: `${entityName} belongs to another company`,
+            messageKey: _flusys_nestjs_shared_constants__rspack_import_0.AUTH_MESSAGES.ENTITY_BELOG_ANOTHER_COMPANY,
+            messageVariables: {
+                entity: entityName
+            }
+        });
+    }
+}
+
+__webpack_require__.d(__webpack_exports__, {
+  p: () => (assertRowsInUserCompany)
+});
+
+
 },
 422(module) {
 
@@ -1714,6 +1824,12 @@ module.exports = __rspack_external__flusys_nestjs_shared_393d2cae;
 module.exports = __rspack_external__flusys_nestjs_shared_classes_6076a329;
 
 
+},
+140(module) {
+
+module.exports = __rspack_external__flusys_nestjs_shared_constants_81f33d5b;
+
+
 },
 236(module) {
 

package/fesm/261.js

@@ -1,6 +1,6 @@
 import { IdentityResponseDto } from "@flusys/nestjs-shared/dtos";
 import { Expose, Type } from "class-transformer";
-import { IsArray, IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, IsUUID, MaxLength, ValidateNested, ValidatorConstraint, registerDecorator } from "class-validator";
+import { IsArray, IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, IsUUID, MaxLength, ValidateIf, ValidateNested, ValidatorConstraint, registerDecorator } from "class-validator";
 import * as __rspack_external__nestjs_swagger_7cd450b5 from "@nestjs/swagger";
 export const __rspack_esm_id = 261;
 export const __rspack_esm_ids = [261];
@@ -692,7 +692,7 @@ email_send_dto_ts_decorate([
         description: 'Template ID (required if templateSlug not provided)'
     }),
     IsUUID(),
-    IsOptional(),
+    ValidateIf((dto)=>dto.templateId != null || !dto.templateSlug),
     RequireTemplateIdOrSlug({
         message: 'Either templateId or templateSlug must be provided'
     }),

package/fesm/index.js

@@ -552,8 +552,8 @@ var config = __webpack_require__(249);
 var dtos = __webpack_require__(684);
 // EXTERNAL MODULE: ./projects/nestjs-email/src/enums/index.ts
 var enums = __webpack_require__(315);
-// EXTERNAL MODULE: ./projects/nestjs-email/src/providers/index.ts + 7 modules
-var providers = __webpack_require__(603);
+// EXTERNAL MODULE: ./projects/nestjs-email/src/providers/index.ts + 6 modules
+var providers = __webpack_require__(652);
 // EXTERNAL MODULE: external "@flusys/nestjs-shared/utils"
 var utils_ = __webpack_require__(216);
 ;// CONCATENATED MODULE: ./projects/nestjs-email/src/utils/email-templates.util.ts
@@ -654,8 +654,8 @@ var email_constants = __webpack_require__(966);
 var controllers = __webpack_require__(574);
 // EXTERNAL MODULE: ./projects/nestjs-email/src/enums/email-provider-type.enum.ts
 var email_provider_type_enum = __webpack_require__(823);
-// EXTERNAL MODULE: ./projects/nestjs-email/src/providers/index.ts + 7 modules
-var src_providers = __webpack_require__(603);
+// EXTERNAL MODULE: ./projects/nestjs-email/src/providers/index.ts + 6 modules
+var src_providers = __webpack_require__(652);
 // EXTERNAL MODULE: ./projects/nestjs-email/src/services/index.ts
 var services = __webpack_require__(95);
 ;// CONCATENATED MODULE: ./projects/nestjs-email/src/modules/email.module.ts

package/fesm/modules/index.js

@@ -473,8 +473,8 @@ var email_constants = __webpack_require__(966);
 var controllers = __webpack_require__(574);
 // EXTERNAL MODULE: ./projects/nestjs-email/src/enums/email-provider-type.enum.ts
 var email_provider_type_enum = __webpack_require__(823);
-// EXTERNAL MODULE: ./projects/nestjs-email/src/providers/index.ts + 7 modules
-var src_providers = __webpack_require__(603);
+// EXTERNAL MODULE: ./projects/nestjs-email/src/providers/index.ts + 6 modules
+var src_providers = __webpack_require__(652);
 // EXTERNAL MODULE: ./projects/nestjs-email/src/services/index.ts
 var services = __webpack_require__(95);
 ;// CONCATENATED MODULE: ./projects/nestjs-email/src/modules/email.module.ts

package/fesm/providers/index.js

@@ -1,6 +1,6 @@
 import { createHash } from "crypto";
-import { SYSTEM_MESSAGES } from "@flusys/nestjs-shared/constants";
 import * as __rspack_external__flusys_nestjs_shared_393d2cae from "@flusys/nestjs-shared";
+import * as __rspack_external__flusys_nestjs_shared_constants_81f33d5b from "@flusys/nestjs-shared/constants";
 import * as __rspack_external__flusys_nestjs_shared_utils_9125c1f1 from "@flusys/nestjs-shared/utils";
 import * as __rspack_external__nestjs_common_a04939da from "@nestjs/common";
 export const __rspack_esm_id = 467;
@@ -35,7 +35,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 
 },
-603(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+652(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
@@ -98,13 +98,21 @@ function _ts_metadata(metadataKey, metadataValue) {
 
 
 
+const MAX_CACHED_PROVIDERS = 50;
+const PROVIDER_IDLE_TTL_MS = 30 * 60 * 1000;
 class EmailFactoryService {
     providerCache = new Map();
     // ─── Public API ─────────────────────────────────────────────────────────────
     async createProvider(config) {
         const cacheKey = this.generateCacheKey(config);
+        const now = Date.now();
         const cached = this.providerCache.get(cacheKey);
-        if (cached) return cached;
+        if (cached) {
+            cached.lastUsed = now;
+            this.providerCache.delete(cacheKey);
+            this.providerCache.set(cacheKey, cached);
+            return cached.provider;
+        }
         const ProviderClass = EmailProviderRegistry.get(config.provider);
         if (!ProviderClass) {
             throw new common_.NotFoundException({
@@ -116,10 +124,32 @@ class EmailFactoryService {
                 }
             });
         }
+        // The pending promise is cached so concurrent first sends share one client (one SMTP transport)
+        const entry = {
+            provider: this.instantiate(ProviderClass, config),
+            lastUsed: now
+        };
+        this.providerCache.set(cacheKey, entry);
+        entry.provider.catch(()=>{
+            if (this.providerCache.get(cacheKey) === entry) this.providerCache.delete(cacheKey);
+        });
+        this.evict(now);
+        return entry.provider;
+    }
+    async clearCache() {
+        const entries = Array.from(this.providerCache.values());
+        this.providerCache.clear();
+        await Promise.allSettled(entries.map((entry)=>this.closeEntry(entry)));
+    }
+    // ─── Lifecycle ──────────────────────────────────────────────────────────────
+    async onModuleDestroy() {
+        await this.clearCache();
+    }
+    // ─── Private Helpers ────────────────────────────────────────────────────────
+    async instantiate(ProviderClass, config) {
         try {
             const instance = new ProviderClass();
             await instance.initialize?.(config.config);
-            this.providerCache.set(cacheKey, instance);
             return instance;
         } catch (error) {
             throw new common_.InternalServerErrorException({
@@ -132,26 +162,35 @@ class EmailFactoryService {
             });
         }
     }
-    // ─── Lifecycle ──────────────────────────────────────────────────────────────
-    async onModuleDestroy() {
-        const closePromises = Array.from(this.providerCache.entries()).map(([, provider])=>this.closeProvider(provider));
-        await Promise.allSettled(closePromises);
-        this.providerCache.clear();
-    }
-    // ─── Private Helpers ────────────────────────────────────────────────────────
-    generateCacheKey(config) {
-        const sortedKeys = Object.keys(config.config || {}).sort();
-        const configString = JSON.stringify(config.config, sortedKeys);
-        const hash = createHash('sha256').update(configString).digest('hex').substring(0, 16);
-        return `${config.provider}-${hash}`;
+    evict(now) {
+        for (const [key, entry] of this.providerCache){
+            const overCapacity = this.providerCache.size > MAX_CACHED_PROVIDERS;
+            if (!overCapacity && now - entry.lastUsed < PROVIDER_IDLE_TTL_MS) continue;
+            this.providerCache.delete(key);
+            void this.closeEntry(entry);
+        }
     }
-    async closeProvider(provider) {
-        if (!provider.close) return;
+    async closeEntry(entry) {
         try {
-            await provider.close();
+            const provider = await entry.provider;
+            await provider.close?.();
         } catch  {
-        // Silent failure
+        // A client that failed to initialize or to close has nothing left to release
+        }
+    }
+    generateCacheKey(config) {
+        const hash = createHash('sha256').update(this.stableStringify(config.config ?? {})).digest('hex');
+        return `${config.provider}:${hash}`;
+    }
+    stableStringify(value) {
+        if (value === null || value === undefined) return 'null';
+        if (Array.isArray(value)) return `[${value.map((item)=>this.stableStringify(item)).join(',')}]`;
+        if (typeof value === 'object') {
+            const record = value;
+            const entries = Object.keys(record).filter((key)=>record[key] !== undefined).sort().map((key)=>`${JSON.stringify(key)}:${this.stableStringify(record[key])}`);
+            return `{${entries.join(',')}}`;
         }
+        return JSON.stringify(value);
     }
     extractErrorMessage(error) {
         return error instanceof Error ? error.message : 'Unknown error';
@@ -248,7 +287,8 @@ class SmtpProvider {
     }
     // ─── Private Helpers ────────────────────────────────────────────────────────
     formatFrom(from, fromName) {
-        return fromName ? `"${fromName}" <${from}>` : from;
+        if (!from) return undefined;
+        return fromName ? `"${fromName.replace(/["\\]/g, '\\$&')}" <${from}>` : from;
     }
     joinAddresses(addresses) {
         return Array.isArray(addresses) ? addresses.join(', ') : addresses;
@@ -272,8 +312,8 @@ class SmtpProvider {
     }
 }
 
-;// CONCATENATED MODULE: external "@flusys/nestjs-shared/constants"
-
+// EXTERNAL MODULE: external "@flusys/nestjs-shared/constants"
+var constants_ = __webpack_require__(140);
 // EXTERNAL MODULE: external "@flusys/nestjs-shared/utils"
 var utils_ = __webpack_require__(216);
 ;// CONCATENATED MODULE: ./projects/nestjs-email/src/providers/sendgrid-provider.ts
@@ -288,12 +328,13 @@ class SendGridProvider {
         try {
             // Optional peer dependency - loaded at runtime so bundlers don't statically resolve it
             const sgMailModule = await (0,utils_.loadOptionalModule)('@sendgrid/mail');
-            this.sgMail = sgMailModule.default || sgMailModule;
+            const MailService = sgMailModule.MailService ?? sgMailModule.default?.MailService;
+            this.sgMail = MailService ? new MailService() : sgMailModule.default || sgMailModule;
             this.sgMail.setApiKey(config.apiKey);
         } catch  {
             throw new common_.InternalServerErrorException({
                 message: 'SendGrid initialization failed. Install: npm install @sendgrid/mail',
-                messageKey: SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
+                messageKey: constants_.SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
                 messageVariables: {
                     sdk: 'sendgrid'
                 }
@@ -308,7 +349,8 @@ class SendGridProvider {
         try {
             const msg = this.buildMessage(options, true);
             const [response] = await this.sgMail.send(msg);
-            const messageId = response.headers['x-message-id'] || response.headers['X-Message-Id'];
+            const headers = response?.headers ?? {};
+            const messageId = headers['x-message-id'] || headers['X-Message-Id'];
             return {
                 success: true,
                 messageId
@@ -349,7 +391,7 @@ class SendGridProvider {
     buildMessage(options, includeExtras) {
         const msg = {
             to: this.toArray(options.to),
-            from: options.fromName ? {
+            from: options.fromName && options.from ? {
                 email: options.from,
                 name: options.fromName
             } : options.from,
@@ -410,7 +452,7 @@ class MailgunProvider {
         } catch  {
             throw new common_.InternalServerErrorException({
                 message: 'Mailgun initialization failed. Install: npm install mailgun.js form-data',
-                messageKey: SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
+                messageKey: constants_.SYSTEM_MESSAGES.SDK_NOT_INSTALLED,
                 messageVariables: {
                     sdk: 'mailgun'
                 }
@@ -456,7 +498,7 @@ class MailgunProvider {
     // ─── Private Helpers ────────────────────────────────────────────────────────
     buildMessageData(options) {
         const data = {
-            from: options.fromName ? `${options.fromName} <${options.from}>` : options.from,
+            from: options.fromName && options.from ? `"${options.fromName.replace(/["\\]/g, '\\$&')}" <${options.from}>` : options.from,
             to: this.joinAddresses(options.to),
             subject: options.subject
         };
@@ -496,6 +538,12 @@ class MailgunProvider {
 module.exports = __rspack_external__flusys_nestjs_shared_393d2cae;
 
 
+},
+140(module) {
+
+module.exports = __rspack_external__flusys_nestjs_shared_constants_81f33d5b;
+
+
 },
 216(module) {
 
@@ -515,7 +563,7 @@ import { __webpack_require__ } from '../runtime.js';
 var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId); }
 import * as __rspack_chunk_1 from './index.js';
 __webpack_require__.C(__rspack_chunk_1);
-var __webpack_exports__ = __webpack_exec__(603);var __webpack_exports__EmailFactoryService = __webpack_exports__.c;
+var __webpack_exports__ = __webpack_exec__(652);var __webpack_exports__EmailFactoryService = __webpack_exports__.c;
 var __webpack_exports__EmailProviderRegistry = __webpack_exports__.xC;
 var __webpack_exports__MailgunProvider = __webpack_exports__.Xp;
 var __webpack_exports__SendGridProvider = __webpack_exports__.Iw;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-email",
-  "version": "9.1.2",
+  "version": "9.2.1",
   "description": "Modular email package with SMTP, SendGrid, and Mailgun providers",
   "type": "module",
   "main": "./fesm/index.js",
@@ -98,7 +98,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "9.1.2",
-    "@flusys/nestjs-shared": "9.1.2"
+    "@flusys/nestjs-core": "9.2.1",
+    "@flusys/nestjs-shared": "9.2.1"
   }
 }

package/providers/email-factory.service.d.ts

@@ -3,8 +3,12 @@ import { type IEmailProvider, type IEmailProviderConfig } from '../interfaces/in
 export declare class EmailFactoryService implements OnModuleDestroy {
     private readonly providerCache;
     createProvider(config: IEmailProviderConfig): Promise<IEmailProvider>;
+    clearCache(): Promise<void>;
     onModuleDestroy(): Promise<void>;
+    private instantiate;
+    private evict;
+    private closeEntry;
     private generateCacheKey;
-    private closeProvider;
+    private stableStringify;
     private extractErrorMessage;
 }

package/services/email-provider-config.service.d.ts

@@ -13,9 +13,10 @@ export declare class EmailProviderConfigService extends ApiService<CreateEmailCo
     protected utilsService: UtilsService;
     private readonly emailConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, emailConfig: EmailConfigService, dataSourceProvider: EmailDataSourceProvider);
-    protected beforeDeleteOperation(dto: DeleteDto, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
+    protected beforeUpdateOperation(dto: UpdateEmailConfigDto | UpdateEmailConfigDto[], user: ILoggedUserInfo | null): Promise<void>;
+    protected beforeDeleteOperation(dto: DeleteDto, user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     convertSingleDtoToEntity(dto: CreateEmailConfigDto | UpdateEmailConfigDto, user: ILoggedUserInfo | null): Promise<EmailConfigBase>;
-    getSelectQuery(query: SelectQueryBuilder<EmailConfigBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
+    getSelectQuery(query: SelectQueryBuilder<EmailConfigBase>, user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<EmailConfig>;
         isRaw: boolean;
     }>;
@@ -25,4 +26,5 @@ export declare class EmailProviderConfigService extends ApiService<CreateEmailCo
     }>;
     findByIdDirect(id: string): Promise<EmailConfigBase | null>;
     getDefaultConfig(user?: ILoggedUserInfo): Promise<EmailConfigBase | null>;
+    private assertInUserCompany;
 }

package/services/email-template.service.d.ts

@@ -1,8 +1,8 @@
 import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
-import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
+import { DeleteDto, FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { type ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { SelectQueryBuilder } from 'typeorm';
+import { type QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CreateEmailTemplateDto, UpdateEmailTemplateDto } from '../dtos/index.js';
 import { EmailTemplate, EmailTemplateBase } from '../entities/index.js';
 import { type IEmailTemplate } from '../interfaces/index.js';
@@ -13,8 +13,10 @@ export declare class EmailTemplateService extends ApiService<CreateEmailTemplate
     protected utilsService: UtilsService;
     private readonly emailConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, emailConfig: EmailConfigService, dataSourceProvider: EmailDataSourceProvider);
+    protected beforeUpdateOperation(dto: UpdateEmailTemplateDto | UpdateEmailTemplateDto[], user: ILoggedUserInfo | null): Promise<void>;
+    protected beforeDeleteOperation(dto: DeleteDto, user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     convertSingleDtoToEntity(dto: CreateEmailTemplateDto | UpdateEmailTemplateDto, user: ILoggedUserInfo | null): Promise<EmailTemplateBase>;
-    getSelectQuery(query: SelectQueryBuilder<EmailTemplateBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
+    getSelectQuery(query: SelectQueryBuilder<EmailTemplateBase>, user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<EmailTemplate>;
         isRaw: boolean;
     }>;
@@ -24,5 +26,6 @@ export declare class EmailTemplateService extends ApiService<CreateEmailTemplate
     }>;
     findByIdDirect(id: string): Promise<EmailTemplateBase | null>;
     findBySlug(slug: string, user?: ILoggedUserInfo): Promise<EmailTemplateBase | null>;
+    private assertInUserCompany;
     private incrementSchemaVersionIfChanged;
 }

package/utils/company-ownership.util.d.ts

@@ -0,0 +1,3 @@
+import { type ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
+import { type ObjectLiteral, type Repository } from 'typeorm';
+export declare function assertRowsInUserCompany<T extends ObjectLiteral>(repository: Repository<T>, ids: string[], user: ILoggedUserInfo | null | undefined, isCompanyFeatureEnabled: boolean, entityName: string): Promise<void>;