@remit/smtp-service 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/smtp-service",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "type": "module",
   "main": "src/index.ts",
   "exports": {

package/src/message-builder.test.ts

@@ -132,7 +132,7 @@ describe("buildMailMessage", () => {
 			},
 		];
 		const message = buildMailMessage(baseOutbox(), attachments);
-		assert.equal(message.attachments, attachments);
+		assert.deepEqual(message.attachments, attachments);
 	});
 
 	it("leaves attachments undefined when none are provided", () => {
@@ -257,6 +257,53 @@ describe("renderRawMessage", () => {
 		assert.ok(raw.includes(Buffer.from("png-bytes").toString("base64")));
 	});
 
+	it("puts a file the html body refers to inline, next to the html", async () => {
+		const raw = String(
+			await renderRawMessage(
+				buildMailMessage(
+					baseOutbox({
+						textBody: "see below",
+						htmlBody: '<p>see below</p><p><img src="cid:shot-1@remit"></p>',
+					}),
+					[
+						{
+							filename: "shot.png",
+							content: Buffer.from("png-bytes"),
+							contentType: "image/png",
+							cid: "shot-1@remit",
+						},
+					],
+				),
+			),
+		);
+
+		assert.match(raw, /Content-Type: multipart\/related; type="text\/html"/);
+		assert.match(raw, /Content-Disposition: inline; filename=shot\.png/);
+		assert.match(raw, /Content-ID: <shot-1@remit>/);
+	});
+
+	it("sends a file the html body does not refer to as an ordinary attachment", async () => {
+		const raw = String(
+			await renderRawMessage(
+				buildMailMessage(
+					baseOutbox({ textBody: "attached", htmlBody: "<p>attached</p>" }),
+					[
+						{
+							filename: "photo.png",
+							content: Buffer.from("png-bytes"),
+							contentType: "image/png",
+							cid: "photo-1@remit",
+						},
+					],
+				),
+			),
+		);
+
+		assert.match(raw, /Content-Disposition: attachment; filename=photo\.png/);
+		assert.ok(!raw.includes("Content-ID"));
+		assert.ok(!raw.includes("multipart/related"));
+	});
+
 	it("dates the rendered copy from the moment the send was recorded", async () => {
 		const raw = String(
 			await renderRawMessage(

package/src/message-builder.ts

@@ -30,6 +30,18 @@ export interface MailAttachment {
 const formatFrom = (address: string, name: string | undefined): string =>
 	name ? `"${name.replace(/(["\\])/g, "\\$1")}" <${address}>` : address;
 
+const placeAttachment = (
+	attachment: MailAttachment,
+	html: string | undefined,
+): MailAttachment => {
+	if (!attachment.cid || attachment.contentDisposition) return attachment;
+	if (html?.includes(`cid:${attachment.cid}`)) {
+		return { ...attachment, contentDisposition: "inline" };
+	}
+	const { cid: _unreferenced, ...standalone } = attachment;
+	return standalone;
+};
+
 /** The one description of an outgoing message: the wire copy and the Sent copy. */
 export const buildMailMessage = (
 	outbox: OutboxMessageItem,
@@ -50,7 +62,9 @@ export const buildMailMessage = (
 	// submission is accepted, so on the wire path this is always absent and
 	// nodemailer dates the message as it goes out.
 	date: outbox.sentAt ? new Date(outbox.sentAt) : undefined,
-	attachments,
+	attachments: attachments?.map((attachment) =>
+		placeAttachment(attachment, outbox.htmlBody),
+	),
 });
 
 export const toNodemailerOptions = (message: MailMessage): SendMailOptions => ({

package/src/smtp-client.test.ts

@@ -158,9 +158,13 @@ describe("sendMail", () => {
 		);
 	});
 
-	it("throws a classified auth error on a 535 AUTH rejection", async () => {
+	it("throws a classified auth error on a 535 AUTH rejection, in the server's words", async () => {
+		// What Microsoft answers a tenant with SMTP AUTH switched off. Signing in
+		// again never clears it, so the text has to survive classification for the
+		// account card to say what actually has to change.
 		const server = await spawn({
-			authResponse: "535 5.7.8 Authentication credentials invalid\r\n",
+			authResponse:
+				"535 5.7.139 Authentication unsuccessful, SmtpClientAuthentication is disabled for the Tenant\r\n",
 		});
 
 		await assert.rejects(
@@ -168,7 +172,7 @@ describe("sendMail", () => {
 			(error: unknown) => {
 				assert.ok(error instanceof SmtpConnectionError);
 				assert.equal(error.kind, "auth");
-				assert.equal(error.message, "SMTP authentication failed");
+				assert.match(error.message, /SmtpClientAuthentication is disabled/);
 				return true;
 			},
 		);

package/src/smtp-client.ts

@@ -111,6 +111,7 @@ export const sendMail = async (
 					responseCode?: number;
 					code?: string;
 					command?: string;
+					response?: string;
 				},
 			) => {
 				const smtpCode = error.responseCode;
@@ -122,9 +123,15 @@ export const sendMail = async (
 						smtpCode >= 500 &&
 						error.command === "AUTH")
 				) {
+					// The server's own words, when it gave any: a 535 reading
+					// "SmtpClientAuthentication is disabled for the Tenant" is not a
+					// failure signing in again clears, and the account card can only
+					// say so if the text survives the classification.
 					throw new SmtpConnectionError(
 						"auth",
-						"SMTP authentication failed",
+						error.response
+							? `SMTP authentication failed: ${error.response.trim()}`
+							: "SMTP authentication failed",
 						error,
 					);
 				}