@webiny/api-mailer 6.4.0-beta.3 → 6.4.0-beta.5

package/domain/MailTransport/abstractions.d.ts

@@ -10,6 +10,7 @@ export declare namespace MailTransport {
 }
 export interface IMailTransportFactory {
     name: string;
+    canUse(settings: TransportSettings | null): boolean;
     createTransport(settings: TransportSettings): Promise<IMailTransport>;
 }
 export declare const MailTransportFactory: import("@webiny/di").Abstraction<IMailTransportFactory>;
@@ -17,10 +18,3 @@ export declare namespace MailTransportFactory {
     type Interface = IMailTransportFactory;
     type Return = Promise<IMailTransport>;
 }
-export interface IActiveTransport {
-    name(): string | null;
-}
-export declare const ActiveTransport: import("@webiny/di").Abstraction<IActiveTransport>;
-export declare namespace ActiveTransport {
-    type Interface = IActiveTransport;
-}

package/domain/MailTransport/abstractions.js

@@ -1,7 +1,6 @@
 import { createAbstraction } from "@webiny/feature/api";
 const MailTransport = createAbstraction("MailTransport");
 const MailTransportFactory = createAbstraction("MailTransportFactory");
-const ActiveTransport = createAbstraction("ActiveTransport");
-export { ActiveTransport, MailTransport, MailTransportFactory };
+export { MailTransport, MailTransportFactory };
 
 //# sourceMappingURL=abstractions.js.map

package/domain/MailTransport/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain/MailTransport/abstractions.js","sources":["../../../src/domain/MailTransport/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { TransportSendData, TransportSendResponse, TransportSettings } from \"~/types.js\";\n\nexport interface IMailTransport {\n    name: string;\n    send(params: TransportSendData): Promise<TransportSendResponse>;\n}\n\nexport const MailTransport = createAbstraction<IMailTransport>(\"MailTransport\");\n\nexport namespace MailTransport {\n    export type Interface = IMailTransport;\n    export type SendParams = TransportSendData;\n}\n\nexport interface IMailTransportFactory {\n    name: string;\n    createTransport(settings: TransportSettings): Promise<IMailTransport>;\n}\n\nexport const MailTransportFactory =\n    createAbstraction<IMailTransportFactory>(\"MailTransportFactory\");\n\nexport namespace MailTransportFactory {\n    export type Interface = IMailTransportFactory;\n    export type Return = Promise<IMailTransport>;\n}\n\nexport interface IActiveTransport {\n    name(): string | null;\n}\n\nexport const ActiveTransport = createAbstraction<IActiveTransport>(\"ActiveTransport\");\n\nexport namespace ActiveTransport {\n    export type Interface = IActiveTransport;\n}\n"],"names":["MailTransport","createAbstraction","MailTransportFactory","ActiveTransport"],"mappings":";AAQO,MAAMA,gBAAgBC,kBAAkC;AAYxD,MAAMC,uBACTD,kBAAyC;AAWtC,MAAME,kBAAkBF,kBAAoC"}
+{"version":3,"file":"domain/MailTransport/abstractions.js","sources":["../../../src/domain/MailTransport/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { TransportSendData, TransportSendResponse, TransportSettings } from \"~/types.js\";\n\nexport interface IMailTransport {\n    name: string;\n    send(params: TransportSendData): Promise<TransportSendResponse>;\n}\n\nexport const MailTransport = createAbstraction<IMailTransport>(\"MailTransport\");\n\nexport namespace MailTransport {\n    export type Interface = IMailTransport;\n    export type SendParams = TransportSendData;\n}\n\nexport interface IMailTransportFactory {\n    name: string;\n    canUse(settings: TransportSettings | null): boolean;\n    createTransport(settings: TransportSettings): Promise<IMailTransport>;\n}\n\nexport const MailTransportFactory =\n    createAbstraction<IMailTransportFactory>(\"MailTransportFactory\");\n\nexport namespace MailTransportFactory {\n    export type Interface = IMailTransportFactory;\n    export type Return = Promise<IMailTransport>;\n}\n"],"names":["MailTransport","createAbstraction","MailTransportFactory"],"mappings":";AAQO,MAAMA,gBAAgBC,kBAAkC;AAaxD,MAAMC,uBACTD,kBAAyC"}

package/domain/MailerService/abstractions.d.ts

@@ -1,9 +1,9 @@
 import { Result } from "@webiny/feature/api";
 import type { TransportSendData, TransportSendResponse } from "../../types.js";
-import { NoTransportAvailableError, NoSettingsConfiguredError, TransportSendError } from "./errors.js";
+import { NoTransportAvailableError, TransportCreateError, TransportSendError } from "./errors.js";
 export interface IMailerServiceErrors {
     noTransport: NoTransportAvailableError;
-    noSettings: NoSettingsConfiguredError;
+    transportCreate: TransportCreateError;
     transportSend: TransportSendError;
 }
 type MailerServiceError = IMailerServiceErrors[keyof IMailerServiceErrors];

package/domain/MailerService/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain/MailerService/abstractions.js","sources":["../../../src/domain/MailerService/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { TransportSendData, TransportSendResponse } from \"~/types.js\";\nimport {\n    NoTransportAvailableError,\n    NoSettingsConfiguredError,\n    TransportSendError\n} from \"./errors.js\";\n\nexport interface IMailerServiceErrors {\n    noTransport: NoTransportAvailableError;\n    noSettings: NoSettingsConfiguredError;\n    transportSend: TransportSendError;\n}\n\ntype MailerServiceError = IMailerServiceErrors[keyof IMailerServiceErrors];\n\nexport interface IMailerService {\n    sendMail<T = any>(\n        data: TransportSendData\n    ): Promise<Result<TransportSendResponse<T>, MailerServiceError>>;\n}\n\nexport const MailerService = createAbstraction<IMailerService>(\"MailerService\");\n\nexport namespace MailerService {\n    export type Interface = IMailerService;\n    export type Return<T = any> = Promise<Result<TransportSendResponse<T>, MailerServiceError>>;\n    export type Error = MailerServiceError;\n}\n"],"names":["MailerService","createAbstraction"],"mappings":";AAuBO,MAAMA,gBAAgBC,kBAAkC"}
+{"version":3,"file":"domain/MailerService/abstractions.js","sources":["../../../src/domain/MailerService/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { TransportSendData, TransportSendResponse } from \"~/types.js\";\nimport { NoTransportAvailableError, TransportCreateError, TransportSendError } from \"./errors.js\";\n\nexport interface IMailerServiceErrors {\n    noTransport: NoTransportAvailableError;\n    transportCreate: TransportCreateError;\n    transportSend: TransportSendError;\n}\n\ntype MailerServiceError = IMailerServiceErrors[keyof IMailerServiceErrors];\n\nexport interface IMailerService {\n    sendMail<T = any>(\n        data: TransportSendData\n    ): Promise<Result<TransportSendResponse<T>, MailerServiceError>>;\n}\n\nexport const MailerService = createAbstraction<IMailerService>(\"MailerService\");\n\nexport namespace MailerService {\n    export type Interface = IMailerService;\n    export type Return<T = any> = Promise<Result<TransportSendResponse<T>, MailerServiceError>>;\n    export type Error = MailerServiceError;\n}\n"],"names":["MailerService","createAbstraction"],"mappings":";AAmBO,MAAMA,gBAAgBC,kBAAkC"}

package/domain/MailerService/errors.d.ts

@@ -8,6 +8,10 @@ export declare class NoSettingsConfiguredError extends BaseError {
     readonly code: "Mailer/MailerService/NoSettingsConfigured";
     constructor();
 }
+export declare class TransportCreateError extends BaseError {
+    readonly code: "Mailer/MailerService/TransportCreateError";
+    constructor(error: unknown);
+}
 export declare class TransportSendError extends BaseError<{
     error: TransportSendResponse["error"];
 }> {

package/domain/MailerService/errors.js

@@ -13,6 +13,13 @@ class NoSettingsConfiguredError extends BaseError {
         }), this.code = "Mailer/MailerService/NoSettingsConfigured";
     }
 }
+class TransportCreateError extends BaseError {
+    constructor(error){
+        super({
+            message: error instanceof Error ? error.message : String(error)
+        }), this.code = "Mailer/MailerService/TransportCreateError";
+    }
+}
 class TransportSendError extends BaseError {
     constructor(error){
         super({
@@ -23,6 +30,6 @@ class TransportSendError extends BaseError {
         }), this.code = "Mailer/MailerService/TransportSendError";
     }
 }
-export { NoSettingsConfiguredError, NoTransportAvailableError, TransportSendError };
+export { NoSettingsConfiguredError, NoTransportAvailableError, TransportCreateError, TransportSendError };
 
 //# sourceMappingURL=errors.js.map

package/domain/MailerService/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain/MailerService/errors.js","sources":["../../../src/domain/MailerService/errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\nimport type { TransportSendResponse } from \"~/types.js\";\n\nexport class NoTransportAvailableError extends BaseError {\n    override readonly code = \"Mailer/MailerService/NoTransportAvailable\" as const;\n\n    constructor() {\n        super({\n            message: \"There is no transport available.\"\n        });\n    }\n}\n\nexport class NoSettingsConfiguredError extends BaseError {\n    override readonly code = \"Mailer/MailerService/NoSettingsConfigured\" as const;\n\n    constructor() {\n        super({\n            message: \"No mailer settings are configured and no environment variables are set.\"\n        });\n    }\n}\n\nexport class TransportSendError extends BaseError<{ error: TransportSendResponse[\"error\"] }> {\n    override readonly code = \"Mailer/MailerService/TransportSendError\" as const;\n\n    constructor(error: NonNullable<TransportSendResponse[\"error\"]>) {\n        super({\n            message: error.message,\n            data: {\n                error\n            }\n        });\n    }\n}\n"],"names":["NoTransportAvailableError","BaseError","NoSettingsConfiguredError","TransportSendError","error"],"mappings":";AAGO,MAAMA,kCAAkCC;IAG3C,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMC,kCAAkCD;IAG3C,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAME,2BAA2BF;IAGpC,YAAYG,KAAkD,CAAE;QAC5D,KAAK,CAAC;YACF,SAASA,MAAM,OAAO;YACtB,MAAM;gBACFA;YACJ;QACJ,SARc,IAAI,GAAG;IASzB;AACJ"}
+{"version":3,"file":"domain/MailerService/errors.js","sources":["../../../src/domain/MailerService/errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\nimport type { TransportSendResponse } from \"~/types.js\";\n\nexport class NoTransportAvailableError extends BaseError {\n    override readonly code = \"Mailer/MailerService/NoTransportAvailable\" as const;\n\n    constructor() {\n        super({\n            message: \"There is no transport available.\"\n        });\n    }\n}\n\nexport class NoSettingsConfiguredError extends BaseError {\n    override readonly code = \"Mailer/MailerService/NoSettingsConfigured\" as const;\n\n    constructor() {\n        super({\n            message: \"No mailer settings are configured and no environment variables are set.\"\n        });\n    }\n}\n\nexport class TransportCreateError extends BaseError {\n    override readonly code = \"Mailer/MailerService/TransportCreateError\" as const;\n\n    constructor(error: unknown) {\n        super({\n            message: error instanceof Error ? error.message : String(error)\n        });\n    }\n}\n\nexport class TransportSendError extends BaseError<{ error: TransportSendResponse[\"error\"] }> {\n    override readonly code = \"Mailer/MailerService/TransportSendError\" as const;\n\n    constructor(error: NonNullable<TransportSendResponse[\"error\"]>) {\n        super({\n            message: error.message,\n            data: {\n                error\n            }\n        });\n    }\n}\n"],"names":["NoTransportAvailableError","BaseError","NoSettingsConfiguredError","TransportCreateError","error","Error","String","TransportSendError"],"mappings":";AAGO,MAAMA,kCAAkCC;IAG3C,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMC,kCAAkCD;IAG3C,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAME,6BAA6BF;IAGtC,YAAYG,KAAc,CAAE;QACxB,KAAK,CAAC;YACF,SAASA,iBAAiBC,QAAQD,MAAM,OAAO,GAAGE,OAAOF;QAC7D,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMG,2BAA2BN;IAGpC,YAAYG,KAAkD,CAAE;QAC5D,KAAK,CAAC;YACF,SAASA,MAAM,OAAO;YACtB,MAAM;gBACFA;YACJ;QACJ,SARc,IAAI,GAAG;IASzB;AACJ"}

package/features/DummyTransport/DummyMailTransportFactory.d.ts

@@ -1,6 +1,7 @@
 import { type IMailTransport, MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
 declare class DummyMailTransportFactoryImpl implements MailTransportFactory.Interface {
     readonly name = "Mailer/DummyTransport";
+    canUse(): boolean;
     createTransport(): Promise<IMailTransport>;
 }
 export declare const DummyMailTransportFactory: typeof DummyMailTransportFactoryImpl & {

package/features/DummyTransport/DummyMailTransportFactory.js

@@ -1,6 +1,9 @@
 import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
 import { DummyMailTransport } from "./DummyMailTransport.js";
 class DummyMailTransportFactoryImpl {
+    canUse() {
+        return true;
+    }
     async createTransport() {
         return new DummyMailTransport();
     }

package/features/DummyTransport/DummyMailTransportFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/DummyTransport/DummyMailTransportFactory.js","sources":["../../../src/features/DummyTransport/DummyMailTransportFactory.ts"],"sourcesContent":["import { type IMailTransport, MailTransportFactory } from \"~/domain/MailTransport/abstractions.js\";\nimport { DummyMailTransport } from \"./DummyMailTransport.js\";\n\nclass DummyMailTransportFactoryImpl implements MailTransportFactory.Interface {\n    public readonly name = \"Mailer/DummyTransport\";\n\n    async createTransport(): Promise<IMailTransport> {\n        return new DummyMailTransport();\n    }\n}\n\nexport const DummyMailTransportFactory = MailTransportFactory.createImplementation({\n    implementation: DummyMailTransportFactoryImpl,\n    dependencies: []\n});\n"],"names":["DummyMailTransportFactoryImpl","DummyMailTransport","DummyMailTransportFactory","MailTransportFactory"],"mappings":";;AAGA,MAAMA;IAGF,MAAM,kBAA2C;QAC7C,OAAO,IAAIC;IACf;;aAJgB,IAAI,GAAG;;AAK3B;AAEO,MAAMC,4BAA4BC,qBAAqB,oBAAoB,CAAC;IAC/E,gBAAgBH;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/DummyTransport/DummyMailTransportFactory.js","sources":["../../../src/features/DummyTransport/DummyMailTransportFactory.ts"],"sourcesContent":["import { type IMailTransport, MailTransportFactory } from \"~/domain/MailTransport/abstractions.js\";\nimport { DummyMailTransport } from \"./DummyMailTransport.js\";\n\nclass DummyMailTransportFactoryImpl implements MailTransportFactory.Interface {\n    public readonly name = \"Mailer/DummyTransport\";\n\n    canUse(): boolean {\n        return true;\n    }\n\n    async createTransport(): Promise<IMailTransport> {\n        return new DummyMailTransport();\n    }\n}\n\nexport const DummyMailTransportFactory = MailTransportFactory.createImplementation({\n    implementation: DummyMailTransportFactoryImpl,\n    dependencies: []\n});\n"],"names":["DummyMailTransportFactoryImpl","DummyMailTransport","DummyMailTransportFactory","MailTransportFactory"],"mappings":";;AAGA,MAAMA;IAGF,SAAkB;QACd,OAAO;IACX;IAEA,MAAM,kBAA2C;QAC7C,OAAO,IAAIC;IACf;;aARgB,IAAI,GAAG;;AAS3B;AAEO,MAAMC,4BAA4BC,qBAAqB,oBAAoB,CAAC;IAC/E,gBAAgBH;IAChB,cAAc,EAAE;AACpB"}

package/features/GetSettings/GetSettingsRepository.js

@@ -26,10 +26,12 @@ class GetSettingsRepositoryImpl {
             settings: null,
             source: null
         });
-        const password = settings.password ? this.encryption.decrypt(String(settings.password)) : "";
+        const password = settings.password ? await this.encryption.decrypt(String(settings.password)) : "";
+        const port = Number(settings.port || 587);
         const transportSettings = {
             host: String(settings.host || ""),
-            port: Number(settings.port || 25),
+            port,
+            secure: settings.secure ?? 465 === port,
             user: String(settings.user || ""),
             password,
             from: String(settings.from || ""),

package/features/GetSettings/GetSettingsRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/GetSettings/GetSettingsRepository.js","sources":["../../../src/features/GetSettings/GetSettingsRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { Encryption } from \"@webiny/api-core/features/encryption/index.js\";\nimport { KeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { GetSettingsRepository, type ISettingsWithSource } from \"./abstractions.js\";\nimport { CodeMailerSettings } from \"~/domain/CodeMailerSettings/abstractions.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport { MAILER_TRANSPORT_SETTINGS } from \"~/constants.js\";\n\nclass GetSettingsRepositoryImpl implements GetSettingsRepository.Interface {\n    constructor(\n        private keyValueStore: KeyValueStore.Interface,\n        private encryption: Encryption.Interface,\n        private codeSettings: CodeMailerSettings.Interface\n    ) {}\n\n    async get(transportName: string): Promise<Result<ISettingsWithSource>> {\n        // Code-defined settings win over the KV store.\n        const codeSettingsValue = this.codeSettings.get(transportName);\n        if (codeSettingsValue !== null) {\n            return Result.ok({\n                settings: codeSettingsValue,\n                source: \"code\"\n            });\n        }\n\n        const result = await this.keyValueStore.get<TransportSettings>(MAILER_TRANSPORT_SETTINGS);\n\n        if (result.isFail()) {\n            return Result.ok({ settings: null, source: null });\n        }\n\n        const settings = result.value;\n        if (!settings) {\n            return Result.ok({ settings: null, source: null });\n        }\n\n        // Decrypt password if present.\n        const password = settings.password\n            ? this.encryption.decrypt(String(settings.password))\n            : \"\";\n\n        const transportSettings: TransportSettings = {\n            host: String(settings.host || \"\"),\n            port: Number(settings.port || 25),\n            user: String(settings.user || \"\"),\n            password,\n            from: String(settings.from || \"\"),\n            replyTo: settings.replyTo ? String(settings.replyTo) : undefined\n        };\n\n        return Result.ok({ settings: transportSettings, source: \"storage\" });\n    }\n}\n\nexport const GetSettingsRepositoryImplementation = GetSettingsRepository.createImplementation({\n    implementation: GetSettingsRepositoryImpl,\n    dependencies: [KeyValueStore, Encryption, CodeMailerSettings]\n});\n"],"names":["GetSettingsRepositoryImpl","keyValueStore","encryption","codeSettings","transportName","codeSettingsValue","Result","result","MAILER_TRANSPORT_SETTINGS","settings","password","String","transportSettings","Number","undefined","GetSettingsRepositoryImplementation","GetSettingsRepository","KeyValueStore","Encryption","CodeMailerSettings"],"mappings":";;;;;;AAQA,MAAMA;IACF,YACYC,aAAsC,EACtCC,UAAgC,EAChCC,YAA0C,CACpD;aAHUF,aAAa,GAAbA;aACAC,UAAU,GAAVA;aACAC,YAAY,GAAZA;IACT;IAEH,MAAM,IAAIC,aAAqB,EAAwC;QAEnE,MAAMC,oBAAoB,IAAI,CAAC,YAAY,CAAC,GAAG,CAACD;QAChD,IAAIC,AAAsB,SAAtBA,mBACA,OAAOC,OAAO,EAAE,CAAC;YACb,UAAUD;YACV,QAAQ;QACZ;QAGJ,MAAME,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAoBC;QAE/D,IAAID,OAAO,MAAM,IACb,OAAOD,OAAO,EAAE,CAAC;YAAE,UAAU;YAAM,QAAQ;QAAK;QAGpD,MAAMG,WAAWF,OAAO,KAAK;QAC7B,IAAI,CAACE,UACD,OAAOH,OAAO,EAAE,CAAC;YAAE,UAAU;YAAM,QAAQ;QAAK;QAIpD,MAAMI,WAAWD,SAAS,QAAQ,GAC5B,IAAI,CAAC,UAAU,CAAC,OAAO,CAACE,OAAOF,SAAS,QAAQ,KAChD;QAEN,MAAMG,oBAAuC;YACzC,MAAMD,OAAOF,SAAS,IAAI,IAAI;YAC9B,MAAMI,OAAOJ,SAAS,IAAI,IAAI;YAC9B,MAAME,OAAOF,SAAS,IAAI,IAAI;YAC9BC;YACA,MAAMC,OAAOF,SAAS,IAAI,IAAI;YAC9B,SAASA,SAAS,OAAO,GAAGE,OAAOF,SAAS,OAAO,IAAIK;QAC3D;QAEA,OAAOR,OAAO,EAAE,CAAC;YAAE,UAAUM;YAAmB,QAAQ;QAAU;IACtE;AACJ;AAEO,MAAMG,sCAAsCC,sBAAsB,oBAAoB,CAAC;IAC1F,gBAAgBhB;IAChB,cAAc;QAACiB;QAAeC;QAAYC;KAAmB;AACjE"}
+{"version":3,"file":"features/GetSettings/GetSettingsRepository.js","sources":["../../../src/features/GetSettings/GetSettingsRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { Encryption } from \"@webiny/api-core/features/encryption/index.js\";\nimport { KeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { GetSettingsRepository, type ISettingsWithSource } from \"./abstractions.js\";\nimport { CodeMailerSettings } from \"~/domain/CodeMailerSettings/abstractions.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport { MAILER_TRANSPORT_SETTINGS } from \"~/constants.js\";\n\nclass GetSettingsRepositoryImpl implements GetSettingsRepository.Interface {\n    constructor(\n        private keyValueStore: KeyValueStore.Interface,\n        private encryption: Encryption.Interface,\n        private codeSettings: CodeMailerSettings.Interface\n    ) {}\n\n    async get(transportName: string): Promise<Result<ISettingsWithSource>> {\n        // Code-defined settings win over the KV store.\n        const codeSettingsValue = this.codeSettings.get(transportName);\n        if (codeSettingsValue !== null) {\n            return Result.ok({\n                settings: codeSettingsValue,\n                source: \"code\"\n            });\n        }\n\n        const result = await this.keyValueStore.get<TransportSettings>(MAILER_TRANSPORT_SETTINGS);\n\n        if (result.isFail()) {\n            return Result.ok({ settings: null, source: null });\n        }\n\n        const settings = result.value;\n        if (!settings) {\n            return Result.ok({ settings: null, source: null });\n        }\n\n        // Decrypt password if present.\n        const password = settings.password\n            ? await this.encryption.decrypt(String(settings.password))\n            : \"\";\n\n        const port = Number(settings.port || 587);\n\n        const transportSettings: TransportSettings = {\n            host: String(settings.host || \"\"),\n            port,\n            secure: settings.secure ?? port === 465,\n            user: String(settings.user || \"\"),\n            password,\n            from: String(settings.from || \"\"),\n            replyTo: settings.replyTo ? String(settings.replyTo) : undefined\n        };\n\n        return Result.ok({ settings: transportSettings, source: \"storage\" });\n    }\n}\n\nexport const GetSettingsRepositoryImplementation = GetSettingsRepository.createImplementation({\n    implementation: GetSettingsRepositoryImpl,\n    dependencies: [KeyValueStore, Encryption, CodeMailerSettings]\n});\n"],"names":["GetSettingsRepositoryImpl","keyValueStore","encryption","codeSettings","transportName","codeSettingsValue","Result","result","MAILER_TRANSPORT_SETTINGS","settings","password","String","port","Number","transportSettings","undefined","GetSettingsRepositoryImplementation","GetSettingsRepository","KeyValueStore","Encryption","CodeMailerSettings"],"mappings":";;;;;;AAQA,MAAMA;IACF,YACYC,aAAsC,EACtCC,UAAgC,EAChCC,YAA0C,CACpD;aAHUF,aAAa,GAAbA;aACAC,UAAU,GAAVA;aACAC,YAAY,GAAZA;IACT;IAEH,MAAM,IAAIC,aAAqB,EAAwC;QAEnE,MAAMC,oBAAoB,IAAI,CAAC,YAAY,CAAC,GAAG,CAACD;QAChD,IAAIC,AAAsB,SAAtBA,mBACA,OAAOC,OAAO,EAAE,CAAC;YACb,UAAUD;YACV,QAAQ;QACZ;QAGJ,MAAME,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAoBC;QAE/D,IAAID,OAAO,MAAM,IACb,OAAOD,OAAO,EAAE,CAAC;YAAE,UAAU;YAAM,QAAQ;QAAK;QAGpD,MAAMG,WAAWF,OAAO,KAAK;QAC7B,IAAI,CAACE,UACD,OAAOH,OAAO,EAAE,CAAC;YAAE,UAAU;YAAM,QAAQ;QAAK;QAIpD,MAAMI,WAAWD,SAAS,QAAQ,GAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACE,OAAOF,SAAS,QAAQ,KACtD;QAEN,MAAMG,OAAOC,OAAOJ,SAAS,IAAI,IAAI;QAErC,MAAMK,oBAAuC;YACzC,MAAMH,OAAOF,SAAS,IAAI,IAAI;YAC9BG;YACA,QAAQH,SAAS,MAAM,IAAIG,AAAS,QAATA;YAC3B,MAAMD,OAAOF,SAAS,IAAI,IAAI;YAC9BC;YACA,MAAMC,OAAOF,SAAS,IAAI,IAAI;YAC9B,SAASA,SAAS,OAAO,GAAGE,OAAOF,SAAS,OAAO,IAAIM;QAC3D;QAEA,OAAOT,OAAO,EAAE,CAAC;YAAE,UAAUQ;YAAmB,QAAQ;QAAU;IACtE;AACJ;AAEO,MAAME,sCAAsCC,sBAAsB,oBAAoB,CAAC;IAC1F,gBAAgBjB;IAChB,cAAc;QAACkB;QAAeC;QAAYC;KAAmB;AACjE"}

package/features/MailerService/MailerService.d.ts

@@ -1,14 +1,13 @@
 import { MailerService as Abstraction } from "../../domain/MailerService/abstractions.js";
-import { ActiveTransport, MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
+import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
 import { GetSettingsRepository } from "../GetSettings/abstractions.js";
 import type { TransportSendData } from "../../types.js";
 declare class MailerServiceImpl implements Abstraction.Interface {
     private getSettingsRepository;
-    private activeTransport;
     private transportFactories;
-    constructor(getSettingsRepository: GetSettingsRepository.Interface, activeTransport: ActiveTransport.Interface, transportFactories: MailTransportFactory.Interface[]);
+    constructor(getSettingsRepository: GetSettingsRepository.Interface, transportFactories: MailTransportFactory.Interface[]);
     sendMail<T = any>(data: TransportSendData): Abstraction.Return<T>;
-    private getTransport;
+    private resolveTransport;
 }
 export declare const MailerService: typeof MailerServiceImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("~/domain/MailerService/abstractions.js").IMailerService>;

package/features/MailerService/MailerService.js

@@ -1,22 +1,16 @@
 import { Result } from "@webiny/feature/api";
 import { MailerService } from "../../domain/MailerService/abstractions.js";
-import { NoSettingsConfiguredError, NoTransportAvailableError, TransportSendError } from "../../domain/MailerService/errors.js";
-import { ActiveTransport, MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
+import { NoTransportAvailableError, TransportCreateError, TransportSendError } from "../../domain/MailerService/errors.js";
+import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
 import { GetSettingsRepository } from "../GetSettings/abstractions.js";
 class MailerServiceImpl {
-    constructor(getSettingsRepository, activeTransport, transportFactories){
+    constructor(getSettingsRepository, transportFactories){
         this.getSettingsRepository = getSettingsRepository;
-        this.activeTransport = activeTransport;
         this.transportFactories = transportFactories;
     }
     async sendMail(data) {
-        const transportName = this.activeTransport.name();
-        if (!transportName) return Result.fail(new NoTransportAvailableError());
-        const result = await this.getSettingsRepository.get(transportName);
-        const { settings } = result.value;
-        if (!settings) return Result.fail(new NoSettingsConfiguredError());
-        const transport = await this.getTransport(transportName, settings);
-        if (!transport) return Result.fail(new NoTransportAvailableError());
+        const { factory, transport } = await this.resolveTransport();
+        if (!factory || !transport) return Result.fail(new NoTransportAvailableError());
         try {
             const response = await transport.send(data);
             if (response.error) return Result.fail(new TransportSendError(response.error));
@@ -25,17 +19,33 @@ class MailerServiceImpl {
             return Result.fail(new TransportSendError(error));
         }
     }
-    async getTransport(transportName, settings) {
-        const factory = this.transportFactories.find((f)=>f.name === transportName);
-        if (!factory) return null;
-        return factory.createTransport(settings);
+    async resolveTransport() {
+        const factories = [
+            ...this.transportFactories
+        ].reverse();
+        for (const factory of factories){
+            const result = await this.getSettingsRepository.get(factory.name);
+            const { settings } = result.value;
+            if (factory.canUse(settings)) try {
+                const transport = await factory.createTransport(settings);
+                return {
+                    factory,
+                    transport
+                };
+            } catch (error) {
+                throw new TransportCreateError(error);
+            }
+        }
+        return {
+            factory: null,
+            transport: null
+        };
     }
 }
 const MailerService_MailerService = MailerService.createImplementation({
     implementation: MailerServiceImpl,
     dependencies: [
         GetSettingsRepository,
-        ActiveTransport,
         [
             MailTransportFactory,
             {

package/features/MailerService/MailerService.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/MailerService/MailerService.js","sources":["../../../src/features/MailerService/MailerService.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { MailerService as Abstraction } from \"~/domain/MailerService/abstractions.js\";\nimport {\n    NoTransportAvailableError,\n    NoSettingsConfiguredError,\n    TransportSendError\n} from \"~/domain/MailerService/errors.js\";\nimport {\n    ActiveTransport,\n    MailTransport,\n    MailTransportFactory\n} from \"~/domain/MailTransport/abstractions.js\";\nimport { GetSettingsRepository } from \"../GetSettings/abstractions.js\";\nimport type { TransportSettings, TransportSendData } from \"~/types.js\";\n\nclass MailerServiceImpl implements Abstraction.Interface {\n    constructor(\n        private getSettingsRepository: GetSettingsRepository.Interface,\n        private activeTransport: ActiveTransport.Interface,\n        private transportFactories: MailTransportFactory.Interface[]\n    ) {}\n\n    async sendMail<T = any>(data: TransportSendData): Abstraction.Return<T> {\n        const transportName = this.activeTransport.name();\n\n        if (!transportName) {\n            return Result.fail(new NoTransportAvailableError());\n        }\n\n        const result = await this.getSettingsRepository.get(transportName);\n        const { settings } = result.value;\n\n        if (!settings) {\n            return Result.fail(new NoSettingsConfiguredError());\n        }\n\n        const transport = await this.getTransport(transportName, settings);\n\n        if (!transport) {\n            return Result.fail(new NoTransportAvailableError());\n        }\n\n        try {\n            const response = await transport.send(data);\n\n            if (response.error) {\n                return Result.fail(new TransportSendError(response.error));\n            }\n\n            return Result.ok(response);\n        } catch (error) {\n            return Result.fail(new TransportSendError(error));\n        }\n    }\n\n    private async getTransport(\n        transportName: string,\n        settings: TransportSettings\n    ): Promise<MailTransport.Interface | null> {\n        const factory = this.transportFactories.find(f => f.name === transportName);\n        if (!factory) {\n            return null;\n        }\n        return factory.createTransport(settings);\n    }\n}\n\nexport const MailerService = Abstraction.createImplementation({\n    implementation: MailerServiceImpl,\n    dependencies: [\n        GetSettingsRepository,\n        ActiveTransport,\n        [MailTransportFactory, { multiple: true }]\n    ]\n});\n"],"names":["MailerServiceImpl","getSettingsRepository","activeTransport","transportFactories","data","transportName","Result","NoTransportAvailableError","result","settings","NoSettingsConfiguredError","transport","response","TransportSendError","error","factory","f","MailerService","Abstraction","GetSettingsRepository","ActiveTransport","MailTransportFactory"],"mappings":";;;;;AAeA,MAAMA;IACF,YACYC,qBAAsD,EACtDC,eAA0C,EAC1CC,kBAAoD,CAC9D;aAHUF,qBAAqB,GAArBA;aACAC,eAAe,GAAfA;aACAC,kBAAkB,GAAlBA;IACT;IAEH,MAAM,SAAkBC,IAAuB,EAAyB;QACpE,MAAMC,gBAAgB,IAAI,CAAC,eAAe,CAAC,IAAI;QAE/C,IAAI,CAACA,eACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,SAAS,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAACH;QACpD,MAAM,EAAEI,QAAQ,EAAE,GAAGD,OAAO,KAAK;QAEjC,IAAI,CAACC,UACD,OAAOH,OAAO,IAAI,CAAC,IAAII;QAG3B,MAAMC,YAAY,MAAM,IAAI,CAAC,YAAY,CAACN,eAAeI;QAEzD,IAAI,CAACE,WACD,OAAOL,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YACA,MAAMK,WAAW,MAAMD,UAAU,IAAI,CAACP;YAEtC,IAAIQ,SAAS,KAAK,EACd,OAAON,OAAO,IAAI,CAAC,IAAIO,mBAAmBD,SAAS,KAAK;YAG5D,OAAON,OAAO,EAAE,CAACM;QACrB,EAAE,OAAOE,OAAO;YACZ,OAAOR,OAAO,IAAI,CAAC,IAAIO,mBAAmBC;QAC9C;IACJ;IAEA,MAAc,aACVT,aAAqB,EACrBI,QAA2B,EACY;QACvC,MAAMM,UAAU,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAACC,CAAAA,IAAKA,EAAE,IAAI,KAAKX;QAC7D,IAAI,CAACU,SACD,OAAO;QAEX,OAAOA,QAAQ,eAAe,CAACN;IACnC;AACJ;AAEO,MAAMQ,8BAAgBC,cAAAA,oBAAgC,CAAC;IAC1D,gBAAgBlB;IAChB,cAAc;QACVmB;QACAC;QACA;YAACC;YAAsB;gBAAE,UAAU;YAAK;SAAE;KAC7C;AACL"}
+{"version":3,"file":"features/MailerService/MailerService.js","sources":["../../../src/features/MailerService/MailerService.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { MailerService as Abstraction } from \"~/domain/MailerService/abstractions.js\";\nimport {\n    NoTransportAvailableError,\n    TransportCreateError,\n    TransportSendError\n} from \"~/domain/MailerService/errors.js\";\nimport { MailTransport, MailTransportFactory } from \"~/domain/MailTransport/abstractions.js\";\nimport { GetSettingsRepository } from \"../GetSettings/abstractions.js\";\nimport type { TransportSendData } from \"~/types.js\";\n\nclass MailerServiceImpl implements Abstraction.Interface {\n    constructor(\n        private getSettingsRepository: GetSettingsRepository.Interface,\n        private transportFactories: MailTransportFactory.Interface[]\n    ) {}\n\n    async sendMail<T = any>(data: TransportSendData): Abstraction.Return<T> {\n        const { factory, transport } = await this.resolveTransport();\n\n        if (!factory || !transport) {\n            return Result.fail(new NoTransportAvailableError());\n        }\n\n        try {\n            const response = await transport.send(data);\n\n            if (response.error) {\n                return Result.fail(new TransportSendError(response.error));\n            }\n\n            return Result.ok(response);\n        } catch (error) {\n            return Result.fail(new TransportSendError(error));\n        }\n    }\n\n    private async resolveTransport(): Promise<{\n        factory: MailTransportFactory.Interface | null;\n        transport: MailTransport.Interface | null;\n    }> {\n        const factories = [...this.transportFactories].reverse();\n\n        for (const factory of factories) {\n            const result = await this.getSettingsRepository.get(factory.name);\n            const { settings } = result.value;\n\n            if (!factory.canUse(settings)) {\n                continue;\n            }\n\n            try {\n                const transport = await factory.createTransport(settings!);\n                return { factory, transport };\n            } catch (error) {\n                throw new TransportCreateError(error);\n            }\n        }\n\n        return { factory: null, transport: null };\n    }\n}\n\nexport const MailerService = Abstraction.createImplementation({\n    implementation: MailerServiceImpl,\n    dependencies: [GetSettingsRepository, [MailTransportFactory, { multiple: true }]]\n});\n"],"names":["MailerServiceImpl","getSettingsRepository","transportFactories","data","factory","transport","Result","NoTransportAvailableError","response","TransportSendError","error","factories","result","settings","TransportCreateError","MailerService","Abstraction","GetSettingsRepository","MailTransportFactory"],"mappings":";;;;;AAWA,MAAMA;IACF,YACYC,qBAAsD,EACtDC,kBAAoD,CAC9D;aAFUD,qBAAqB,GAArBA;aACAC,kBAAkB,GAAlBA;IACT;IAEH,MAAM,SAAkBC,IAAuB,EAAyB;QACpE,MAAM,EAAEC,OAAO,EAAEC,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB;QAE1D,IAAI,CAACD,WAAW,CAACC,WACb,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YACA,MAAMC,WAAW,MAAMH,UAAU,IAAI,CAACF;YAEtC,IAAIK,SAAS,KAAK,EACd,OAAOF,OAAO,IAAI,CAAC,IAAIG,mBAAmBD,SAAS,KAAK;YAG5D,OAAOF,OAAO,EAAE,CAACE;QACrB,EAAE,OAAOE,OAAO;YACZ,OAAOJ,OAAO,IAAI,CAAC,IAAIG,mBAAmBC;QAC9C;IACJ;IAEA,MAAc,mBAGX;QACC,MAAMC,YAAY;eAAI,IAAI,CAAC,kBAAkB;SAAC,CAAC,OAAO;QAEtD,KAAK,MAAMP,WAAWO,UAAW;YAC7B,MAAMC,SAAS,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAACR,QAAQ,IAAI;YAChE,MAAM,EAAES,QAAQ,EAAE,GAAGD,OAAO,KAAK;YAEjC,IAAKR,QAAQ,MAAM,CAACS,WAIpB,IAAI;gBACA,MAAMR,YAAY,MAAMD,QAAQ,eAAe,CAACS;gBAChD,OAAO;oBAAET;oBAASC;gBAAU;YAChC,EAAE,OAAOK,OAAO;gBACZ,MAAM,IAAII,qBAAqBJ;YACnC;QACJ;QAEA,OAAO;YAAE,SAAS;YAAM,WAAW;QAAK;IAC5C;AACJ;AAEO,MAAMK,8BAAgBC,cAAAA,oBAAgC,CAAC;IAC1D,gBAAgBhB;IAChB,cAAc;QAACiB;QAAuB;YAACC;YAAsB;gBAAE,UAAU;YAAK;SAAE;KAAC;AACrF"}

package/features/MailerService/feature.js

@@ -1,10 +1,8 @@
 import { createFeature } from "@webiny/feature/api";
 import { MailerService } from "./MailerService.js";
-import { ActiveTransport } from "./ActiveTransport.js";
 const MailerServiceFeature = createFeature({
     name: "Mailer/MailerService",
     register (container) {
-        container.register(ActiveTransport).inSingletonScope();
         container.register(MailerService).inSingletonScope();
     }
 });

package/features/MailerService/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/MailerService/feature.js","sources":["../../../src/features/MailerService/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { MailerService } from \"./MailerService.js\";\nimport { ActiveTransport } from \"./ActiveTransport.js\";\n\nexport const MailerServiceFeature = createFeature({\n    name: \"Mailer/MailerService\",\n    register(container) {\n        container.register(ActiveTransport).inSingletonScope();\n        container.register(MailerService).inSingletonScope();\n    }\n});\n"],"names":["MailerServiceFeature","createFeature","container","ActiveTransport","MailerService"],"mappings":";;;AAIO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,iBAAiB,gBAAgB;QACpDD,UAAU,QAAQ,CAACE,eAAe,gBAAgB;IACtD;AACJ"}
+{"version":3,"file":"features/MailerService/feature.js","sources":["../../../src/features/MailerService/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { MailerService } from \"./MailerService.js\";\n\nexport const MailerServiceFeature = createFeature({\n    name: \"Mailer/MailerService\",\n    register(container) {\n        container.register(MailerService).inSingletonScope();\n    }\n});\n"],"names":["MailerServiceFeature","createFeature","container","MailerService"],"mappings":";;AAGO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,eAAe,gBAAgB;IACtD;AACJ"}

package/features/SaveSettings/SaveSettingsRepository.js

@@ -4,7 +4,7 @@ import { SaveSettingsRepository } from "./abstractions.js";
 import { SettingsPersistenceError } from "../../domain/errors.js";
 import { KeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
 import { MAILER_TRANSPORT_SETTINGS } from "../../constants.js";
-const DEFAULT_PORT = 25;
+const DEFAULT_PORT = 587;
 class SaveSettingsRepositoryImpl {
     constructor(keyValueStore, encryption){
         this.keyValueStore = keyValueStore;
@@ -15,11 +15,13 @@ class SaveSettingsRepositoryImpl {
         const existingSettings = existingResult.isOk() ? existingResult.value : null;
         const transportSettings = existingSettings ?? {};
         let passwordToStore = input.password || "";
-        if (!input.password && existingSettings) passwordToStore = this.encryption.decrypt(transportSettings.password || "");
-        const encryptedPassword = this.encryption.encrypt(passwordToStore);
+        if (!input.password && existingSettings) passwordToStore = await this.encryption.decrypt(transportSettings.password || "");
+        const encryptedPassword = await this.encryption.encrypt(passwordToStore);
+        const port = input.port ?? transportSettings.port ?? DEFAULT_PORT;
         const data = {
             host: input.host ?? transportSettings.host,
-            port: input.port ?? transportSettings.port ?? DEFAULT_PORT,
+            port,
+            secure: input.secure ?? transportSettings.secure ?? 465 === port,
             user: input.user ?? transportSettings.user,
             password: encryptedPassword,
             from: input.from ?? transportSettings.from,

package/features/SaveSettings/SaveSettingsRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/SaveSettings/SaveSettingsRepository.js","sources":["../../../src/features/SaveSettings/SaveSettingsRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { Encryption } from \"@webiny/api-core/features/encryption/index.js\";\nimport { SaveSettingsRepository, type SaveSettingsInput } from \"./abstractions.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport { SettingsPersistenceError } from \"~/domain/errors.js\";\nimport { KeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { MAILER_TRANSPORT_SETTINGS } from \"~/constants.js\";\n\nconst DEFAULT_PORT = 25;\n\nclass SaveSettingsRepositoryImpl implements SaveSettingsRepository.Interface {\n    constructor(\n        private keyValueStore: KeyValueStore.Interface,\n        private encryption: Encryption.Interface\n    ) {}\n\n    async execute(input: SaveSettingsInput): SaveSettingsRepository.Return {\n        // Check if settings exist\n        const existingResult =\n            await this.keyValueStore.get<TransportSettings>(MAILER_TRANSPORT_SETTINGS);\n        const existingSettings = existingResult.isOk() ? existingResult.value : null;\n        const transportSettings: Partial<TransportSettings> = existingSettings ?? {};\n\n        // If updating and no password provided, keep the existing password\n        let passwordToStore = input.password || \"\";\n        if (!input.password && existingSettings) {\n            passwordToStore = this.encryption.decrypt(transportSettings.password || \"\");\n        }\n\n        // Encrypt password\n        const encryptedPassword = this.encryption.encrypt(passwordToStore);\n\n        // Prepare data\n        const data = {\n            host: input.host ?? transportSettings.host,\n            port: input.port ?? transportSettings.port ?? DEFAULT_PORT,\n            user: input.user ?? transportSettings.user,\n            password: encryptedPassword,\n            from: input.from ?? transportSettings.from,\n            replyTo: input.replyTo ?? transportSettings.replyTo\n        };\n\n        // Save settings.\n        const result = await this.keyValueStore.set(MAILER_TRANSPORT_SETTINGS, data);\n\n        if (result.isFail()) {\n            return Result.fail(new SettingsPersistenceError(result.error));\n        }\n\n        // Return the stored state without the password. Callers that need the\n        // plaintext password go through GetSettingsRepository.get(transportName).\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { password: _password, ...savedSettings } = data as TransportSettings;\n        return Result.ok(savedSettings);\n    }\n}\n\nexport const SaveSettingsRepositoryImplementation = SaveSettingsRepository.createImplementation({\n    implementation: SaveSettingsRepositoryImpl,\n    dependencies: [KeyValueStore, Encryption]\n});\n"],"names":["DEFAULT_PORT","SaveSettingsRepositoryImpl","keyValueStore","encryption","input","existingResult","MAILER_TRANSPORT_SETTINGS","existingSettings","transportSettings","passwordToStore","encryptedPassword","data","result","Result","SettingsPersistenceError","_password","savedSettings","SaveSettingsRepositoryImplementation","SaveSettingsRepository","KeyValueStore","Encryption"],"mappings":";;;;;;AAQA,MAAMA,eAAe;AAErB,MAAMC;IACF,YACYC,aAAsC,EACtCC,UAAgC,CAC1C;aAFUD,aAAa,GAAbA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,KAAwB,EAAiC;QAEnE,MAAMC,iBACF,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAoBC;QACpD,MAAMC,mBAAmBF,eAAe,IAAI,KAAKA,eAAe,KAAK,GAAG;QACxE,MAAMG,oBAAgDD,oBAAoB,CAAC;QAG3E,IAAIE,kBAAkBL,MAAM,QAAQ,IAAI;QACxC,IAAI,CAACA,MAAM,QAAQ,IAAIG,kBACnBE,kBAAkB,IAAI,CAAC,UAAU,CAAC,OAAO,CAACD,kBAAkB,QAAQ,IAAI;QAI5E,MAAME,oBAAoB,IAAI,CAAC,UAAU,CAAC,OAAO,CAACD;QAGlD,MAAME,OAAO;YACT,MAAMP,MAAM,IAAI,IAAII,kBAAkB,IAAI;YAC1C,MAAMJ,MAAM,IAAI,IAAII,kBAAkB,IAAI,IAAIR;YAC9C,MAAMI,MAAM,IAAI,IAAII,kBAAkB,IAAI;YAC1C,UAAUE;YACV,MAAMN,MAAM,IAAI,IAAII,kBAAkB,IAAI;YAC1C,SAASJ,MAAM,OAAO,IAAII,kBAAkB,OAAO;QACvD;QAGA,MAAMI,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAACN,2BAA2BK;QAEvE,IAAIC,OAAO,MAAM,IACb,OAAOC,OAAO,IAAI,CAAC,IAAIC,yBAAyBF,OAAO,KAAK;QAMhE,MAAM,EAAE,UAAUG,SAAS,EAAE,GAAGC,eAAe,GAAGL;QAClD,OAAOE,OAAO,EAAE,CAACG;IACrB;AACJ;AAEO,MAAMC,uCAAuCC,uBAAuB,oBAAoB,CAAC;IAC5F,gBAAgBjB;IAChB,cAAc;QAACkB;QAAeC;KAAW;AAC7C"}
+{"version":3,"file":"features/SaveSettings/SaveSettingsRepository.js","sources":["../../../src/features/SaveSettings/SaveSettingsRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { Encryption } from \"@webiny/api-core/features/encryption/index.js\";\nimport { SaveSettingsRepository, type SaveSettingsInput } from \"./abstractions.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport { SettingsPersistenceError } from \"~/domain/errors.js\";\nimport { KeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { MAILER_TRANSPORT_SETTINGS } from \"~/constants.js\";\n\nconst DEFAULT_PORT = 587;\n\nclass SaveSettingsRepositoryImpl implements SaveSettingsRepository.Interface {\n    constructor(\n        private keyValueStore: KeyValueStore.Interface,\n        private encryption: Encryption.Interface\n    ) {}\n\n    async execute(input: SaveSettingsInput): SaveSettingsRepository.Return {\n        // Check if settings exist\n        const existingResult =\n            await this.keyValueStore.get<TransportSettings>(MAILER_TRANSPORT_SETTINGS);\n        const existingSettings = existingResult.isOk() ? existingResult.value : null;\n        const transportSettings: Partial<TransportSettings> = existingSettings ?? {};\n\n        // If updating and no password provided, keep the existing password\n        let passwordToStore = input.password || \"\";\n        if (!input.password && existingSettings) {\n            passwordToStore = await this.encryption.decrypt(transportSettings.password || \"\");\n        }\n\n        // Encrypt password\n        const encryptedPassword = await this.encryption.encrypt(passwordToStore);\n\n        // Prepare data\n        const port = input.port ?? transportSettings.port ?? DEFAULT_PORT;\n\n        const data = {\n            host: input.host ?? transportSettings.host,\n            port,\n            secure: input.secure ?? transportSettings.secure ?? port === 465,\n            user: input.user ?? transportSettings.user,\n            password: encryptedPassword,\n            from: input.from ?? transportSettings.from,\n            replyTo: input.replyTo ?? transportSettings.replyTo\n        };\n\n        // Save settings.\n        const result = await this.keyValueStore.set(MAILER_TRANSPORT_SETTINGS, data);\n\n        if (result.isFail()) {\n            return Result.fail(new SettingsPersistenceError(result.error));\n        }\n\n        // Return the stored state without the password. Callers that need the\n        // plaintext password go through GetSettingsRepository.get(transportName).\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const { password: _password, ...savedSettings } = data as TransportSettings;\n        return Result.ok(savedSettings);\n    }\n}\n\nexport const SaveSettingsRepositoryImplementation = SaveSettingsRepository.createImplementation({\n    implementation: SaveSettingsRepositoryImpl,\n    dependencies: [KeyValueStore, Encryption]\n});\n"],"names":["DEFAULT_PORT","SaveSettingsRepositoryImpl","keyValueStore","encryption","input","existingResult","MAILER_TRANSPORT_SETTINGS","existingSettings","transportSettings","passwordToStore","encryptedPassword","port","data","result","Result","SettingsPersistenceError","_password","savedSettings","SaveSettingsRepositoryImplementation","SaveSettingsRepository","KeyValueStore","Encryption"],"mappings":";;;;;;AAQA,MAAMA,eAAe;AAErB,MAAMC;IACF,YACYC,aAAsC,EACtCC,UAAgC,CAC1C;aAFUD,aAAa,GAAbA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,KAAwB,EAAiC;QAEnE,MAAMC,iBACF,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAoBC;QACpD,MAAMC,mBAAmBF,eAAe,IAAI,KAAKA,eAAe,KAAK,GAAG;QACxE,MAAMG,oBAAgDD,oBAAoB,CAAC;QAG3E,IAAIE,kBAAkBL,MAAM,QAAQ,IAAI;QACxC,IAAI,CAACA,MAAM,QAAQ,IAAIG,kBACnBE,kBAAkB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACD,kBAAkB,QAAQ,IAAI;QAIlF,MAAME,oBAAoB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACD;QAGxD,MAAME,OAAOP,MAAM,IAAI,IAAII,kBAAkB,IAAI,IAAIR;QAErD,MAAMY,OAAO;YACT,MAAMR,MAAM,IAAI,IAAII,kBAAkB,IAAI;YAC1CG;YACA,QAAQP,MAAM,MAAM,IAAII,kBAAkB,MAAM,IAAIG,AAAS,QAATA;YACpD,MAAMP,MAAM,IAAI,IAAII,kBAAkB,IAAI;YAC1C,UAAUE;YACV,MAAMN,MAAM,IAAI,IAAII,kBAAkB,IAAI;YAC1C,SAASJ,MAAM,OAAO,IAAII,kBAAkB,OAAO;QACvD;QAGA,MAAMK,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAACP,2BAA2BM;QAEvE,IAAIC,OAAO,MAAM,IACb,OAAOC,OAAO,IAAI,CAAC,IAAIC,yBAAyBF,OAAO,KAAK;QAMhE,MAAM,EAAE,UAAUG,SAAS,EAAE,GAAGC,eAAe,GAAGL;QAClD,OAAOE,OAAO,EAAE,CAACG;IACrB;AACJ;AAEO,MAAMC,uCAAuCC,uBAAuB,oBAAoB,CAAC;IAC5F,gBAAgBlB;IAChB,cAAc;QAACmB;QAAeC;KAAW;AAC7C"}

package/features/SaveSettings/SaveSettingsUseCase.d.ts

@@ -1,15 +1,15 @@
-import { EventPublisher as EventPublisherAbstraction } from "@webiny/api-core/features/eventPublisher/index.js";
+import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
 import { SaveSettingsUseCase, SaveSettingsRepository, type SaveSettingsInput } from "./abstractions.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";
+import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
 declare class SaveSettingsUseCaseImpl implements SaveSettingsUseCase.Interface {
     private identityContext;
     private eventPublisher;
     private repository;
     private codeSettings;
-    private activeTransport;
-    constructor(identityContext: IdentityContext.Interface, eventPublisher: EventPublisherAbstraction.Interface, repository: SaveSettingsRepository.Interface, codeSettings: CodeMailerSettings.Interface, activeTransport: ActiveTransport.Interface);
+    private transportFactories;
+    constructor(identityContext: IdentityContext.Interface, eventPublisher: EventPublisher.Interface, repository: SaveSettingsRepository.Interface, codeSettings: CodeMailerSettings.Interface, transportFactories: MailTransportFactory.Interface[]);
     execute(input: SaveSettingsInput): SaveSettingsUseCase.Return;
 }
 export declare const SaveSettingsUseCaseImplementation: typeof SaveSettingsUseCaseImpl & {

package/features/SaveSettings/SaveSettingsUseCase.js

@@ -6,22 +6,22 @@ import { saveValidation } from "./validation.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";
+import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
 class SaveSettingsUseCaseImpl {
-    constructor(identityContext, eventPublisher, repository, codeSettings, activeTransport){
+    constructor(identityContext, eventPublisher, repository, codeSettings, transportFactories){
         this.identityContext = identityContext;
         this.eventPublisher = eventPublisher;
         this.repository = repository;
         this.codeSettings = codeSettings;
-        this.activeTransport = activeTransport;
+        this.transportFactories = transportFactories;
     }
     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 isLockedByCode = this.transportFactories.some((f)=>null !== this.codeSettings.get(f.name));
+        if (isLockedByCode) return Result.fail(new SettingsLockedByCode());
         const { password: _beforePassword, ...inputForEvent } = input;
         const beforeSaveEvent = new MailerSettingsBeforeSaveEvent({
             input: inputForEvent
@@ -43,7 +43,12 @@ const SaveSettingsUseCaseImplementation = SaveSettingsUseCase.createImplementati
         EventPublisher,
         SaveSettingsRepository,
         CodeMailerSettings,
-        ActiveTransport
+        [
+            MailTransportFactory,
+            {
+                multiple: true
+            }
+        ]
     ]
 });
 export { SaveSettingsUseCaseImplementation };

package/features/SaveSettings/SaveSettingsUseCase.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"features/SaveSettings/SaveSettingsUseCase.js","sources":["../../../src/features/SaveSettings/SaveSettingsUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { EventPublisher } 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 { MailTransportFactory } from \"~/domain/MailTransport/abstractions.js\";\n\nclass SaveSettingsUseCaseImpl implements SaveSettingsUseCase.Interface {\n    constructor(\n        private identityContext: IdentityContext.Interface,\n        private eventPublisher: EventPublisher.Interface,\n        private repository: SaveSettingsRepository.Interface,\n        private codeSettings: CodeMailerSettings.Interface,\n        private transportFactories: MailTransportFactory.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        const validationResult = saveValidation.safeParse(input);\n        if (!validationResult.success) {\n            return Result.fail(new SettingsValidationError(validationResult.error.issues));\n        }\n\n        /* Refuse when any registered transport has code-defined settings. */\n        const isLockedByCode = this.transportFactories.some(\n            f => this.codeSettings.get(f.name) !== null\n        );\n\n        if (isLockedByCode) {\n            return Result.fail(new SettingsLockedByCode());\n        }\n\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        const result = await this.repository.execute(input);\n\n        if (result.isFail()) {\n            return Result.fail(new SettingsPersistenceError(result.error));\n        }\n\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        [MailTransportFactory, { multiple: true }]\n    ]\n});\n"],"names":["SaveSettingsUseCaseImpl","identityContext","eventPublisher","repository","codeSettings","transportFactories","input","permission","Result","SettingsNotAuthorized","validationResult","saveValidation","SettingsValidationError","isLockedByCode","f","SettingsLockedByCode","_beforePassword","inputForEvent","beforeSaveEvent","MailerSettingsBeforeSaveEvent","result","SettingsPersistenceError","afterSaveEvent","MailerSettingsAfterSaveEvent","SaveSettingsUseCaseImplementation","SaveSettingsUseCase","IdentityContext","EventPublisher","SaveSettingsRepository","CodeMailerSettings","MailTransportFactory"],"mappings":";;;;;;;;;AAmBA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,cAAwC,EACxCC,UAA4C,EAC5CC,YAA0C,EAC1CC,kBAAoD,CAC9D;aALUJ,eAAe,GAAfA;aACAC,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,YAAY,GAAZA;aACAC,kBAAkB,GAAlBA;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;QAG3B,MAAMC,mBAAmBC,eAAe,SAAS,CAACL;QAClD,IAAI,CAACI,iBAAiB,OAAO,EACzB,OAAOF,OAAO,IAAI,CAAC,IAAII,wBAAwBF,iBAAiB,KAAK,CAAC,MAAM;QAIhF,MAAMG,iBAAiB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAC/CC,CAAAA,IAAK,AAAkC,SAAlC,IAAI,CAAC,YAAY,CAAC,GAAG,CAACA,EAAE,IAAI;QAGrC,IAAID,gBACA,OAAOL,OAAO,IAAI,CAAC,IAAIO;QAI3B,MAAM,EAAE,UAAUC,eAAe,EAAE,GAAGC,eAAe,GAAGX;QACxD,MAAMY,kBAAkB,IAAIC,8BAA8B;YAAE,OAAOF;QAAc;QACjF,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACC;QAElC,MAAME,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACd;QAE7C,IAAIc,OAAO,MAAM,IACb,OAAOZ,OAAO,IAAI,CAAC,IAAIa,yBAAyBD,OAAO,KAAK;QAGhE,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,gBAAgBzB;IAChB,cAAc;QACV0B;QACAC;QACAC;QACAC;QACA;YAACC;YAAsB;gBAAE,UAAU;YAAK;SAAE;KAC7C;AACL"}

package/features/SaveSettings/abstractions.d.ts

@@ -5,6 +5,7 @@ import { SettingsValidationError, SettingsPersistenceError, SettingsNotAuthorize
 export interface SaveSettingsInput {
     host: string;
     port?: number;
+    secure?: boolean;
     user: string;
     password?: string;
     from: string;

package/features/SaveSettings/abstractions.js.map

@@ -1 +1 @@
-{"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"}
+{"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    secure?: boolean;\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":";AA0CO,MAAMA,yBACTC,kBAA2C;AAYxC,MAAMC,sBAAsBD,kBAAiC;AAmB7D,MAAME,uCAAuCF,kBAElD;AAOK,MAAMG,sCAAsCH,kBAEjD"}

package/features/SaveSettings/validation.d.ts

@@ -1,5 +1,6 @@
 import zod from "zod";
 export declare const saveValidation: zod.ZodObject<{
+    secure: zod.ZodOptional<zod.ZodBoolean>;
     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>>>;

package/features/SaveSettings/validation.js

@@ -13,6 +13,7 @@ const common = {
 };
 const saveValidation = zod.object({
     ...common,
+    secure: zod.boolean().optional().describe("Use TLS/SSL"),
     password: validation_password.nullish().optional().transform((value)=>void 0 === value ? null : value)
 });
 export { saveValidation };

package/features/SaveSettings/validation.js.map

@@ -1 +1 @@
-{"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"}
+{"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    secure: zod.boolean().optional().describe(\"Use TLS/SSL\"),\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,QAAQH,IAAI,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC1C,UAAUD,oBACL,OAAO,GACP,QAAQ,GACR,SAAS,CAACK,CAAAA,QACAA,AAAUE,WAAVF,QAAsB,OAAOA;AAEhD"}

package/features/SendMail/SendMailUseCase.d.ts

@@ -8,7 +8,7 @@ declare class SendMailUseCaseImpl implements SendMailUseCase.Interface {
     private mailerService;
     private eventPublisher;
     constructor(mailerService: MailerService.Interface, eventPublisher: EventPublisherAbstraction.Interface);
-    execute(data: TransportSendData): Promise<Result<never, MailValidationError> | Result<import("~/types.js").TransportSendResponse<any>, import("../../domain/MailerService/errors.js").NoTransportAvailableError | import("../../domain/MailerService/errors.js").NoSettingsConfiguredError | import("../../domain/MailerService/errors.js").TransportSendError>>;
+    execute(data: TransportSendData): Promise<Result<never, MailValidationError> | Result<import("~/types.js").TransportSendResponse<any>, import("../../domain/MailerService/errors.js").NoTransportAvailableError | import("../../domain/MailerService/errors.js").TransportCreateError | import("../../domain/MailerService/errors.js").TransportSendError>>;
 }
 export declare const SendMailUseCaseImplementation: typeof SendMailUseCaseImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ISendMailUseCase>;

package/features/SmtpTransport/SmtpConfig.js

@@ -8,6 +8,7 @@ class SmtpConfig {
         const baseConfig = {
             host: settings.host,
             port: settings.port,
+            secure: settings.secure,
             auth: {
                 user: settings.user,
                 pass: settings.password

package/features/SmtpTransport/SmtpConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/SmtpTransport/SmtpConfig.js","sources":["../../../src/features/SmtpTransport/SmtpConfig.ts"],"sourcesContent":["import type { TransportSettings } from \"~/types.js\";\nimport type SMTPTransport from \"nodemailer/lib/smtp-transport\";\n\nexport type SmtpTransportConfig = SMTPTransport.Options;\n\nconst configDefaults: Partial<SmtpTransportConfig> = {\n    socketTimeout: 15000,\n    connectionTimeout: 15000,\n    greetingTimeout: 15000\n};\n\nexport class SmtpConfig {\n    static fromTransportSettings(settings: TransportSettings): SmtpTransportConfig {\n        const baseConfig: SmtpTransportConfig = {\n            host: settings.host,\n            port: settings.port,\n            auth: {\n                user: settings.user,\n                pass: settings.password\n            }\n        };\n\n        // Apply defaults\n        return Object.keys(configDefaults).reduce<SmtpTransportConfig>((config, key) => {\n            const configKey = key as keyof SmtpTransportConfig;\n            if (config[configKey] === undefined || config[configKey] === null) {\n                // @ts-expect-error\n                config[configKey] = configDefaults[configKey];\n            }\n            return config;\n        }, baseConfig);\n    }\n}\n"],"names":["configDefaults","SmtpConfig","settings","baseConfig","Object","config","key","configKey","undefined"],"mappings":"AAKA,MAAMA,iBAA+C;IACjD,eAAe;IACf,mBAAmB;IACnB,iBAAiB;AACrB;AAEO,MAAMC;IACT,OAAO,sBAAsBC,QAA2B,EAAuB;QAC3E,MAAMC,aAAkC;YACpC,MAAMD,SAAS,IAAI;YACnB,MAAMA,SAAS,IAAI;YACnB,MAAM;gBACF,MAAMA,SAAS,IAAI;gBACnB,MAAMA,SAAS,QAAQ;YAC3B;QACJ;QAGA,OAAOE,OAAO,IAAI,CAACJ,gBAAgB,MAAM,CAAsB,CAACK,QAAQC;YACpE,MAAMC,YAAYD;YAClB,IAAID,AAAsBG,WAAtBH,MAAM,CAACE,UAAU,IAAkBF,AAAsB,SAAtBA,MAAM,CAACE,UAAU,EAEpDF,MAAM,CAACE,UAAU,GAAGP,cAAc,CAACO,UAAU;YAEjD,OAAOF;QACX,GAAGF;IACP;AACJ"}
+{"version":3,"file":"features/SmtpTransport/SmtpConfig.js","sources":["../../../src/features/SmtpTransport/SmtpConfig.ts"],"sourcesContent":["import type { TransportSettings } from \"~/types.js\";\nimport type SMTPTransport from \"nodemailer/lib/smtp-transport\";\n\nexport type SmtpTransportConfig = SMTPTransport.Options;\n\nconst configDefaults: Partial<SmtpTransportConfig> = {\n    socketTimeout: 15000,\n    connectionTimeout: 15000,\n    greetingTimeout: 15000\n};\n\nexport class SmtpConfig {\n    static fromTransportSettings(settings: TransportSettings): SmtpTransportConfig {\n        const baseConfig: SmtpTransportConfig = {\n            host: settings.host,\n            port: settings.port,\n            secure: settings.secure,\n            auth: {\n                user: settings.user,\n                pass: settings.password\n            }\n        };\n\n        // Apply defaults\n        return Object.keys(configDefaults).reduce<SmtpTransportConfig>((config, key) => {\n            const configKey = key as keyof SmtpTransportConfig;\n            if (config[configKey] === undefined || config[configKey] === null) {\n                // @ts-expect-error\n                config[configKey] = configDefaults[configKey];\n            }\n            return config;\n        }, baseConfig);\n    }\n}\n"],"names":["configDefaults","SmtpConfig","settings","baseConfig","Object","config","key","configKey","undefined"],"mappings":"AAKA,MAAMA,iBAA+C;IACjD,eAAe;IACf,mBAAmB;IACnB,iBAAiB;AACrB;AAEO,MAAMC;IACT,OAAO,sBAAsBC,QAA2B,EAAuB;QAC3E,MAAMC,aAAkC;YACpC,MAAMD,SAAS,IAAI;YACnB,MAAMA,SAAS,IAAI;YACnB,QAAQA,SAAS,MAAM;YACvB,MAAM;gBACF,MAAMA,SAAS,IAAI;gBACnB,MAAMA,SAAS,QAAQ;YAC3B;QACJ;QAGA,OAAOE,OAAO,IAAI,CAACJ,gBAAgB,MAAM,CAAsB,CAACK,QAAQC;YACpE,MAAMC,YAAYD;YAClB,IAAID,AAAsBG,WAAtBH,MAAM,CAACE,UAAU,IAAkBF,AAAsB,SAAtBA,MAAM,CAACE,UAAU,EAEpDF,MAAM,CAACE,UAAU,GAAGP,cAAc,CAACO,UAAU;YAEjD,OAAOF;QACX,GAAGF;IACP;AACJ"}

package/features/SmtpTransport/SmtpMailTransportFactory.d.ts

@@ -2,6 +2,7 @@ import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js
 import type { TransportSettings } from "../../types.js";
 declare class SmtpMailTransportFactoryImpl implements MailTransportFactory.Interface {
     readonly name = "Mailer/SmtpTransport";
+    canUse(settings: TransportSettings | null): boolean;
     createTransport(settings: TransportSettings): MailTransportFactory.Return;
 }
 export declare const SmtpMailTransportFactory: typeof SmtpMailTransportFactoryImpl & {

package/features/SmtpTransport/SmtpMailTransportFactory.js

@@ -2,6 +2,9 @@ import { MailTransportFactory } from "../../domain/MailTransport/abstractions.js
 import { SmtpMailTransport } from "./SmtpMailTransport.js";
 import { SmtpConfig } from "./SmtpConfig.js";
 class SmtpMailTransportFactoryImpl {
+    canUse(settings) {
+        return null !== settings;
+    }
     async createTransport(settings) {
         return new SmtpMailTransport(SmtpConfig.fromTransportSettings(settings));
     }

package/features/SmtpTransport/SmtpMailTransportFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/SmtpTransport/SmtpMailTransportFactory.js","sources":["../../../src/features/SmtpTransport/SmtpMailTransportFactory.ts"],"sourcesContent":["import { MailTransportFactory } from \"~/domain/MailTransport/abstractions.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport { SmtpMailTransport } from \"~/features/SmtpTransport/SmtpMailTransport.js\";\nimport { SmtpConfig } from \"~/features/SmtpTransport/SmtpConfig.js\";\n\nclass SmtpMailTransportFactoryImpl implements MailTransportFactory.Interface {\n    public readonly name = \"Mailer/SmtpTransport\";\n\n    async createTransport(settings: TransportSettings): MailTransportFactory.Return {\n        return new SmtpMailTransport(SmtpConfig.fromTransportSettings(settings));\n    }\n}\n\nexport const SmtpMailTransportFactory = MailTransportFactory.createImplementation({\n    implementation: SmtpMailTransportFactoryImpl,\n    dependencies: []\n});\n"],"names":["SmtpMailTransportFactoryImpl","settings","SmtpMailTransport","SmtpConfig","SmtpMailTransportFactory","MailTransportFactory"],"mappings":";;;AAKA,MAAMA;IAGF,MAAM,gBAAgBC,QAA2B,EAA+B;QAC5E,OAAO,IAAIC,kBAAkBC,WAAW,qBAAqB,CAACF;IAClE;;aAJgB,IAAI,GAAG;;AAK3B;AAEO,MAAMG,2BAA2BC,qBAAqB,oBAAoB,CAAC;IAC9E,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/SmtpTransport/SmtpMailTransportFactory.js","sources":["../../../src/features/SmtpTransport/SmtpMailTransportFactory.ts"],"sourcesContent":["import { MailTransportFactory } from \"~/domain/MailTransport/abstractions.js\";\nimport type { TransportSettings } from \"~/types.js\";\nimport { SmtpMailTransport } from \"~/features/SmtpTransport/SmtpMailTransport.js\";\nimport { SmtpConfig } from \"~/features/SmtpTransport/SmtpConfig.js\";\n\nclass SmtpMailTransportFactoryImpl implements MailTransportFactory.Interface {\n    public readonly name = \"Mailer/SmtpTransport\";\n\n    canUse(settings: TransportSettings | null): boolean {\n        return settings !== null;\n    }\n\n    async createTransport(settings: TransportSettings): MailTransportFactory.Return {\n        return new SmtpMailTransport(SmtpConfig.fromTransportSettings(settings));\n    }\n}\n\nexport const SmtpMailTransportFactory = MailTransportFactory.createImplementation({\n    implementation: SmtpMailTransportFactoryImpl,\n    dependencies: []\n});\n"],"names":["SmtpMailTransportFactoryImpl","settings","SmtpMailTransport","SmtpConfig","SmtpMailTransportFactory","MailTransportFactory"],"mappings":";;;AAKA,MAAMA;IAGF,OAAOC,QAAkC,EAAW;QAChD,OAAOA,AAAa,SAAbA;IACX;IAEA,MAAM,gBAAgBA,QAA2B,EAA+B;QAC5E,OAAO,IAAIC,kBAAkBC,WAAW,qBAAqB,CAACF;IAClE;;aARgB,IAAI,GAAG;;AAS3B;AAEO,MAAMG,2BAA2BC,qBAAqB,oBAAoB,CAAC;IAC9E,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}

package/graphql/settings.js

@@ -1,7 +1,7 @@
 import { ErrorResponse, GraphQLSchemaPlugin } from "@webiny/handler-graphql";
 import { GetSettingsUseCase } from "../features/GetSettings/abstractions.js";
 import { SaveSettingsUseCase } from "../features/SaveSettings/abstractions.js";
-import { ActiveTransport } from "../domain/MailTransport/abstractions.js";
+const SMTP_TRANSPORT_NAME = "Mailer/SmtpTransport";
 const emptyResolver = ()=>({});
 const toPublicSettings = (settings, source)=>{
     if (!settings) return null;
@@ -22,6 +22,7 @@ const createSettingsGraphQL = ()=>new GraphQLSchemaPlugin({
             type MailerTransportSettings {
                 host: String
                 port: Number
+                secure: Boolean
                 user: String
                 from: String
                 replyTo: String
@@ -40,6 +41,7 @@ const createSettingsGraphQL = ()=>new GraphQLSchemaPlugin({
             input MailerTransportSettingsInput {
                 host: String!
                 port: Number
+                secure: Boolean
                 user: String!
                 password: String
                 from: String!
@@ -64,14 +66,8 @@ const createSettingsGraphQL = ()=>new GraphQLSchemaPlugin({
             MailerQuery: {
                 getSettings: async (_, __, context)=>{
                     try {
-                        const activeTransport = context.container.resolve(ActiveTransport);
-                        const transportName = activeTransport.name();
-                        if (!transportName) return {
-                            data: null,
-                            error: null
-                        };
                         const getSettings = context.container.resolve(GetSettingsUseCase);
-                        const result = await getSettings.execute(transportName);
+                        const result = await getSettings.execute(SMTP_TRANSPORT_NAME);
                         const { settings, source } = result.value;
                         return {
                             data: toPublicSettings(settings, source),

package/graphql/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/settings.js","sources":["../../src/graphql/settings.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { GetSettingsUseCase } from \"~/features/GetSettings/abstractions.js\";\nimport { SaveSettingsUseCase } from \"~/features/SaveSettings/abstractions.js\";\nimport { ActiveTransport } from \"~/domain/MailTransport/abstractions.js\";\nimport type { MailerSettingsSource } from \"~/features/GetSettings/abstractions.js\";\nimport type { Context } from \"@webiny/api/types.js\";\nimport type { TransportSettings } from \"~/types.js\";\n\nconst emptyResolver = () => ({});\n\n// Strip `password` before the settings leave the server and tack on `source`\n// so the admin UI can branch on code-vs-storage. Accepts both the full\n// `TransportSettings` (from getSettings) and the already-stripped\n// `Omit<TransportSettings, \"password\">` (from saveSettings) — defense in depth\n// even when the input type carries no password to begin with.\nconst toPublicSettings = (\n    settings: TransportSettings | Omit<TransportSettings, \"password\"> | null,\n    source: MailerSettingsSource\n): (Omit<TransportSettings, \"password\"> & { source: MailerSettingsSource }) | null => {\n    if (!settings) {\n        return null;\n    }\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const { password: _password, ...publicSettings } = settings as TransportSettings;\n    return { ...publicSettings, source };\n};\n\nexport const createSettingsGraphQL = () => {\n    return new GraphQLSchemaPlugin<Context>({\n        typeDefs: `\n            type MailerTransportSettingsError {\n                message: String!\n                code: String\n                data: JSON\n            }\n\n            type MailerTransportSettings {\n                host: String\n                port: Number\n                user: String\n                from: String\n                replyTo: String\n                source: String\n            }\n\n            type MailerTransportSettingsResponse {\n                data: MailerTransportSettings\n                error: MailerTransportSettingsError\n            }\n\n            type MailerQuery {\n                getSettings: MailerTransportSettingsResponse!\n            }\n\n            input MailerTransportSettingsInput {\n                host: String!\n                port: Number\n                user: String!\n                password: String\n                from: String!\n                replyTo: String\n            }\n\n            type MailerMutation {\n                saveSettings(data: MailerTransportSettingsInput!): MailerTransportSettingsResponse!\n            }\n\n            extend type Query {\n                mailer: MailerQuery\n            }\n            extend type Mutation {\n                mailer: MailerMutation\n            }\n        `,\n        resolvers: {\n            Query: {\n                mailer: emptyResolver\n            },\n            MailerQuery: {\n                getSettings: async (_, __, context) => {\n                    try {\n                        const activeTransport = context.container.resolve(ActiveTransport);\n                        const transportName = activeTransport.name();\n\n                        if (!transportName) {\n                            return { data: null, error: null };\n                        }\n\n                        const getSettings = context.container.resolve(GetSettingsUseCase);\n                        const result = await getSettings.execute(transportName);\n\n                        const { settings, source } = result.value;\n\n                        return {\n                            data: toPublicSettings(settings, source),\n                            error: null\n                        };\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            },\n            Mutation: {\n                mailer: emptyResolver\n            },\n            MailerMutation: {\n                saveSettings: async (_, args: any, context) => {\n                    try {\n                        const saveSettings = context.container.resolve(SaveSettingsUseCase);\n                        const result = await saveSettings.execute(args.data);\n\n                        if (result.isFail()) {\n                            return new ErrorResponse(result.error);\n                        }\n\n                        return {\n                            data: toPublicSettings(result.value, \"storage\"),\n                            error: null\n                        };\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            }\n        }\n    });\n};\n"],"names":["emptyResolver","toPublicSettings","settings","source","_password","publicSettings","createSettingsGraphQL","GraphQLSchemaPlugin","_","__","context","activeTransport","ActiveTransport","transportName","getSettings","GetSettingsUseCase","result","ex","ErrorResponse","args","saveSettings","SaveSettingsUseCase"],"mappings":";;;;AAQA,MAAMA,gBAAgB,IAAO,EAAC;AAO9B,MAAMC,mBAAmB,CACrBC,UACAC;IAEA,IAAI,CAACD,UACD,OAAO;IAGX,MAAM,EAAE,UAAUE,SAAS,EAAE,GAAGC,gBAAgB,GAAGH;IACnD,OAAO;QAAE,GAAGG,cAAc;QAAEF;IAAO;AACvC;AAEO,MAAMG,wBAAwB,IAC1B,IAAIC,oBAA6B;QACpC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4CX,CAAC;QACD,WAAW;YACP,OAAO;gBACH,QAAQP;YACZ;YACA,aAAa;gBACT,aAAa,OAAOQ,GAAGC,IAAIC;oBACvB,IAAI;wBACA,MAAMC,kBAAkBD,QAAQ,SAAS,CAAC,OAAO,CAACE;wBAClD,MAAMC,gBAAgBF,gBAAgB,IAAI;wBAE1C,IAAI,CAACE,eACD,OAAO;4BAAE,MAAM;4BAAM,OAAO;wBAAK;wBAGrC,MAAMC,cAAcJ,QAAQ,SAAS,CAAC,OAAO,CAACK;wBAC9C,MAAMC,SAAS,MAAMF,YAAY,OAAO,CAACD;wBAEzC,MAAM,EAAEX,QAAQ,EAAEC,MAAM,EAAE,GAAGa,OAAO,KAAK;wBAEzC,OAAO;4BACH,MAAMf,iBAAiBC,UAAUC;4BACjC,OAAO;wBACX;oBACJ,EAAE,OAAOc,IAAI;wBACT,OAAO,IAAIC,cAAcD;oBAC7B;gBACJ;YACJ;YACA,UAAU;gBACN,QAAQjB;YACZ;YACA,gBAAgB;gBACZ,cAAc,OAAOQ,GAAGW,MAAWT;oBAC/B,IAAI;wBACA,MAAMU,eAAeV,QAAQ,SAAS,CAAC,OAAO,CAACW;wBAC/C,MAAML,SAAS,MAAMI,aAAa,OAAO,CAACD,KAAK,IAAI;wBAEnD,IAAIH,OAAO,MAAM,IACb,OAAO,IAAIE,cAAcF,OAAO,KAAK;wBAGzC,OAAO;4BACH,MAAMf,iBAAiBe,OAAO,KAAK,EAAE;4BACrC,OAAO;wBACX;oBACJ,EAAE,OAAOC,IAAI;wBACT,OAAO,IAAIC,cAAcD;oBAC7B;gBACJ;YACJ;QACJ;IACJ"}
+{"version":3,"file":"graphql/settings.js","sources":["../../src/graphql/settings.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { GetSettingsUseCase } from \"~/features/GetSettings/abstractions.js\";\nimport { SaveSettingsUseCase } from \"~/features/SaveSettings/abstractions.js\";\nimport type { MailerSettingsSource } from \"~/features/GetSettings/abstractions.js\";\nimport type { Context } from \"@webiny/api/types.js\";\nimport type { TransportSettings } from \"~/types.js\";\n\nconst SMTP_TRANSPORT_NAME = \"Mailer/SmtpTransport\";\n\nconst emptyResolver = () => ({});\n\n// Strip `password` before the settings leave the server and tack on `source`\n// so the admin UI can branch on code-vs-storage. Accepts both the full\n// `TransportSettings` (from getSettings) and the already-stripped\n// `Omit<TransportSettings, \"password\">` (from saveSettings) — defense in depth\n// even when the input type carries no password to begin with.\nconst toPublicSettings = (\n    settings: TransportSettings | Omit<TransportSettings, \"password\"> | null,\n    source: MailerSettingsSource\n): (Omit<TransportSettings, \"password\"> & { source: MailerSettingsSource }) | null => {\n    if (!settings) {\n        return null;\n    }\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const { password: _password, ...publicSettings } = settings as TransportSettings;\n    return { ...publicSettings, source };\n};\n\nexport const createSettingsGraphQL = () => {\n    return new GraphQLSchemaPlugin<Context>({\n        typeDefs: `\n            type MailerTransportSettingsError {\n                message: String!\n                code: String\n                data: JSON\n            }\n\n            type MailerTransportSettings {\n                host: String\n                port: Number\n                secure: Boolean\n                user: String\n                from: String\n                replyTo: String\n                source: String\n            }\n\n            type MailerTransportSettingsResponse {\n                data: MailerTransportSettings\n                error: MailerTransportSettingsError\n            }\n\n            type MailerQuery {\n                getSettings: MailerTransportSettingsResponse!\n            }\n\n            input MailerTransportSettingsInput {\n                host: String!\n                port: Number\n                secure: Boolean\n                user: String!\n                password: String\n                from: String!\n                replyTo: String\n            }\n\n            type MailerMutation {\n                saveSettings(data: MailerTransportSettingsInput!): MailerTransportSettingsResponse!\n            }\n\n            extend type Query {\n                mailer: MailerQuery\n            }\n            extend type Mutation {\n                mailer: MailerMutation\n            }\n        `,\n        resolvers: {\n            Query: {\n                mailer: emptyResolver\n            },\n            MailerQuery: {\n                getSettings: async (_, __, context) => {\n                    try {\n                        const getSettings = context.container.resolve(GetSettingsUseCase);\n                        const result = await getSettings.execute(SMTP_TRANSPORT_NAME);\n\n                        const { settings, source } = result.value;\n\n                        return {\n                            data: toPublicSettings(settings, source),\n                            error: null\n                        };\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            },\n            Mutation: {\n                mailer: emptyResolver\n            },\n            MailerMutation: {\n                saveSettings: async (_, args: any, context) => {\n                    try {\n                        const saveSettings = context.container.resolve(SaveSettingsUseCase);\n                        const result = await saveSettings.execute(args.data);\n\n                        if (result.isFail()) {\n                            return new ErrorResponse(result.error);\n                        }\n\n                        return {\n                            data: toPublicSettings(result.value, \"storage\"),\n                            error: null\n                        };\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            }\n        }\n    });\n};\n"],"names":["SMTP_TRANSPORT_NAME","emptyResolver","toPublicSettings","settings","source","_password","publicSettings","createSettingsGraphQL","GraphQLSchemaPlugin","_","__","context","getSettings","GetSettingsUseCase","result","ex","ErrorResponse","args","saveSettings","SaveSettingsUseCase"],"mappings":";;;AAOA,MAAMA,sBAAsB;AAE5B,MAAMC,gBAAgB,IAAO,EAAC;AAO9B,MAAMC,mBAAmB,CACrBC,UACAC;IAEA,IAAI,CAACD,UACD,OAAO;IAGX,MAAM,EAAE,UAAUE,SAAS,EAAE,GAAGC,gBAAgB,GAAGH;IACnD,OAAO;QAAE,GAAGG,cAAc;QAAEF;IAAO;AACvC;AAEO,MAAMG,wBAAwB,IAC1B,IAAIC,oBAA6B;QACpC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA8CX,CAAC;QACD,WAAW;YACP,OAAO;gBACH,QAAQP;YACZ;YACA,aAAa;gBACT,aAAa,OAAOQ,GAAGC,IAAIC;oBACvB,IAAI;wBACA,MAAMC,cAAcD,QAAQ,SAAS,CAAC,OAAO,CAACE;wBAC9C,MAAMC,SAAS,MAAMF,YAAY,OAAO,CAACZ;wBAEzC,MAAM,EAAEG,QAAQ,EAAEC,MAAM,EAAE,GAAGU,OAAO,KAAK;wBAEzC,OAAO;4BACH,MAAMZ,iBAAiBC,UAAUC;4BACjC,OAAO;wBACX;oBACJ,EAAE,OAAOW,IAAI;wBACT,OAAO,IAAIC,cAAcD;oBAC7B;gBACJ;YACJ;YACA,UAAU;gBACN,QAAQd;YACZ;YACA,gBAAgB;gBACZ,cAAc,OAAOQ,GAAGQ,MAAWN;oBAC/B,IAAI;wBACA,MAAMO,eAAeP,QAAQ,SAAS,CAAC,OAAO,CAACQ;wBAC/C,MAAML,SAAS,MAAMI,aAAa,OAAO,CAACD,KAAK,IAAI;wBAEnD,IAAIH,OAAO,MAAM,IACb,OAAO,IAAIE,cAAcF,OAAO,KAAK;wBAGzC,OAAO;4BACH,MAAMZ,iBAAiBY,OAAO,KAAK,EAAE;4BACrC,OAAO;wBACX;oBACJ,EAAE,OAAOC,IAAI;wBACT,OAAO,IAAIC,cAAcD;oBAC7B;gBACJ;YACJ;QACJ;IACJ"}

package/index.d.ts

@@ -1,4 +1,4 @@
 export { MailerService } from "./domain/MailerService/abstractions.js";
 export type { IMailerService, IMailerServiceErrors } from "./domain/MailerService/abstractions.js";
-export declare const createMailerContext: () => import("@webiny/api").ContextPlugin<import("@webiny/api/types.js").Context>;
+export declare const createMailerContext: () => import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types.js").Context>;
 export declare const createMailerGraphQL: () => import("@webiny/handler-graphql/index.js").GraphQLSchemaPlugin<import("@webiny/api/types.js").Context>;

package/index.js

@@ -1,4 +1,3 @@
-import { createContextPlugin } from "@webiny/api";
 import { CodeMailerSettingsFeature } from "./features/CodeMailerSettings/feature.js";
 import { GetSettingsFeature } from "./features/GetSettings/feature.js";
 import { SaveSettingsFeature } from "./features/SaveSettings/feature.js";
@@ -7,7 +6,8 @@ import { SmtpTransportFeature } from "./features/SmtpTransport/feature.js";
 import { MailerServiceFeature } from "./features/MailerService/feature.js";
 import { SendMailFeature } from "./features/SendMail/feature.js";
 import { createSettingsGraphQL } from "./graphql/settings.js";
-const createMailerContext = ()=>createContextPlugin((context)=>{
+import { createRegisterExtensionPlugin } from "@webiny/handler";
+const createMailerContext = ()=>createRegisterExtensionPlugin((context)=>{
         CodeMailerSettingsFeature.register(context.container);
         DummyTransportFeature.register(context.container);
         SmtpTransportFeature.register(context.container);

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":["import { createContextPlugin } from \"@webiny/api\";\nimport { CodeMailerSettingsFeature } from \"~/features/CodeMailerSettings/feature.js\";\nimport { GetSettingsFeature } from \"~/features/GetSettings/feature.js\";\nimport { SaveSettingsFeature } from \"~/features/SaveSettings/feature.js\";\nimport { DummyTransportFeature } from \"~/features/DummyTransport/feature.js\";\nimport { SmtpTransportFeature } from \"~/features/SmtpTransport/feature.js\";\nimport { MailerServiceFeature } from \"~/features/MailerService/feature.js\";\nimport { SendMailFeature } from \"~/features/SendMail/feature.js\";\nimport { createSettingsGraphQL } from \"~/graphql/settings.js\";\n\nexport { MailerService } from \"./domain/MailerService/abstractions.js\";\nexport type { IMailerService, IMailerServiceErrors } from \"./domain/MailerService/abstractions.js\";\n\nexport const createMailerContext = () => {\n    return createContextPlugin(context => {\n        // Register all features.\n        CodeMailerSettingsFeature.register(context.container);\n        DummyTransportFeature.register(context.container);\n        SmtpTransportFeature.register(context.container);\n        GetSettingsFeature.register(context.container);\n        SaveSettingsFeature.register(context.container);\n        MailerServiceFeature.register(context.container);\n        SendMailFeature.register(context.container);\n    });\n};\n\nexport const createMailerGraphQL = () => {\n    return createSettingsGraphQL();\n};\n"],"names":["createMailerContext","createContextPlugin","context","CodeMailerSettingsFeature","DummyTransportFeature","SmtpTransportFeature","GetSettingsFeature","SaveSettingsFeature","MailerServiceFeature","SendMailFeature","createMailerGraphQL","createSettingsGraphQL"],"mappings":";;;;;;;;;AAaO,MAAMA,sBAAsB,IACxBC,oBAAoBC,CAAAA;QAEvBC,0BAA0B,QAAQ,CAACD,QAAQ,SAAS;QACpDE,sBAAsB,QAAQ,CAACF,QAAQ,SAAS;QAChDG,qBAAqB,QAAQ,CAACH,QAAQ,SAAS;QAC/CI,mBAAmB,QAAQ,CAACJ,QAAQ,SAAS;QAC7CK,oBAAoB,QAAQ,CAACL,QAAQ,SAAS;QAC9CM,qBAAqB,QAAQ,CAACN,QAAQ,SAAS;QAC/CO,gBAAgB,QAAQ,CAACP,QAAQ,SAAS;IAC9C;AAGG,MAAMQ,sBAAsB,IACxBC"}
+{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":["import { CodeMailerSettingsFeature } from \"~/features/CodeMailerSettings/feature.js\";\nimport { GetSettingsFeature } from \"~/features/GetSettings/feature.js\";\nimport { SaveSettingsFeature } from \"~/features/SaveSettings/feature.js\";\nimport { DummyTransportFeature } from \"~/features/DummyTransport/feature.js\";\nimport { SmtpTransportFeature } from \"~/features/SmtpTransport/feature.js\";\nimport { MailerServiceFeature } from \"~/features/MailerService/feature.js\";\nimport { SendMailFeature } from \"~/features/SendMail/feature.js\";\nimport { createSettingsGraphQL } from \"~/graphql/settings.js\";\nimport { createRegisterExtensionPlugin } from \"@webiny/handler\";\n\nexport { MailerService } from \"./domain/MailerService/abstractions.js\";\nexport type { IMailerService, IMailerServiceErrors } from \"./domain/MailerService/abstractions.js\";\n\nexport const createMailerContext = () => {\n    return createRegisterExtensionPlugin(context => {\n        // Register all features.\n        CodeMailerSettingsFeature.register(context.container);\n        DummyTransportFeature.register(context.container);\n        SmtpTransportFeature.register(context.container);\n        GetSettingsFeature.register(context.container);\n        SaveSettingsFeature.register(context.container);\n        MailerServiceFeature.register(context.container);\n        SendMailFeature.register(context.container);\n    });\n};\n\nexport const createMailerGraphQL = () => {\n    return createSettingsGraphQL();\n};\n"],"names":["createMailerContext","createRegisterExtensionPlugin","context","CodeMailerSettingsFeature","DummyTransportFeature","SmtpTransportFeature","GetSettingsFeature","SaveSettingsFeature","MailerServiceFeature","SendMailFeature","createMailerGraphQL","createSettingsGraphQL"],"mappings":";;;;;;;;;AAaO,MAAMA,sBAAsB,IACxBC,8BAA8BC,CAAAA;QAEjCC,0BAA0B,QAAQ,CAACD,QAAQ,SAAS;QACpDE,sBAAsB,QAAQ,CAACF,QAAQ,SAAS;QAChDG,qBAAqB,QAAQ,CAACH,QAAQ,SAAS;QAC/CI,mBAAmB,QAAQ,CAACJ,QAAQ,SAAS;QAC7CK,oBAAoB,QAAQ,CAACL,QAAQ,SAAS;QAC9CM,qBAAqB,QAAQ,CAACN,QAAQ,SAAS;QAC/CO,gBAAgB,QAAQ,CAACP,QAAQ,SAAS;IAC9C;AAGG,MAAMQ,sBAAsB,IACxBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-mailer",
-	"version": "6.4.0-beta.3",
+	"version": "6.4.0-beta.5",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -18,33 +18,35 @@
 	"description": "The API to send e-mails.",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.4.0-beta.3",
-		"@webiny/api-headless-cms": "6.4.0-beta.3",
-		"@webiny/feature": "6.4.0-beta.3",
-		"@webiny/handler-graphql": "6.4.0-beta.3",
-		"@webiny/plugins": "6.4.0-beta.3",
+		"@webiny/api": "6.4.0-beta.5",
+		"@webiny/api-headless-cms": "6.4.0-beta.5",
+		"@webiny/feature": "6.4.0-beta.5",
+		"@webiny/handler-graphql": "6.4.0-beta.5",
+		"@webiny/plugins": "6.4.0-beta.5",
 		"email-addresses": "5.0.0",
-		"nodemailer": "8.0.7",
+		"nodemailer": "8.0.8",
 		"zod": "4.4.3"
 	},
 	"devDependencies": {
 		"@types/nodemailer": "8.0.0",
-		"@webiny/api-core": "6.4.0-beta.3",
-		"@webiny/build-tools": "6.4.0-beta.3",
-		"@webiny/db-dynamodb": "6.4.0-beta.3",
-		"@webiny/handler": "6.4.0-beta.3",
-		"@webiny/handler-aws": "6.4.0-beta.3",
-		"@webiny/handler-db": "6.4.0-beta.3",
-		"@webiny/project-utils": "6.4.0-beta.3",
+		"@webiny/api-core": "6.4.0-beta.5",
+		"@webiny/build-tools": "6.4.0-beta.5",
+		"@webiny/db-dynamodb": "6.4.0-beta.5",
+		"@webiny/handler": "6.4.0-beta.5",
+		"@webiny/handler-aws": "6.4.0-beta.5",
+		"@webiny/handler-db": "6.4.0-beta.5",
+		"@webiny/project-utils": "6.4.0-beta.5",
 		"graphql": "16.14.0",
 		"jest-dynalite": "3.6.1",
 		"rimraf": "6.1.3",
 		"typescript": "6.0.3",
-		"vitest": "4.1.6"
+		"vitest": "4.1.7"
 	},
 	"publishConfig": {
-		"access": "public",
-		"directory": "dist"
+		"access": "public"
 	},
-	"gitHead": "2e58681d4344024bfb60e6180338e2f154ec87f0"
+	"gitHead": "8476da73b653c89cc1474d968baf55c1b0ae0e5f",
+	"webiny": {
+		"publishFrom": "dist"
+	}
 }

package/types.d.ts

@@ -34,6 +34,7 @@ export type TransportSendData = BaseTransportSendData & (TransportSendToData | T
 export interface TransportSettings {
     host: string;
     port: number;
+    secure: boolean;
     user: string;
     password: string;
     from: string;

package/features/MailerService/ActiveTransport.d.ts

@@ -1,10 +0,0 @@
-import { ActiveTransport as ActiveTransportAbstraction, MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
-declare class ActiveTransportImpl implements ActiveTransportAbstraction.Interface {
-    private transportFactories;
-    constructor(transportFactories: MailTransportFactory.Interface[]);
-    name(): string | null;
-}
-export declare const ActiveTransport: typeof ActiveTransportImpl & {
-    __abstraction: import("@webiny/di").Abstraction<import("~/domain/MailTransport/abstractions.js").IActiveTransport>;
-};
-export {};

package/features/MailerService/ActiveTransport.js

@@ -1,24 +0,0 @@
-import { ActiveTransport, MailTransportFactory } from "../../domain/MailTransport/abstractions.js";
-class ActiveTransportImpl {
-    constructor(transportFactories){
-        this.transportFactories = transportFactories;
-    }
-    name() {
-        if (0 === this.transportFactories.length) return null;
-        return this.transportFactories[this.transportFactories.length - 1].name;
-    }
-}
-const ActiveTransport_ActiveTransport = ActiveTransport.createImplementation({
-    implementation: ActiveTransportImpl,
-    dependencies: [
-        [
-            MailTransportFactory,
-            {
-                multiple: true
-            }
-        ]
-    ]
-});
-export { ActiveTransport_ActiveTransport as ActiveTransport };
-
-//# sourceMappingURL=ActiveTransport.js.map

package/features/MailerService/ActiveTransport.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"features/MailerService/ActiveTransport.js","sources":["../../../src/features/MailerService/ActiveTransport.ts"],"sourcesContent":["import {\n    ActiveTransport as ActiveTransportAbstraction,\n    MailTransportFactory\n} from \"~/domain/MailTransport/abstractions.js\";\n\nclass ActiveTransportImpl implements ActiveTransportAbstraction.Interface {\n    constructor(private transportFactories: MailTransportFactory.Interface[]) {}\n\n    name(): string | null {\n        if (this.transportFactories.length === 0) {\n            return null;\n        }\n        return this.transportFactories[this.transportFactories.length - 1].name;\n    }\n}\n\nexport const ActiveTransport = ActiveTransportAbstraction.createImplementation({\n    implementation: ActiveTransportImpl,\n    dependencies: [[MailTransportFactory, { multiple: true }]]\n});\n"],"names":["ActiveTransportImpl","transportFactories","ActiveTransport","ActiveTransportAbstraction","MailTransportFactory"],"mappings":";AAKA,MAAMA;IACF,YAAoBC,kBAAoD,CAAE;aAAtDA,kBAAkB,GAAlBA;IAAuD;IAE3E,OAAsB;QAClB,IAAI,AAAmC,MAAnC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAC9B,OAAO;QAEX,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,EAAE,CAAC,IAAI;IAC3E;AACJ;AAEO,MAAMC,kCAAkBC,gBAAAA,oBAA+C,CAAC;IAC3E,gBAAgBH;IAChB,cAAc;QAAC;YAACI;YAAsB;gBAAE,UAAU;YAAK;SAAE;KAAC;AAC9D"}