fix(api-mailer): smtp usage

.yarnrc.yml

@@ -7,7 +7,7 @@ enableScripts: false
 
 nodeLinker: node-modules
 
-npmMinimalAgeGate: 2d
+npmMinimalAgeGate: 3d
 npmPreapprovedPackages:
   - "@webiny/di"
   - "@webiny/stdlib"

packages/api-headless-cms/src/graphql/schema/createSingularSDL.ts

@@ -70,6 +70,8 @@ export const createSingularSDL: CreateSingularSDL = ({
             ${onByMetaGqlFields}
             values: ${singularName}Values
             live: CmsEntryLive
+
+            revisionDescription: String
         }
 
         ${fields.map(f => f.typeDefs).join("\n")}

packages/api-mailer/__tests__/codeSettings.test.ts

@@ -6,6 +6,7 @@ import { registerCodeSmtpSettings } from "./helpers/registerCodeSmtpSettings";
 const smtpSettings = {
     host: "smtp.example.com",
     port: 587,
+    secure: false,
     user: "user@example.com",
     password: "secret-password",
     from: "noreply@example.com",

packages/api-mailer/__tests__/graphql/settings.ts

@@ -5,6 +5,7 @@ export const GET_SETTINGS_QUERY = `
                 data {
                     host
                     port
+                    secure
                     user
                     from
                     replyTo
@@ -27,6 +28,7 @@ export const SAVE_SETTINGS_MUTATION = `
                 data {
                     host
                     port
+                    secure
                     user
                     from
                     replyTo

packages/api-mailer/__tests__/settings.codeSource.test.ts

@@ -31,6 +31,7 @@ vi.mock("nodemailer", () => {
 const codeSettings = {
     host: "code-host.webiny",
     port: 587,
+    secure: false,
     user: "code-user",
     password: "code-password",
     from: "code-from@example.com",
@@ -109,6 +110,7 @@ describe("Mailer settings — code source end-to-end", () => {
                         data: {
                             host: codeSettings.host,
                             port: codeSettings.port,
+                            secure: codeSettings.secure,
                             user: codeSettings.user,
                             from: codeSettings.from,
                             replyTo: codeSettings.replyTo,

packages/api-mailer/__tests__/settings.crud.test.ts

@@ -45,7 +45,8 @@ describe("Settings Transporter CRUD", () => {
         // for retrieving the stored password is GetSettingsUseCase / Repository.
         expect(result.value).toEqual({
             host: input.host,
-            port: 25,
+            port: 587,
+            secure: false,
             user: input.user,
             from: input.from,
             replyTo: input.replyTo
@@ -66,7 +67,8 @@ describe("Settings Transporter CRUD", () => {
         expect(result.value).toEqual({
             settings: {
                 ...input,
-                port: 25
+                port: 587,
+                secure: false
             },
             source: "storage"
         });
@@ -88,6 +90,7 @@ describe("Settings Transporter CRUD", () => {
         expect(updateResult.value).toEqual({
             host: "dummy-host2.webiny",
             port: 30,
+            secure: false,
             user: input.user,
             from: input.from,
             replyTo: input.replyTo
@@ -103,6 +106,7 @@ describe("Settings Transporter CRUD", () => {
         expect(updateResult2.value).toEqual({
             host: "dummy-host3.webiny",
             port: 30,
+            secure: false,
             user: input.user,
             from: input.from,
             replyTo: input.replyTo
@@ -125,13 +129,14 @@ describe("Settings Transporter CRUD", () => {
             host: "dummy-host2.webiny",
             user: input.user,
             from: input.from,
-            port: 25
+            port: 587
         });
 
         expect(updateResult.isOk()).toBe(true);
         expect(updateResult.value).toEqual({
             host: "dummy-host2.webiny",
-            port: 25,
+            port: 587,
+            secure: false,
             user: input.user,
             from: input.from,
             replyTo: input.replyTo
@@ -146,7 +151,8 @@ describe("Settings Transporter CRUD", () => {
             settings: {
                 ...input,
                 password: input.password,
-                port: 25,
+                port: 587,
+                secure: false,
                 host: "dummy-host2.webiny"
             },
             source: "storage"
@@ -172,12 +178,47 @@ describe("Settings Transporter CRUD", () => {
         expect(result.value).toEqual({
             settings: {
                 ...input,
-                port: 25
+                port: 587,
+                secure: false
             },
             source: "storage"
         });
     });
 
+    it("should default secure to true when port is 465", async () => {
+        const context = await handle();
+
+        const saveSettings = context.container.resolve(SaveSettingsUseCase);
+        const result = await saveSettings.execute({ ...input, port: 465 });
+
+        expect(result.isOk()).toBe(true);
+        expect(result.value).toMatchObject({ port: 465, secure: true });
+    });
+
+    it("should respect explicit secure: false even on port 465", async () => {
+        const context = await handle();
+
+        const saveSettings = context.container.resolve(SaveSettingsUseCase);
+        const result = await saveSettings.execute({ ...input, port: 465, secure: false });
+
+        expect(result.isOk()).toBe(true);
+        expect(result.value).toMatchObject({ port: 465, secure: false });
+    });
+
+    it("should infer secure from stored port 465 when reading back", async () => {
+        const context = await handle();
+
+        const saveSettings = context.container.resolve(SaveSettingsUseCase);
+        await saveSettings.execute({ ...input, port: 465 });
+
+        const getSettings = context.container.resolve(GetSettingsUseCase);
+        const result = await getSettings.execute("Mailer/SmtpTransport");
+
+        expect(result.isOk()).toBe(true);
+        expect(result.value.settings?.secure).toBe(true);
+        expect(result.value.settings?.port).toBe(465);
+    });
+
     it("should not be possible to save settings due to no permissions", async () => {
         const { handle: noAccessHandle } = createContextHandler({
             permissions: []

packages/api-mailer/__tests__/settings.graphql.test.ts

@@ -45,7 +45,8 @@ describe("Mailer Settings GraphQL", () => {
                         data: {
                             from: "from@dummy-host.webiny",
                             host: "dummy-host.webiny",
-                            port: 25,
+                            port: 587,
+                            secure: false,
                             replyTo: "replyTo@dummy-host.webiny",
                             user: "user",
                             source: "storage"
@@ -65,7 +66,8 @@ describe("Mailer Settings GraphQL", () => {
                         data: {
                             from: "from@dummy-host.webiny",
                             host: "dummy-host.webiny",
-                            port: 25,
+                            port: 587,
+                            secure: false,
                             replyTo: "replyTo@dummy-host.webiny",
                             user: "user",
                             source: "storage"
@@ -94,7 +96,8 @@ describe("Mailer Settings GraphQL", () => {
                     saveSettings: {
                         data: {
                             host: "dummy-host2.webiny",
-                            port: 25,
+                            port: 587,
+                            secure: false,
                             user: "user2",
                             from: "from2@dummy-host.webiny",
                             replyTo: "replyTo2@dummy-host.webiny",
@@ -122,7 +125,8 @@ describe("Mailer Settings GraphQL", () => {
                     saveSettings: {
                         data: {
                             host: "dummy-host3.webiny",
-                            port: 25,
+                            port: 587,
+                            secure: false,
                             user: "user3",
                             from: "from3@dummy-host.webiny",
                             replyTo: "replyTo3@dummy-host.webiny",

packages/api-mailer/package.json

@@ -24,7 +24,7 @@
     "@webiny/handler-graphql": "0.0.0",
     "@webiny/plugins": "0.0.0",
     "email-addresses": "^5.0.0",
-    "nodemailer": "^8.0.7",
+    "nodemailer": "^8.0.8",
     "zod": "4.4.3"
   },
   "devDependencies": {

packages/api-mailer/src/domain/MailTransport/abstractions.ts

@@ -15,6 +15,7 @@ export namespace MailTransport {
 
 export interface IMailTransportFactory {
     name: string;
+    canUse(settings: TransportSettings | null): boolean;
     createTransport(settings: TransportSettings): Promise<IMailTransport>;
 }
 
@@ -25,13 +26,3 @@ export namespace MailTransportFactory {
     export type Interface = IMailTransportFactory;
     export type Return = Promise<IMailTransport>;
 }
-
-export interface IActiveTransport {
-    name(): string | null;
-}
-
-export const ActiveTransport = createAbstraction<IActiveTransport>("ActiveTransport");
-
-export namespace ActiveTransport {
-    export type Interface = IActiveTransport;
-}

packages/api-mailer/src/domain/MailerService/abstractions.ts

@@ -1,15 +1,11 @@
 import { createAbstraction } from "@webiny/feature/api";
 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;
 }
 

packages/api-mailer/src/domain/MailerService/errors.ts

@@ -21,6 +21,16 @@ export class NoSettingsConfiguredError extends BaseError {
     }
 }
 
+export class TransportCreateError extends BaseError {
+    override readonly code = "Mailer/MailerService/TransportCreateError" as const;
+
+    constructor(error: unknown) {
+        super({
+            message: error instanceof Error ? error.message : String(error)
+        });
+    }
+}
+
 export class TransportSendError extends BaseError<{ error: TransportSendResponse["error"] }> {
     override readonly code = "Mailer/MailerService/TransportSendError" as const;
 

packages/api-mailer/src/features/DummyTransport/DummyMailTransportFactory.ts

@@ -4,6 +4,10 @@ import { DummyMailTransport } from "./DummyMailTransport.js";
 class DummyMailTransportFactoryImpl implements MailTransportFactory.Interface {
     public readonly name = "Mailer/DummyTransport";
 
+    canUse(): boolean {
+        return true;
+    }
+
     async createTransport(): Promise<IMailTransport> {
         return new DummyMailTransport();
     }

packages/api-mailer/src/features/GetSettings/GetSettingsRepository.ts

@@ -39,9 +39,12 @@ class GetSettingsRepositoryImpl implements GetSettingsRepository.Interface {
             ? await this.encryption.decrypt(String(settings.password))
             : "";
 
+        const port = Number(settings.port || 587);
+
         const transportSettings: TransportSettings = {
             host: String(settings.host || ""),
-            port: Number(settings.port || 25),
+            port,
+            secure: settings.secure ?? port === 465,
             user: String(settings.user || ""),
             password,
             from: String(settings.from || ""),