From 81c404f88d3fd14a1ed1a89f87bc36cbf7494d0a Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 24 Feb 2025 17:27:27 +0000
Subject: [PATCH] Correctly type things that interact with nodemailer.

---
 .../tests/steps/sendSmtpEmail.spec.ts         | 20 ++++++++++---------
 packages/types/package.json                   |  1 +
 packages/types/src/api/web/global/email.ts    |  3 ++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts b/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts
index 7452239dfa..7aff612a97 100644
--- a/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts
+++ b/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts
@@ -1,3 +1,4 @@
+import { SendEmailResponse } from "@budibase/types"
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import * as workerRequests from "../../../utilities/workerRequests"
 
@@ -5,17 +6,18 @@ jest.mock("../../../utilities/workerRequests", () => ({
   sendSmtpEmail: jest.fn(),
 }))
 
-function generateResponse(to: string, from: string) {
+function generateResponse(to: string, from: string): SendEmailResponse {
   return {
-    success: true,
-    response: {
-      accepted: [to],
-      envelope: {
-        from: from,
-        to: [to],
-      },
-      message: `Email sent to ${to}.`,
+    message: `Email sent to ${to}.`,
+    accepted: [to],
+    envelope: {
+      from: from,
+      to: [to],
     },
+    messageId: "messageId",
+    pending: [],
+    rejected: [],
+    response: "response",
   }
 }
 
diff --git a/packages/types/package.json b/packages/types/package.json
index ee3c059bc9..a6e08ab84c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -17,6 +17,7 @@
     "@budibase/nano": "10.1.5",
     "@types/json-schema": "^7.0.15",
     "@types/koa": "2.13.4",
+    "@types/nodemailer": "^6.4.17",
     "@types/redlock": "4.0.7",
     "koa-useragent": "^4.1.0",
     "rimraf": "3.0.2",
diff --git a/packages/types/src/api/web/global/email.ts b/packages/types/src/api/web/global/email.ts
index 13b22a939c..3d2e007231 100644
--- a/packages/types/src/api/web/global/email.ts
+++ b/packages/types/src/api/web/global/email.ts
@@ -1,4 +1,5 @@
 import { EmailAttachment, EmailInvite } from "../../../documents"
+import SMTPTransport from "nodemailer/lib/smtp-transport"
 
 export enum EmailTemplatePurpose {
   CORE = "core",
@@ -23,6 +24,6 @@ export interface SendEmailRequest {
   invite?: EmailInvite
   attachments?: EmailAttachment[]
 }
-export interface SendEmailResponse extends Record<string, any> {
+export interface SendEmailResponse extends SMTPTransport.SentMessageInfo {
   message: string
 }