@webiny/api-mailer 0.0.0-unstable.6f45466a1d → 0.0.0-unstable.7be00a75a9

package/features/SaveSettings/SaveSettingsUseCase.js

@@ -1,51 +1,51 @@
 import { Result } from "@webiny/feature/api";
-import { EventPublisher } from "@webiny/api-core/features/EventPublisher";
-import { SaveSettingsUseCase, SaveSettingsRepository } from "./abstractions.js";
-import { MailerSettingsBeforeSaveEvent, MailerSettingsAfterSaveEvent } from "./events.js";
+import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
+import { SaveSettingsRepository, SaveSettingsUseCase } from "./abstractions.js";
+import { MailerSettingsAfterSaveEvent, MailerSettingsBeforeSaveEvent } from "./events.js";
 import { saveValidation } from "./validation.js";
-import { SettingsValidationError, SettingsPersistenceError, SettingsNotAuthorized } from "../../domain/errors.js";
+import { SettingsLockedByCode, SettingsNotAuthorized, SettingsPersistenceError, SettingsValidationError } from "../../domain/errors.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { CodeMailerSettings } from "../../domain/CodeMailerSettings/abstractions.js";
+import { ActiveTransport } from "../../domain/MailTransport/abstractions.js";
 class SaveSettingsUseCaseImpl {
-  constructor(identityContext, eventPublisher, repository) {
-    this.identityContext = identityContext;
-    this.eventPublisher = eventPublisher;
-    this.repository = repository;
-  }
-  async execute(input) {
-    const permission = await this.identityContext.getPermission("mailer.settings");
-    if (!permission) {
-      return Result.fail(new SettingsNotAuthorized());
+    constructor(identityContext, eventPublisher, repository, codeSettings, activeTransport){
+        this.identityContext = identityContext;
+        this.eventPublisher = eventPublisher;
+        this.repository = repository;
+        this.codeSettings = codeSettings;
+        this.activeTransport = activeTransport;
     }
-
-    // Validate input
-    const validationResult = saveValidation.safeParse(input);
-    if (!validationResult.success) {
-      return Result.fail(new SettingsValidationError(validationResult.error.errors));
+    async execute(input) {
+        const permission = await this.identityContext.getPermission("mailer.settings");
+        if (!permission) return Result.fail(new SettingsNotAuthorized());
+        const validationResult = saveValidation.safeParse(input);
+        if (!validationResult.success) return Result.fail(new SettingsValidationError(validationResult.error.issues));
+        const transportName = this.activeTransport.name();
+        if (transportName && null !== this.codeSettings.get(transportName)) return Result.fail(new SettingsLockedByCode());
+        const { password: _beforePassword, ...inputForEvent } = input;
+        const beforeSaveEvent = new MailerSettingsBeforeSaveEvent({
+            input: inputForEvent
+        });
+        await this.eventPublisher.publish(beforeSaveEvent);
+        const result = await this.repository.execute(input);
+        if (result.isFail()) return Result.fail(new SettingsPersistenceError(result.error));
+        const afterSaveEvent = new MailerSettingsAfterSaveEvent({
+            settings: result.value
+        });
+        await this.eventPublisher.publish(afterSaveEvent);
+        return result;
     }
-
-    // Publish before save event
-    const beforeSaveEvent = new MailerSettingsBeforeSaveEvent({
-      input
-    });
-    await this.eventPublisher.publish(beforeSaveEvent);
-
-    // Save settings
-    const result = await this.repository.execute(input);
-    if (result.isFail()) {
-      return Result.fail(new SettingsPersistenceError(result.error));
-    }
-
-    // Publish after save event
-    const afterSaveEvent = new MailerSettingsAfterSaveEvent({
-      settings: result.value
-    });
-    await this.eventPublisher.publish(afterSaveEvent);
-    return result;
-  }
 }
-export const SaveSettingsUseCaseImplementation = SaveSettingsUseCase.createImplementation({
-  implementation: SaveSettingsUseCaseImpl,
-  dependencies: [IdentityContext, EventPublisher, SaveSettingsRepository]
+const SaveSettingsUseCaseImplementation = SaveSettingsUseCase.createImplementation({
+    implementation: SaveSettingsUseCaseImpl,
+    dependencies: [
+        IdentityContext,
+        EventPublisher,
+        SaveSettingsRepository,
+        CodeMailerSettings,
+        ActiveTransport
+    ]
 });
+export { SaveSettingsUseCaseImplementation };
 
 //# sourceMappingURL=SaveSettingsUseCase.js.map

package/features/SaveSettings/SaveSettingsUseCase.js.map

@@ -1 +1 @@
-{"version":3,"names":["Result","EventPublisher","SaveSettingsUseCase","SaveSettingsRepository","MailerSettingsBeforeSaveEvent","MailerSettingsAfterSaveEvent","saveValidation","SettingsValidationError","SettingsPersistenceError","SettingsNotAuthorized","IdentityContext","SaveSettingsUseCaseImpl","constructor","identityContext","eventPublisher","repository","execute","input","permission","getPermission","fail","validationResult","safeParse","success","error","errors","beforeSaveEvent","publish","result","isFail","afterSaveEvent","settings","value","SaveSettingsUseCaseImplementation","createImplementation","implementation","dependencies"],"sources":["SaveSettingsUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    EventPublisher,\n    EventPublisher as EventPublisherAbstraction\n} from \"@webiny/api-core/features/EventPublisher\";\nimport {\n    SaveSettingsUseCase,\n    SaveSettingsRepository,\n    type SaveSettingsInput\n} from \"./abstractions.js\";\nimport { MailerSettingsBeforeSaveEvent, MailerSettingsAfterSaveEvent } from \"./events.js\";\nimport { saveValidation } from \"./validation.js\";\nimport {\n    SettingsValidationError,\n    SettingsPersistenceError,\n    SettingsNotAuthorized\n} from \"~/domain/errors.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\n\nclass SaveSettingsUseCaseImpl implements SaveSettingsUseCase.Interface {\n    constructor(\n        private identityContext: IdentityContext.Interface,\n        private eventPublisher: EventPublisherAbstraction.Interface,\n        private repository: SaveSettingsRepository.Interface\n    ) {}\n\n    async execute(input: SaveSettingsInput): SaveSettingsUseCase.Return {\n        const permission = await this.identityContext.getPermission(\"mailer.settings\");\n\n        if (!permission) {\n            return Result.fail(new SettingsNotAuthorized());\n        }\n\n        // Validate input\n        const validationResult = saveValidation.safeParse(input);\n        if (!validationResult.success) {\n            return Result.fail(new SettingsValidationError(validationResult.error.errors));\n        }\n\n        // Publish before save event\n        const beforeSaveEvent = new MailerSettingsBeforeSaveEvent({ input });\n        await this.eventPublisher.publish(beforeSaveEvent);\n\n        // Save settings\n        const result = await this.repository.execute(input);\n\n        if (result.isFail()) {\n            return Result.fail(new SettingsPersistenceError(result.error));\n        }\n\n        // Publish after save event\n        const afterSaveEvent = new MailerSettingsAfterSaveEvent({ settings: result.value });\n        await this.eventPublisher.publish(afterSaveEvent);\n\n        return result;\n    }\n}\n\nexport const SaveSettingsUseCaseImplementation = SaveSettingsUseCase.createImplementation({\n    implementation: SaveSettingsUseCaseImpl,\n    dependencies: [IdentityContext, EventPublisher, SaveSettingsRepository]\n});\n"],"mappings":"AAAA,SAASA,MAAM,QAAQ,qBAAqB;AAC5C,SACIC,cAAc,QAEX,0CAA0C;AACjD,SACIC,mBAAmB,EACnBC,sBAAsB;AAG1B,SAASC,6BAA6B,EAAEC,4BAA4B;AACpE,SAASC,cAAc;AACvB,SACIC,uBAAuB,EACvBC,wBAAwB,EACxBC,qBAAqB;AAEzB,SAASC,eAAe,QAAQ,6DAA6D;AAE7F,MAAMC,uBAAuB,CAA0C;EACnEC,WAAWA,CACCC,eAA0C,EAC1CC,cAAmD,EACnDC,UAA4C,EACtD;IAAA,KAHUF,eAA0C,GAA1CA,eAA0C;IAAA,KAC1CC,cAAmD,GAAnDA,cAAmD;IAAA,KACnDC,UAA4C,GAA5CA,UAA4C;EACrD;EAEH,MAAMC,OAAOA,CAACC,KAAwB,EAA8B;IAChE,MAAMC,UAAU,GAAG,MAAM,IAAI,CAACL,eAAe,CAACM,aAAa,CAAC,iBAAiB,CAAC;IAE9E,IAAI,CAACD,UAAU,EAAE;MACb,OAAOlB,MAAM,CAACoB,IAAI,CAAC,IAAIX,qBAAqB,CAAC,CAAC,CAAC;IACnD;;IAEA;IACA,MAAMY,gBAAgB,GAAGf,cAAc,CAACgB,SAAS,CAACL,KAAK,CAAC;IACxD,IAAI,CAACI,gBAAgB,CAACE,OAAO,EAAE;MAC3B,OAAOvB,MAAM,CAACoB,IAAI,CAAC,IAAIb,uBAAuB,CAACc,gBAAgB,CAACG,KAAK,CAACC,MAAM,CAAC,CAAC;IAClF;;IAEA;IACA,MAAMC,eAAe,GAAG,IAAItB,6BAA6B,CAAC;MAAEa;IAAM,CAAC,CAAC;IACpE,MAAM,IAAI,CAACH,cAAc,CAACa,OAAO,CAACD,eAAe,CAAC;;IAElD;IACA,MAAME,MAAM,GAAG,MAAM,IAAI,CAACb,UAAU,CAACC,OAAO,CAACC,KAAK,CAAC;IAEnD,IAAIW,MAAM,CAACC,MAAM,CAAC,CAAC,EAAE;MACjB,OAAO7B,MAAM,CAACoB,IAAI,CAAC,IAAIZ,wBAAwB,CAACoB,MAAM,CAACJ,KAAK,CAAC,CAAC;IAClE;;IAEA;IACA,MAAMM,cAAc,GAAG,IAAIzB,4BAA4B,CAAC;MAAE0B,QAAQ,EAAEH,MAAM,CAACI;IAAM,CAAC,CAAC;IACnF,MAAM,IAAI,CAAClB,cAAc,CAACa,OAAO,CAACG,cAAc,CAAC;IAEjD,OAAOF,MAAM;EACjB;AACJ;AAEA,OAAO,MAAMK,iCAAiC,GAAG/B,mBAAmB,CAACgC,oBAAoB,CAAC;EACtFC,cAAc,EAAExB,uBAAuB;EACvCyB,YAAY,EAAE,CAAC1B,eAAe,EAAET,cAAc,EAAEE,sBAAsB;AAC1E,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/SaveSettings/SaveSettingsUseCase.js","sources":["../../../src/features/SaveSettings/SaveSettingsUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    EventPublisher,\n    EventPublisher as EventPublisherAbstraction\n} from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport {\n    SaveSettingsUseCase,\n    SaveSettingsRepository,\n    type SaveSettingsInput\n} from \"./abstractions.js\";\nimport { MailerSettingsBeforeSaveEvent, MailerSettingsAfterSaveEvent } from \"./events.js\";\nimport { saveValidation } from \"./validation.js\";\nimport {\n    SettingsValidationError,\n    SettingsPersistenceError,\n    SettingsNotAuthorized,\n    SettingsLockedByCode\n} from \"~/domain/errors.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { CodeMailerSettings } from \"~/domain/CodeMailerSettings/abstractions.js\";\nimport { ActiveTransport } from \"~/domain/MailTransport/abstractions.js\";\n\nclass SaveSettingsUseCaseImpl implements SaveSettingsUseCase.Interface {\n    constructor(\n        private identityContext: IdentityContext.Interface,\n        private eventPublisher: EventPublisherAbstraction.Interface,\n        private repository: SaveSettingsRepository.Interface,\n        private codeSettings: CodeMailerSettings.Interface,\n        private activeTransport: ActiveTransport.Interface\n    ) {}\n\n    async execute(input: SaveSettingsInput): SaveSettingsUseCase.Return {\n        const permission = await this.identityContext.getPermission(\"mailer.settings\");\n\n        if (!permission) {\n            return Result.fail(new SettingsNotAuthorized());\n        }\n\n        // Validate input.\n        const validationResult = saveValidation.safeParse(input);\n        if (!validationResult.success) {\n            return Result.fail(new SettingsValidationError(validationResult.error.issues));\n        }\n\n        // Refuse when settings are defined via code.\n        const transportName = this.activeTransport.name();\n        if (transportName && this.codeSettings.get(transportName) !== null) {\n            return Result.fail(new SettingsLockedByCode());\n        }\n\n        // Publish before save event. Strip the password — subscribers (audit\n        // logs, telemetry) must never see the plaintext value from the input.\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { password: _beforePassword, ...inputForEvent } = input;\n        const beforeSaveEvent = new MailerSettingsBeforeSaveEvent({ input: inputForEvent });\n        await this.eventPublisher.publish(beforeSaveEvent);\n\n        // Save settings.\n        const result = await this.repository.execute(input);\n\n        if (result.isFail()) {\n            return Result.fail(new SettingsPersistenceError(result.error));\n        }\n\n        // Publish after save event. The repository return is already password-free\n        // (its type is Omit<TransportSettings, \"password\">), so no runtime strip\n        // is needed here.\n        const afterSaveEvent = new MailerSettingsAfterSaveEvent({ settings: result.value });\n        await this.eventPublisher.publish(afterSaveEvent);\n\n        return result;\n    }\n}\n\nexport const SaveSettingsUseCaseImplementation = SaveSettingsUseCase.createImplementation({\n    implementation: SaveSettingsUseCaseImpl,\n    dependencies: [\n        IdentityContext,\n        EventPublisher,\n        SaveSettingsRepository,\n        CodeMailerSettings,\n        ActiveTransport\n    ]\n});\n"],"names":["SaveSettingsUseCaseImpl","identityContext","eventPublisher","repository","codeSettings","activeTransport","input","permission","Result","SettingsNotAuthorized","validationResult","saveValidation","SettingsValidationError","transportName","SettingsLockedByCode","_beforePassword","inputForEvent","beforeSaveEvent","MailerSettingsBeforeSaveEvent","result","SettingsPersistenceError","afterSaveEvent","MailerSettingsAfterSaveEvent","SaveSettingsUseCaseImplementation","SaveSettingsUseCase","IdentityContext","EventPublisher","SaveSettingsRepository","CodeMailerSettings","ActiveTransport"],"mappings":";;;;;;;;;AAsBA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,cAAmD,EACnDC,UAA4C,EAC5CC,YAA0C,EAC1CC,eAA0C,CACpD;aALUJ,eAAe,GAAfA;aACAC,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,YAAY,GAAZA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QAAQC,KAAwB,EAA8B;QAChE,MAAMC,aAAa,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;QAE5D,IAAI,CAACA,YACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmBC,eAAe,SAAS,CAACL;QAClD,IAAI,CAACI,iBAAiB,OAAO,EACzB,OAAOF,OAAO,IAAI,CAAC,IAAII,wBAAwBF,iBAAiB,KAAK,CAAC,MAAM;QAIhF,MAAMG,gBAAgB,IAAI,CAAC,eAAe,CAAC,IAAI;QAC/C,IAAIA,iBAAiB,AAAyC,SAAzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAACA,gBACvC,OAAOL,OAAO,IAAI,CAAC,IAAIM;QAM3B,MAAM,EAAE,UAAUC,eAAe,EAAE,GAAGC,eAAe,GAAGV;QACxD,MAAMW,kBAAkB,IAAIC,8BAA8B;YAAE,OAAOF;QAAc;QACjF,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACC;QAGlC,MAAME,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACb;QAE7C,IAAIa,OAAO,MAAM,IACb,OAAOX,OAAO,IAAI,CAAC,IAAIY,yBAAyBD,OAAO,KAAK;QAMhE,MAAME,iBAAiB,IAAIC,6BAA6B;YAAE,UAAUH,OAAO,KAAK;QAAC;QACjF,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACE;QAElC,OAAOF;IACX;AACJ;AAEO,MAAMI,oCAAoCC,oBAAoB,oBAAoB,CAAC;IACtF,gBAAgBxB;IAChB,cAAc;QACVyB;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/SaveSettings/abstractions.d.ts

@@ -1,7 +1,7 @@
 import { Result } from "@webiny/feature/api";
-import type { DomainEvent, IEventHandler } from "@webiny/api-core/features/EventPublisher";
+import type { DomainEvent, IEventHandler } from "@webiny/api-core/features/eventPublisher/index.js";
 import type { TransportSettings } from "../../types.js";
-import { SettingsValidationError, SettingsPersistenceError, SettingsNotAuthorized } from "../../domain/errors.js";
+import { SettingsValidationError, SettingsPersistenceError, SettingsNotAuthorized, SettingsLockedByCode } from "../../domain/errors.js";
 export interface SaveSettingsInput {
     host: string;
     port?: number;
@@ -14,39 +14,47 @@ export interface ISaveSettingsErrors {
     validation: SettingsValidationError;
     persistence: SettingsPersistenceError;
     notAuthorized: SettingsNotAuthorized;
+    lockedByCode: SettingsLockedByCode;
 }
 type SaveSettingsError = ISaveSettingsErrors[keyof ISaveSettingsErrors];
+/**
+ * Save-side returns are password-free. The only path that exposes the password
+ * to in-process callers is GetSettingsRepository.get / GetSettingsUseCase.execute
+ * (used by MailerService to authenticate SMTP). Everything else — events,
+ * GraphQL responses, logs, audit trails — must use this Omit shape.
+ */
+export type SavedTransportSettings = Omit<TransportSettings, "password">;
 export interface ISaveSettingsRepository {
-    execute(input: SaveSettingsInput): Promise<Result<TransportSettings, SaveSettingsError>>;
+    execute(input: SaveSettingsInput): Promise<Result<SavedTransportSettings, SaveSettingsError>>;
 }
 export declare const SaveSettingsRepository: import("@webiny/di").Abstraction<ISaveSettingsRepository>;
 export declare namespace SaveSettingsRepository {
     type Interface = ISaveSettingsRepository;
-    type Return = Promise<Result<TransportSettings, SaveSettingsError>>;
+    type Return = Promise<Result<SavedTransportSettings, SaveSettingsError>>;
     type Error = SaveSettingsError;
 }
 export interface ISaveSettings {
-    execute(input: SaveSettingsInput): Promise<Result<TransportSettings, SaveSettingsError>>;
+    execute(input: SaveSettingsInput): Promise<Result<SavedTransportSettings, SaveSettingsError>>;
 }
 export declare const SaveSettingsUseCase: import("@webiny/di").Abstraction<ISaveSettings>;
 export declare namespace SaveSettingsUseCase {
     type Interface = ISaveSettings;
-    type Return = Promise<Result<TransportSettings, SaveSettingsError>>;
+    type Return = Promise<Result<SavedTransportSettings, SaveSettingsError>>;
     type Error = SaveSettingsError;
 }
 export interface MailerSettingsBeforeSavePayload {
-    input: SaveSettingsInput;
+    input: Omit<SaveSettingsInput, "password">;
 }
 export interface MailerSettingsAfterSavePayload {
-    settings: TransportSettings;
+    settings: Omit<TransportSettings, "password">;
 }
-export declare const MailerSettingsBeforeSaveHandler: import("@webiny/di").Abstraction<IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>>;
-export declare namespace MailerSettingsBeforeSaveHandler {
+export declare const MailerSettingsBeforeSaveEventHandler: import("@webiny/di").Abstraction<IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>>;
+export declare namespace MailerSettingsBeforeSaveEventHandler {
     type Interface = IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>;
     type Event = DomainEvent<MailerSettingsBeforeSavePayload>;
 }
-export declare const MailerSettingsAfterSaveHandler: import("@webiny/di").Abstraction<IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>>;
-export declare namespace MailerSettingsAfterSaveHandler {
+export declare const MailerSettingsAfterSaveEventHandler: import("@webiny/di").Abstraction<IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>>;
+export declare namespace MailerSettingsAfterSaveEventHandler {
     type Interface = IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>;
     type Event = DomainEvent<MailerSettingsAfterSavePayload>;
 }

package/features/SaveSettings/abstractions.js

@@ -1,11 +1,8 @@
 import { createAbstraction } from "@webiny/feature/api";
-export const SaveSettingsRepository = createAbstraction("SaveSettingsRepository");
-export const SaveSettingsUseCase = createAbstraction("SaveSettingsUseCase");
-
-// Domain Events
-
-// Event Handler Abstractions
-export const MailerSettingsBeforeSaveHandler = createAbstraction("MailerSettingsBeforeSaveHandler");
-export const MailerSettingsAfterSaveHandler = createAbstraction("MailerSettingsAfterSaveHandler");
+const SaveSettingsRepository = createAbstraction("SaveSettingsRepository");
+const SaveSettingsUseCase = createAbstraction("SaveSettingsUseCase");
+const MailerSettingsBeforeSaveEventHandler = createAbstraction("MailerSettingsBeforeSaveEventHandler");
+const MailerSettingsAfterSaveEventHandler = createAbstraction("MailerSettingsAfterSaveEventHandler");
+export { MailerSettingsAfterSaveEventHandler, MailerSettingsBeforeSaveEventHandler, SaveSettingsRepository, SaveSettingsUseCase };
 
 //# sourceMappingURL=abstractions.js.map

package/features/SaveSettings/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"names":["createAbstraction","SaveSettingsRepository","SaveSettingsUseCase","MailerSettingsBeforeSaveHandler","MailerSettingsAfterSaveHandler"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { DomainEvent, IEventHandler } from \"@webiny/api-core/features/EventPublisher\";\nimport type { TransportSettings } from \"~/types.js\";\nimport {\n    SettingsValidationError,\n    SettingsPersistenceError,\n    SettingsNotAuthorized\n} from \"~/domain/errors.js\";\n\nexport interface SaveSettingsInput {\n    host: string;\n    port?: number;\n    user: string;\n    password?: string;\n    from: string;\n    replyTo?: string;\n}\n\nexport interface ISaveSettingsErrors {\n    validation: SettingsValidationError;\n    persistence: SettingsPersistenceError;\n    notAuthorized: SettingsNotAuthorized;\n}\n\ntype SaveSettingsError = ISaveSettingsErrors[keyof ISaveSettingsErrors];\n\nexport interface ISaveSettingsRepository {\n    execute(input: SaveSettingsInput): Promise<Result<TransportSettings, SaveSettingsError>>;\n}\n\nexport const SaveSettingsRepository =\n    createAbstraction<ISaveSettingsRepository>(\"SaveSettingsRepository\");\n\nexport namespace SaveSettingsRepository {\n    export type Interface = ISaveSettingsRepository;\n    export type Return = Promise<Result<TransportSettings, SaveSettingsError>>;\n    export type Error = SaveSettingsError;\n}\n\nexport interface ISaveSettings {\n    execute(input: SaveSettingsInput): Promise<Result<TransportSettings, SaveSettingsError>>;\n}\n\nexport const SaveSettingsUseCase = createAbstraction<ISaveSettings>(\"SaveSettingsUseCase\");\n\nexport namespace SaveSettingsUseCase {\n    export type Interface = ISaveSettings;\n    export type Return = Promise<Result<TransportSettings, SaveSettingsError>>;\n    export type Error = SaveSettingsError;\n}\n\n// Domain Events\nexport interface MailerSettingsBeforeSavePayload {\n    input: SaveSettingsInput;\n}\n\nexport interface MailerSettingsAfterSavePayload {\n    settings: TransportSettings;\n}\n\n// Event Handler Abstractions\nexport const MailerSettingsBeforeSaveHandler = createAbstraction<\n    IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>\n>(\"MailerSettingsBeforeSaveHandler\");\n\nexport namespace MailerSettingsBeforeSaveHandler {\n    export type Interface = IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>;\n    export type Event = DomainEvent<MailerSettingsBeforeSavePayload>;\n}\n\nexport const MailerSettingsAfterSaveHandler = createAbstraction<\n    IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>\n>(\"MailerSettingsAfterSaveHandler\");\n\nexport namespace MailerSettingsAfterSaveHandler {\n    export type Interface = IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>;\n    export type Event = DomainEvent<MailerSettingsAfterSavePayload>;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AA+BvD,OAAO,MAAMC,sBAAsB,GAC/BD,iBAAiB,CAA0B,wBAAwB,CAAC;AAYxE,OAAO,MAAME,mBAAmB,GAAGF,iBAAiB,CAAgB,qBAAqB,CAAC;;AAQ1F;;AASA;AACA,OAAO,MAAMG,+BAA+B,GAAGH,iBAAiB,CAE9D,iCAAiC,CAAC;AAOpC,OAAO,MAAMI,8BAA8B,GAAGJ,iBAAiB,CAE7D,gCAAgC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/SaveSettings/abstractions.js","sources":["../../../src/features/SaveSettings/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { DomainEvent, IEventHandler } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport {\n    SettingsValidationError,\n    SettingsPersistenceError,\n    SettingsNotAuthorized,\n    SettingsLockedByCode\n} from \"~/domain/errors.js\";\n\nexport interface SaveSettingsInput {\n    host: string;\n    port?: number;\n    user: string;\n    password?: string;\n    from: string;\n    replyTo?: string;\n}\n\nexport interface ISaveSettingsErrors {\n    validation: SettingsValidationError;\n    persistence: SettingsPersistenceError;\n    notAuthorized: SettingsNotAuthorized;\n    lockedByCode: SettingsLockedByCode;\n}\n\ntype SaveSettingsError = ISaveSettingsErrors[keyof ISaveSettingsErrors];\n\n/**\n * Save-side returns are password-free. The only path that exposes the password\n * to in-process callers is GetSettingsRepository.get / GetSettingsUseCase.execute\n * (used by MailerService to authenticate SMTP). Everything else — events,\n * GraphQL responses, logs, audit trails — must use this Omit shape.\n */\nexport type SavedTransportSettings = Omit<TransportSettings, \"password\">;\n\nexport interface ISaveSettingsRepository {\n    execute(input: SaveSettingsInput): Promise<Result<SavedTransportSettings, SaveSettingsError>>;\n}\n\nexport const SaveSettingsRepository =\n    createAbstraction<ISaveSettingsRepository>(\"SaveSettingsRepository\");\n\nexport namespace SaveSettingsRepository {\n    export type Interface = ISaveSettingsRepository;\n    export type Return = Promise<Result<SavedTransportSettings, SaveSettingsError>>;\n    export type Error = SaveSettingsError;\n}\n\nexport interface ISaveSettings {\n    execute(input: SaveSettingsInput): Promise<Result<SavedTransportSettings, SaveSettingsError>>;\n}\n\nexport const SaveSettingsUseCase = createAbstraction<ISaveSettings>(\"SaveSettingsUseCase\");\n\nexport namespace SaveSettingsUseCase {\n    export type Interface = ISaveSettings;\n    export type Return = Promise<Result<SavedTransportSettings, SaveSettingsError>>;\n    export type Error = SaveSettingsError;\n}\n\n// Domain Events. Both payloads exclude `password` so subscribers (audit logs,\n// telemetry, etc.) cannot accidentally persist plaintext or ciphertext secrets.\nexport interface MailerSettingsBeforeSavePayload {\n    input: Omit<SaveSettingsInput, \"password\">;\n}\n\nexport interface MailerSettingsAfterSavePayload {\n    settings: Omit<TransportSettings, \"password\">;\n}\n\n// Event Handler Abstractions\nexport const MailerSettingsBeforeSaveEventHandler = createAbstraction<\n    IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>\n>(\"MailerSettingsBeforeSaveEventHandler\");\n\nexport namespace MailerSettingsBeforeSaveEventHandler {\n    export type Interface = IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>;\n    export type Event = DomainEvent<MailerSettingsBeforeSavePayload>;\n}\n\nexport const MailerSettingsAfterSaveEventHandler = createAbstraction<\n    IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>\n>(\"MailerSettingsAfterSaveEventHandler\");\n\nexport namespace MailerSettingsAfterSaveEventHandler {\n    export type Interface = IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>;\n    export type Event = DomainEvent<MailerSettingsAfterSavePayload>;\n}\n"],"names":["SaveSettingsRepository","createAbstraction","SaveSettingsUseCase","MailerSettingsBeforeSaveEventHandler","MailerSettingsAfterSaveEventHandler"],"mappings":";AAyCO,MAAMA,yBACTC,kBAA2C;AAYxC,MAAMC,sBAAsBD,kBAAiC;AAmB7D,MAAME,uCAAuCF,kBAElD;AAOK,MAAMG,sCAAsCH,kBAEjD"}

package/features/SaveSettings/events.d.ts

@@ -1,10 +1,10 @@
-import { DomainEvent } from "@webiny/api-core/features/EventPublisher";
+import { DomainEvent } from "@webiny/api-core/features/eventPublisher/index.js";
 import type { MailerSettingsBeforeSavePayload, MailerSettingsAfterSavePayload } from "./abstractions.js";
 export declare class MailerSettingsBeforeSaveEvent extends DomainEvent<MailerSettingsBeforeSavePayload> {
     eventType: "mailer.settings.beforeSave";
-    getHandlerAbstraction(): import("@webiny/di").Abstraction<import("@webiny/api-core/features/EventPublisher").IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>>;
+    getHandlerAbstraction(): import("@webiny/di").Abstraction<import("@webiny/api-core/features/eventPublisher/abstractions.js").IEventHandler<DomainEvent<MailerSettingsBeforeSavePayload>>>;
 }
 export declare class MailerSettingsAfterSaveEvent extends DomainEvent<MailerSettingsAfterSavePayload> {
     eventType: "mailer.settings.afterSave";
-    getHandlerAbstraction(): import("@webiny/di").Abstraction<import("@webiny/api-core/features/EventPublisher").IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>>;
+    getHandlerAbstraction(): import("@webiny/di").Abstraction<import("@webiny/api-core/features/eventPublisher/abstractions.js").IEventHandler<DomainEvent<MailerSettingsAfterSavePayload>>>;
 }

package/features/SaveSettings/events.js

@@ -1,16 +1,21 @@
-import { DomainEvent } from "@webiny/api-core/features/EventPublisher";
-import { MailerSettingsBeforeSaveHandler, MailerSettingsAfterSaveHandler } from "./abstractions.js";
-export class MailerSettingsBeforeSaveEvent extends DomainEvent {
-  eventType = "mailer.settings.beforeSave";
-  getHandlerAbstraction() {
-    return MailerSettingsBeforeSaveHandler;
-  }
+import { DomainEvent } from "@webiny/api-core/features/eventPublisher/index.js";
+import { MailerSettingsAfterSaveEventHandler, MailerSettingsBeforeSaveEventHandler } from "./abstractions.js";
+class MailerSettingsBeforeSaveEvent extends DomainEvent {
+    getHandlerAbstraction() {
+        return MailerSettingsBeforeSaveEventHandler;
+    }
+    constructor(...args){
+        super(...args), this.eventType = "mailer.settings.beforeSave";
+    }
 }
-export class MailerSettingsAfterSaveEvent extends DomainEvent {
-  eventType = "mailer.settings.afterSave";
-  getHandlerAbstraction() {
-    return MailerSettingsAfterSaveHandler;
-  }
+class MailerSettingsAfterSaveEvent extends DomainEvent {
+    getHandlerAbstraction() {
+        return MailerSettingsAfterSaveEventHandler;
+    }
+    constructor(...args){
+        super(...args), this.eventType = "mailer.settings.afterSave";
+    }
 }
+export { MailerSettingsAfterSaveEvent, MailerSettingsBeforeSaveEvent };
 
 //# sourceMappingURL=events.js.map

package/features/SaveSettings/events.js.map

@@ -1 +1 @@
-{"version":3,"names":["DomainEvent","MailerSettingsBeforeSaveHandler","MailerSettingsAfterSaveHandler","MailerSettingsBeforeSaveEvent","eventType","getHandlerAbstraction","MailerSettingsAfterSaveEvent"],"sources":["events.ts"],"sourcesContent":["import { DomainEvent } from \"@webiny/api-core/features/EventPublisher\";\nimport { MailerSettingsBeforeSaveHandler, MailerSettingsAfterSaveHandler } from \"./abstractions.js\";\nimport type {\n    MailerSettingsBeforeSavePayload,\n    MailerSettingsAfterSavePayload\n} from \"./abstractions.js\";\n\nexport class MailerSettingsBeforeSaveEvent extends DomainEvent<MailerSettingsBeforeSavePayload> {\n    eventType = \"mailer.settings.beforeSave\" as const;\n\n    getHandlerAbstraction() {\n        return MailerSettingsBeforeSaveHandler;\n    }\n}\n\nexport class MailerSettingsAfterSaveEvent extends DomainEvent<MailerSettingsAfterSavePayload> {\n    eventType = \"mailer.settings.afterSave\" as const;\n\n    getHandlerAbstraction() {\n        return MailerSettingsAfterSaveHandler;\n    }\n}\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,0CAA0C;AACtE,SAASC,+BAA+B,EAAEC,8BAA8B;AAMxE,OAAO,MAAMC,6BAA6B,SAASH,WAAW,CAAkC;EAC5FI,SAAS,GAAG,4BAA4B;EAExCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOJ,+BAA+B;EAC1C;AACJ;AAEA,OAAO,MAAMK,4BAA4B,SAASN,WAAW,CAAiC;EAC1FI,SAAS,GAAG,2BAA2B;EAEvCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOH,8BAA8B;EACzC;AACJ","ignoreList":[]}
+{"version":3,"file":"features/SaveSettings/events.js","sources":["../../../src/features/SaveSettings/events.ts"],"sourcesContent":["import { DomainEvent } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport {\n    MailerSettingsBeforeSaveEventHandler,\n    MailerSettingsAfterSaveEventHandler\n} from \"./abstractions.js\";\nimport type {\n    MailerSettingsBeforeSavePayload,\n    MailerSettingsAfterSavePayload\n} from \"./abstractions.js\";\n\nexport class MailerSettingsBeforeSaveEvent extends DomainEvent<MailerSettingsBeforeSavePayload> {\n    eventType = \"mailer.settings.beforeSave\" as const;\n\n    getHandlerAbstraction() {\n        return MailerSettingsBeforeSaveEventHandler;\n    }\n}\n\nexport class MailerSettingsAfterSaveEvent extends DomainEvent<MailerSettingsAfterSavePayload> {\n    eventType = \"mailer.settings.afterSave\" as const;\n\n    getHandlerAbstraction() {\n        return MailerSettingsAfterSaveEventHandler;\n    }\n}\n"],"names":["MailerSettingsBeforeSaveEvent","DomainEvent","MailerSettingsBeforeSaveEventHandler","MailerSettingsAfterSaveEvent","MailerSettingsAfterSaveEventHandler"],"mappings":";;AAUO,MAAMA,sCAAsCC;IAG/C,wBAAwB;QACpB,OAAOC;IACX;;QALG,qBACH,SAAS,GAAG;;AAKhB;AAEO,MAAMC,qCAAqCF;IAG9C,wBAAwB;QACpB,OAAOG;IACX;;QALG,qBACH,SAAS,GAAG;;AAKhB"}

package/features/SaveSettings/feature.d.ts

@@ -1 +1,4 @@
-export declare const SaveSettingsFeature: import("@webiny/feature/api/createFeature.js").FeatureDefinition<unknown>;
+export declare const SaveSettingsFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/SaveSettings/feature.js

@@ -1,12 +1,13 @@
 import { createFeature } from "@webiny/feature/api";
 import { SaveSettingsRepositoryImplementation } from "./SaveSettingsRepository.js";
 import { SaveSettingsUseCaseImplementation } from "./SaveSettingsUseCase.js";
-export const SaveSettingsFeature = createFeature({
-  name: "SaveSettings",
-  register(container) {
-    container.register(SaveSettingsRepositoryImplementation).inSingletonScope();
-    container.register(SaveSettingsUseCaseImplementation);
-  }
+const SaveSettingsFeature = createFeature({
+    name: "SaveSettings",
+    register (container) {
+        container.register(SaveSettingsRepositoryImplementation).inSingletonScope();
+        container.register(SaveSettingsUseCaseImplementation);
+    }
 });
+export { SaveSettingsFeature };
 
 //# sourceMappingURL=feature.js.map

package/features/SaveSettings/feature.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFeature","SaveSettingsRepositoryImplementation","SaveSettingsUseCaseImplementation","SaveSettingsFeature","name","register","container","inSingletonScope"],"sources":["feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { SaveSettingsRepositoryImplementation } from \"./SaveSettingsRepository.js\";\nimport { SaveSettingsUseCaseImplementation } from \"./SaveSettingsUseCase.js\";\n\nexport const SaveSettingsFeature = createFeature({\n    name: \"SaveSettings\",\n    register(container) {\n        container.register(SaveSettingsRepositoryImplementation).inSingletonScope();\n        container.register(SaveSettingsUseCaseImplementation);\n    }\n});\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,qBAAqB;AACnD,SAASC,oCAAoC;AAC7C,SAASC,iCAAiC;AAE1C,OAAO,MAAMC,mBAAmB,GAAGH,aAAa,CAAC;EAC7CI,IAAI,EAAE,cAAc;EACpBC,QAAQA,CAACC,SAAS,EAAE;IAChBA,SAAS,CAACD,QAAQ,CAACJ,oCAAoC,CAAC,CAACM,gBAAgB,CAAC,CAAC;IAC3ED,SAAS,CAACD,QAAQ,CAACH,iCAAiC,CAAC;EACzD;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/SaveSettings/feature.js","sources":["../../../src/features/SaveSettings/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { SaveSettingsRepositoryImplementation } from \"./SaveSettingsRepository.js\";\nimport { SaveSettingsUseCaseImplementation } from \"./SaveSettingsUseCase.js\";\n\nexport const SaveSettingsFeature = createFeature({\n    name: \"SaveSettings\",\n    register(container) {\n        container.register(SaveSettingsRepositoryImplementation).inSingletonScope();\n        container.register(SaveSettingsUseCaseImplementation);\n    }\n});\n"],"names":["SaveSettingsFeature","createFeature","container","SaveSettingsRepositoryImplementation","SaveSettingsUseCaseImplementation"],"mappings":";;;AAIO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,sCAAsC,gBAAgB;QACzED,UAAU,QAAQ,CAACE;IACvB;AACJ"}

package/features/SaveSettings/index.d.ts

@@ -1 +1 @@
-export { SaveSettingsUseCase, MailerSettingsAfterSaveHandler, MailerSettingsBeforeSaveHandler } from "./abstractions.js";
+export { SaveSettingsUseCase, SaveSettingsRepository, MailerSettingsAfterSaveEventHandler, MailerSettingsBeforeSaveEventHandler } from "./abstractions.js";

package/features/SaveSettings/index.js

@@ -1,3 +1 @@
-export { SaveSettingsUseCase, MailerSettingsAfterSaveHandler, MailerSettingsBeforeSaveHandler } from "./abstractions.js";
-
-//# sourceMappingURL=index.js.map
+export { MailerSettingsAfterSaveEventHandler, MailerSettingsBeforeSaveEventHandler, SaveSettingsRepository, SaveSettingsUseCase } from "./abstractions.js";

package/features/SaveSettings/validation.d.ts

@@ -1,23 +1,9 @@
 import zod from "zod";
 export declare const saveValidation: zod.ZodObject<{
-    password: zod.ZodEffects<zod.ZodOptional<zod.ZodOptional<zod.ZodNullable<zod.ZodString>>>, string | null, string | null | undefined>;
+    password: zod.ZodPipe<zod.ZodOptional<zod.ZodOptional<zod.ZodNullable<zod.ZodString>>>, zod.ZodTransform<string | null, string | null | undefined>>;
     from: zod.ZodString;
     port: zod.ZodOptional<zod.ZodNullable<zod.ZodOptional<zod.ZodNumber>>>;
-    replyTo: zod.ZodEffects<zod.ZodOptional<zod.ZodNullable<zod.ZodOptional<zod.ZodString>>>, string | null | undefined, unknown>;
+    replyTo: zod.ZodPreprocess<zod.ZodOptional<zod.ZodNullable<zod.ZodOptional<zod.ZodString>>>>;
     host: zod.ZodString;
     user: zod.ZodString;
-}, "strip", zod.ZodTypeAny, {
-    host: string;
-    user: string;
-    password: string | null;
-    from: string;
-    port?: number | null | undefined;
-    replyTo?: string | null | undefined;
-}, {
-    host: string;
-    user: string;
-    from: string;
-    port?: number | null | undefined;
-    password?: string | null | undefined;
-    replyTo?: unknown;
-}>;
+}, zod.core.$strip>;

package/features/SaveSettings/validation.js

@@ -1,19 +1,20 @@
 import zod from "zod";
-const password = zod.string().describe("Password");
+import { isMailboxAddress } from "../../utils/isMailboxAddress.js";
+const validation_password = zod.string().describe("Password");
+const mailboxAddress = zod.string().refine(isMailboxAddress, {
+    message: "Invalid email address."
+});
 const common = {
-  from: zod.string().email().describe("Mail from"),
-  port: zod.number().optional().nullish().describe("Port"),
-  replyTo: zod.preprocess(
-  // We need to set empty strings to `null` before email validation kicks in
-  value => value === "" ? null : value, zod.string().email().optional().nullish()).describe("Mail reply-to"),
-  host: zod.string().describe("Hostname"),
-  user: zod.string().describe("User")
+    from: mailboxAddress.describe("Mail from"),
+    port: zod.number().optional().nullish().describe("Port"),
+    replyTo: zod.preprocess((value)=>"" === value ? null : value, mailboxAddress.optional().nullish()).describe("Mail reply-to"),
+    host: zod.string().describe("Hostname"),
+    user: zod.string().describe("User")
 };
-export const saveValidation = zod.object({
-  ...common,
-  password: password.nullish().optional().transform(value => {
-    return value === undefined ? null : value;
-  })
+const saveValidation = zod.object({
+    ...common,
+    password: validation_password.nullish().optional().transform((value)=>void 0 === value ? null : value)
 });
+export { saveValidation };
 
 //# sourceMappingURL=validation.js.map

package/features/SaveSettings/validation.js.map

@@ -1 +1 @@
-{"version":3,"names":["zod","password","string","describe","common","from","email","port","number","optional","nullish","replyTo","preprocess","value","host","user","saveValidation","object","transform","undefined"],"sources":["validation.ts"],"sourcesContent":["import zod from \"zod\";\n\nconst password = zod.string().describe(\"Password\");\n\nconst common = {\n    from: zod.string().email().describe(\"Mail from\"),\n    port: zod.number().optional().nullish().describe(\"Port\"),\n    replyTo: zod\n        .preprocess(\n            // We need to set empty strings to `null` before email validation kicks in\n            value => (value === \"\" ? null : value),\n            zod.string().email().optional().nullish()\n        )\n        .describe(\"Mail reply-to\"),\n    host: zod.string().describe(\"Hostname\"),\n    user: zod.string().describe(\"User\")\n};\n\nexport const saveValidation = zod.object({\n    ...common,\n    password: password\n        .nullish()\n        .optional()\n        .transform(value => {\n            return value === undefined ? null : value;\n        })\n});\n"],"mappings":"AAAA,OAAOA,GAAG,MAAM,KAAK;AAErB,MAAMC,QAAQ,GAAGD,GAAG,CAACE,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,UAAU,CAAC;AAElD,MAAMC,MAAM,GAAG;EACXC,IAAI,EAAEL,GAAG,CAACE,MAAM,CAAC,CAAC,CAACI,KAAK,CAAC,CAAC,CAACH,QAAQ,CAAC,WAAW,CAAC;EAChDI,IAAI,EAAEP,GAAG,CAACQ,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACP,QAAQ,CAAC,MAAM,CAAC;EACxDQ,OAAO,EAAEX,GAAG,CACPY,UAAU;EACP;EACAC,KAAK,IAAKA,KAAK,KAAK,EAAE,GAAG,IAAI,GAAGA,KAAM,EACtCb,GAAG,CAACE,MAAM,CAAC,CAAC,CAACI,KAAK,CAAC,CAAC,CAACG,QAAQ,CAAC,CAAC,CAACC,OAAO,CAAC,CAC5C,CAAC,CACAP,QAAQ,CAAC,eAAe,CAAC;EAC9BW,IAAI,EAAEd,GAAG,CAACE,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,UAAU,CAAC;EACvCY,IAAI,EAAEf,GAAG,CAACE,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,MAAM;AACtC,CAAC;AAED,OAAO,MAAMa,cAAc,GAAGhB,GAAG,CAACiB,MAAM,CAAC;EACrC,GAAGb,MAAM;EACTH,QAAQ,EAAEA,QAAQ,CACbS,OAAO,CAAC,CAAC,CACTD,QAAQ,CAAC,CAAC,CACVS,SAAS,CAACL,KAAK,IAAI;IAChB,OAAOA,KAAK,KAAKM,SAAS,GAAG,IAAI,GAAGN,KAAK;EAC7C,CAAC;AACT,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/SaveSettings/validation.js","sources":["../../../src/features/SaveSettings/validation.ts"],"sourcesContent":["import zod from \"zod\";\nimport { isMailboxAddress } from \"~/utils/isMailboxAddress.js\";\n\nconst password = zod.string().describe(\"Password\");\n\nconst mailboxAddress = zod.string().refine(isMailboxAddress, { message: \"Invalid email address.\" });\n\nconst common = {\n    from: mailboxAddress.describe(\"Mail from\"),\n    port: zod.number().optional().nullish().describe(\"Port\"),\n    replyTo: zod\n        .preprocess(\n            // We need to set empty strings to `null` before address validation kicks in.\n            value => (value === \"\" ? null : value),\n            mailboxAddress.optional().nullish()\n        )\n        .describe(\"Mail reply-to\"),\n    host: zod.string().describe(\"Hostname\"),\n    user: zod.string().describe(\"User\")\n};\n\nexport const saveValidation = zod.object({\n    ...common,\n    password: password\n        .nullish()\n        .optional()\n        .transform(value => {\n            return value === undefined ? null : value;\n        })\n});\n"],"names":["password","zod","mailboxAddress","isMailboxAddress","common","value","saveValidation","undefined"],"mappings":";;AAGA,MAAMA,sBAAWC,IAAI,MAAM,GAAG,QAAQ,CAAC;AAEvC,MAAMC,iBAAiBD,IAAI,MAAM,GAAG,MAAM,CAACE,kBAAkB;IAAE,SAAS;AAAyB;AAEjG,MAAMC,SAAS;IACX,MAAMF,eAAe,QAAQ,CAAC;IAC9B,MAAMD,IAAI,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IACjD,SAASA,IAAAA,UACM,CAEPI,CAAAA,QAAUA,AAAU,OAAVA,QAAe,OAAOA,OAChCH,eAAe,QAAQ,GAAG,OAAO,IAEpC,QAAQ,CAAC;IACd,MAAMD,IAAI,MAAM,GAAG,QAAQ,CAAC;IAC5B,MAAMA,IAAI,MAAM,GAAG,QAAQ,CAAC;AAChC;AAEO,MAAMK,iBAAiBL,IAAI,MAAM,CAAC;IACrC,GAAGG,MAAM;IACT,UAAUJ,oBACL,OAAO,GACP,QAAQ,GACR,SAAS,CAACK,CAAAA,QACAA,AAAUE,WAAVF,QAAsB,OAAOA;AAEhD"}

package/features/SendMail/SendMailUseCase.d.ts

@@ -1,4 +1,4 @@
-import { EventPublisher as EventPublisherAbstraction } from "@webiny/api-core/features/EventPublisher";
+import { EventPublisher as EventPublisherAbstraction } from "@webiny/api-core/features/eventPublisher/index.js";
 import { SendMailUseCase } from "./abstractions.js";
 import { MailerService } from "../../domain/MailerService/abstractions.js";
 import type { TransportSendData } from "../../types.js";

package/features/SendMail/SendMailUseCase.js

@@ -1,62 +1,58 @@
 import zod from "zod";
-import { EventPublisher } from "@webiny/api-core/features/EventPublisher";
+import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
 import { SendMailUseCase } from "./abstractions.js";
-import { MailBeforeSendEvent, MailAfterSendEvent, MailSendErrorEvent } from "./events.js";
+import { MailAfterSendEvent, MailBeforeSendEvent, MailSendErrorEvent } from "./events.js";
 import { MailerService } from "../../domain/MailerService/abstractions.js";
 import { MailValidationError } from "../../domain/errors.js";
 import { Result } from "@webiny/feature/api";
+import { isMailboxAddress } from "../../utils/isMailboxAddress.js";
 const requiredString = zod.string();
-const requiredEmail = requiredString.email();
+const mailboxAddress = zod.string().refine(isMailboxAddress, {
+    message: "Invalid email address."
+});
 const schema = zod.object({
-  to: zod.array(requiredEmail).optional(),
-  from: zod.string().email().optional(),
-  subject: requiredString.max(1024).min(2),
-  cc: zod.array(requiredEmail).optional(),
-  bcc: zod.array(requiredEmail).optional(),
-  replyTo: zod.string().email().optional(),
-  text: zod.string().optional(),
-  html: zod.string().optional()
-}).refine(data => {
-  return !!data.text || !!data.html;
-}, "Either text or html is required.");
+    to: zod.array(mailboxAddress).optional(),
+    from: mailboxAddress.optional(),
+    subject: requiredString.max(1024).min(2),
+    cc: zod.array(mailboxAddress).optional(),
+    bcc: zod.array(mailboxAddress).optional(),
+    replyTo: mailboxAddress.optional(),
+    text: zod.string().optional(),
+    html: zod.string().optional()
+}).refine((data)=>!!data.text || !!data.html, "Either text or html is required.");
 class SendMailUseCaseImpl {
-  constructor(mailerService, eventPublisher) {
-    this.mailerService = mailerService;
-    this.eventPublisher = eventPublisher;
-  }
-  async execute(data) {
-    const validation = schema.safeParse(data);
-    if (!validation.success) {
-      return Result.fail(new MailValidationError(validation.error.errors));
+    constructor(mailerService, eventPublisher){
+        this.mailerService = mailerService;
+        this.eventPublisher = eventPublisher;
     }
-
-    // Publish before send event
-    await this.eventPublisher.publish(new MailBeforeSendEvent({
-      data
-    }));
-
-    // Send mail
-    const result = await this.mailerService.sendMail(data);
-    if (result.isFail()) {
-      // Publish error event
-      await this.eventPublisher.publish(new MailSendErrorEvent({
-        data,
-        error: result.error
-      }));
-      return result;
+    async execute(data) {
+        const validation = schema.safeParse(data);
+        if (!validation.success) return Result.fail(new MailValidationError(validation.error.issues));
+        await this.eventPublisher.publish(new MailBeforeSendEvent({
+            data
+        }));
+        const result = await this.mailerService.sendMail(data);
+        if (result.isFail()) {
+            await this.eventPublisher.publish(new MailSendErrorEvent({
+                data,
+                error: result.error
+            }));
+            return result;
+        }
+        await this.eventPublisher.publish(new MailAfterSendEvent({
+            data,
+            response: result.value
+        }));
+        return result;
     }
-
-    // Publish after send event
-    await this.eventPublisher.publish(new MailAfterSendEvent({
-      data,
-      response: result.value
-    }));
-    return result;
-  }
 }
-export const SendMailUseCaseImplementation = SendMailUseCase.createImplementation({
-  implementation: SendMailUseCaseImpl,
-  dependencies: [MailerService, EventPublisher]
+const SendMailUseCaseImplementation = SendMailUseCase.createImplementation({
+    implementation: SendMailUseCaseImpl,
+    dependencies: [
+        MailerService,
+        EventPublisher
+    ]
 });
+export { SendMailUseCaseImplementation };
 
 //# sourceMappingURL=SendMailUseCase.js.map

package/features/SendMail/SendMailUseCase.js.map

@@ -1 +1 @@
-{"version":3,"names":["zod","EventPublisher","SendMailUseCase","MailBeforeSendEvent","MailAfterSendEvent","MailSendErrorEvent","MailerService","MailValidationError","Result","requiredString","string","requiredEmail","email","schema","object","to","array","optional","from","subject","max","min","cc","bcc","replyTo","text","html","refine","data","SendMailUseCaseImpl","constructor","mailerService","eventPublisher","execute","validation","safeParse","success","fail","error","errors","publish","result","sendMail","isFail","response","value","SendMailUseCaseImplementation","createImplementation","implementation","dependencies"],"sources":["SendMailUseCase.ts"],"sourcesContent":["import zod from \"zod\";\nimport {\n    EventPublisher,\n    EventPublisher as EventPublisherAbstraction\n} from \"@webiny/api-core/features/EventPublisher\";\nimport { SendMailUseCase } from \"./abstractions.js\";\nimport { MailBeforeSendEvent, MailAfterSendEvent, MailSendErrorEvent } from \"./events.js\";\nimport { MailerService } from \"~/domain/MailerService/abstractions.js\";\nimport type { TransportSendData } from \"~/types.js\";\nimport { MailValidationError } from \"~/domain/errors.js\";\nimport { Result } from \"@webiny/feature/api\";\n\nconst requiredString = zod.string();\nconst requiredEmail = requiredString.email();\n\nconst schema = zod\n    .object({\n        to: zod.array(requiredEmail).optional(),\n        from: zod.string().email().optional(),\n        subject: requiredString.max(1024).min(2),\n        cc: zod.array(requiredEmail).optional(),\n        bcc: zod.array(requiredEmail).optional(),\n        replyTo: zod.string().email().optional(),\n        text: zod.string().optional(),\n        html: zod.string().optional()\n    })\n    .refine(data => {\n        return !!data.text || !!data.html;\n    }, \"Either text or html is required.\");\n\nclass SendMailUseCaseImpl implements SendMailUseCase.Interface {\n    constructor(\n        private mailerService: MailerService.Interface,\n        private eventPublisher: EventPublisherAbstraction.Interface\n    ) {}\n\n    async execute(data: TransportSendData) {\n        const validation = schema.safeParse(data);\n        if (!validation.success) {\n            return Result.fail(new MailValidationError(validation.error.errors));\n        }\n\n        // Publish before send event\n        await this.eventPublisher.publish(new MailBeforeSendEvent({ data }));\n\n        // Send mail\n        const result = await this.mailerService.sendMail(data);\n\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new MailSendErrorEvent({\n                    data,\n                    error: result.error\n                })\n            );\n\n            return result;\n        }\n\n        // Publish after send event\n        await this.eventPublisher.publish(\n            new MailAfterSendEvent({\n                data,\n                response: result.value\n            })\n        );\n\n        return result;\n    }\n}\n\nexport const SendMailUseCaseImplementation = SendMailUseCase.createImplementation({\n    implementation: SendMailUseCaseImpl,\n    dependencies: [MailerService, EventPublisher]\n});\n"],"mappings":"AAAA,OAAOA,GAAG,MAAM,KAAK;AACrB,SACIC,cAAc,QAEX,0CAA0C;AACjD,SAASC,eAAe;AACxB,SAASC,mBAAmB,EAAEC,kBAAkB,EAAEC,kBAAkB;AACpE,SAASC,aAAa;AAEtB,SAASC,mBAAmB;AAC5B,SAASC,MAAM,QAAQ,qBAAqB;AAE5C,MAAMC,cAAc,GAAGT,GAAG,CAACU,MAAM,CAAC,CAAC;AACnC,MAAMC,aAAa,GAAGF,cAAc,CAACG,KAAK,CAAC,CAAC;AAE5C,MAAMC,MAAM,GAAGb,GAAG,CACbc,MAAM,CAAC;EACJC,EAAE,EAAEf,GAAG,CAACgB,KAAK,CAACL,aAAa,CAAC,CAACM,QAAQ,CAAC,CAAC;EACvCC,IAAI,EAAElB,GAAG,CAACU,MAAM,CAAC,CAAC,CAACE,KAAK,CAAC,CAAC,CAACK,QAAQ,CAAC,CAAC;EACrCE,OAAO,EAAEV,cAAc,CAACW,GAAG,CAAC,IAAI,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC;EACxCC,EAAE,EAAEtB,GAAG,CAACgB,KAAK,CAACL,aAAa,CAAC,CAACM,QAAQ,CAAC,CAAC;EACvCM,GAAG,EAAEvB,GAAG,CAACgB,KAAK,CAACL,aAAa,CAAC,CAACM,QAAQ,CAAC,CAAC;EACxCO,OAAO,EAAExB,GAAG,CAACU,MAAM,CAAC,CAAC,CAACE,KAAK,CAAC,CAAC,CAACK,QAAQ,CAAC,CAAC;EACxCQ,IAAI,EAAEzB,GAAG,CAACU,MAAM,CAAC,CAAC,CAACO,QAAQ,CAAC,CAAC;EAC7BS,IAAI,EAAE1B,GAAG,CAACU,MAAM,CAAC,CAAC,CAACO,QAAQ,CAAC;AAChC,CAAC,CAAC,CACDU,MAAM,CAACC,IAAI,IAAI;EACZ,OAAO,CAAC,CAACA,IAAI,CAACH,IAAI,IAAI,CAAC,CAACG,IAAI,CAACF,IAAI;AACrC,CAAC,EAAE,kCAAkC,CAAC;AAE1C,MAAMG,mBAAmB,CAAsC;EAC3DC,WAAWA,CACCC,aAAsC,EACtCC,cAAmD,EAC7D;IAAA,KAFUD,aAAsC,GAAtCA,aAAsC;IAAA,KACtCC,cAAmD,GAAnDA,cAAmD;EAC5D;EAEH,MAAMC,OAAOA,CAACL,IAAuB,EAAE;IACnC,MAAMM,UAAU,GAAGrB,MAAM,CAACsB,SAAS,CAACP,IAAI,CAAC;IACzC,IAAI,CAACM,UAAU,CAACE,OAAO,EAAE;MACrB,OAAO5B,MAAM,CAAC6B,IAAI,CAAC,IAAI9B,mBAAmB,CAAC2B,UAAU,CAACI,KAAK,CAACC,MAAM,CAAC,CAAC;IACxE;;IAEA;IACA,MAAM,IAAI,CAACP,cAAc,CAACQ,OAAO,CAAC,IAAIrC,mBAAmB,CAAC;MAAEyB;IAAK,CAAC,CAAC,CAAC;;IAEpE;IACA,MAAMa,MAAM,GAAG,MAAM,IAAI,CAACV,aAAa,CAACW,QAAQ,CAACd,IAAI,CAAC;IAEtD,IAAIa,MAAM,CAACE,MAAM,CAAC,CAAC,EAAE;MACjB;MACA,MAAM,IAAI,CAACX,cAAc,CAACQ,OAAO,CAC7B,IAAInC,kBAAkB,CAAC;QACnBuB,IAAI;QACJU,KAAK,EAAEG,MAAM,CAACH;MAClB,CAAC,CACL,CAAC;MAED,OAAOG,MAAM;IACjB;;IAEA;IACA,MAAM,IAAI,CAACT,cAAc,CAACQ,OAAO,CAC7B,IAAIpC,kBAAkB,CAAC;MACnBwB,IAAI;MACJgB,QAAQ,EAAEH,MAAM,CAACI;IACrB,CAAC,CACL,CAAC;IAED,OAAOJ,MAAM;EACjB;AACJ;AAEA,OAAO,MAAMK,6BAA6B,GAAG5C,eAAe,CAAC6C,oBAAoB,CAAC;EAC9EC,cAAc,EAAEnB,mBAAmB;EACnCoB,YAAY,EAAE,CAAC3C,aAAa,EAAEL,cAAc;AAChD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/SendMail/SendMailUseCase.js","sources":["../../../src/features/SendMail/SendMailUseCase.ts"],"sourcesContent":["import zod from \"zod\";\nimport {\n    EventPublisher,\n    EventPublisher as EventPublisherAbstraction\n} from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { SendMailUseCase } from \"./abstractions.js\";\nimport { MailBeforeSendEvent, MailAfterSendEvent, MailSendErrorEvent } from \"./events.js\";\nimport { MailerService } from \"~/domain/MailerService/abstractions.js\";\nimport type { TransportSendData } from \"~/types.js\";\nimport { MailValidationError } from \"~/domain/errors.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { isMailboxAddress } from \"~/utils/isMailboxAddress.js\";\n\nconst requiredString = zod.string();\nconst mailboxAddress = zod.string().refine(isMailboxAddress, { message: \"Invalid email address.\" });\n\nconst schema = zod\n    .object({\n        to: zod.array(mailboxAddress).optional(),\n        from: mailboxAddress.optional(),\n        subject: requiredString.max(1024).min(2),\n        cc: zod.array(mailboxAddress).optional(),\n        bcc: zod.array(mailboxAddress).optional(),\n        replyTo: mailboxAddress.optional(),\n        text: zod.string().optional(),\n        html: zod.string().optional()\n    })\n    .refine(data => {\n        return !!data.text || !!data.html;\n    }, \"Either text or html is required.\");\n\nclass SendMailUseCaseImpl implements SendMailUseCase.Interface {\n    constructor(\n        private mailerService: MailerService.Interface,\n        private eventPublisher: EventPublisherAbstraction.Interface\n    ) {}\n\n    async execute(data: TransportSendData) {\n        const validation = schema.safeParse(data);\n        if (!validation.success) {\n            return Result.fail(new MailValidationError(validation.error.issues));\n        }\n\n        // Publish before send event\n        await this.eventPublisher.publish(new MailBeforeSendEvent({ data }));\n\n        // Send mail\n        const result = await this.mailerService.sendMail(data);\n\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new MailSendErrorEvent({\n                    data,\n                    error: result.error\n                })\n            );\n\n            return result;\n        }\n\n        // Publish after send event\n        await this.eventPublisher.publish(\n            new MailAfterSendEvent({\n                data,\n                response: result.value\n            })\n        );\n\n        return result;\n    }\n}\n\nexport const SendMailUseCaseImplementation = SendMailUseCase.createImplementation({\n    implementation: SendMailUseCaseImpl,\n    dependencies: [MailerService, EventPublisher]\n});\n"],"names":["requiredString","zod","mailboxAddress","isMailboxAddress","schema","data","SendMailUseCaseImpl","mailerService","eventPublisher","validation","Result","MailValidationError","MailBeforeSendEvent","result","MailSendErrorEvent","MailAfterSendEvent","SendMailUseCaseImplementation","SendMailUseCase","MailerService","EventPublisher"],"mappings":";;;;;;;;AAaA,MAAMA,iBAAiBC,IAAI,MAAM;AACjC,MAAMC,iBAAiBD,IAAI,MAAM,GAAG,MAAM,CAACE,kBAAkB;IAAE,SAAS;AAAyB;AAEjG,MAAMC,SAASH,IAAAA,MACJ,CAAC;IACJ,IAAIA,IAAI,KAAK,CAACC,gBAAgB,QAAQ;IACtC,MAAMA,eAAe,QAAQ;IAC7B,SAASF,eAAe,GAAG,CAAC,MAAM,GAAG,CAAC;IACtC,IAAIC,IAAI,KAAK,CAACC,gBAAgB,QAAQ;IACtC,KAAKD,IAAI,KAAK,CAACC,gBAAgB,QAAQ;IACvC,SAASA,eAAe,QAAQ;IAChC,MAAMD,IAAI,MAAM,GAAG,QAAQ;IAC3B,MAAMA,IAAI,MAAM,GAAG,QAAQ;AAC/B,GACC,MAAM,CAACI,CAAAA,OACG,CAAC,CAACA,KAAK,IAAI,IAAI,CAAC,CAACA,KAAK,IAAI,EAClC;AAEP,MAAMC;IACF,YACYC,aAAsC,EACtCC,cAAmD,CAC7D;aAFUD,aAAa,GAAbA;aACAC,cAAc,GAAdA;IACT;IAEH,MAAM,QAAQH,IAAuB,EAAE;QACnC,MAAMI,aAAaL,OAAO,SAAS,CAACC;QACpC,IAAI,CAACI,WAAW,OAAO,EACnB,OAAOC,OAAO,IAAI,CAAC,IAAIC,oBAAoBF,WAAW,KAAK,CAAC,MAAM;QAItE,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIG,oBAAoB;YAAEP;QAAK;QAGjE,MAAMQ,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAACR;QAEjD,IAAIQ,OAAO,MAAM,IAAI;YAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,mBAAmB;gBACnBT;gBACA,OAAOQ,OAAO,KAAK;YACvB;YAGJ,OAAOA;QACX;QAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,mBAAmB;YACnBV;YACA,UAAUQ,OAAO,KAAK;QAC1B;QAGJ,OAAOA;IACX;AACJ;AAEO,MAAMG,gCAAgCC,gBAAgB,oBAAoB,CAAC;IAC9E,gBAAgBX;IAChB,cAAc;QAACY;QAAeC;KAAe;AACjD"}