@remit/smtp-service 0.0.13 → 0.0.15

package/package.json

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

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

@@ -31,22 +31,6 @@ export class SmtpConnectionError extends Error {
 	}
 }
 
-/** Password-based SMTP auth (AUTH PLAIN/LOGIN) */
-export interface SmtpAuthPassword {
-	type?: undefined;
-	user: string;
-	pass: string;
-}
-
-/** OAuth2 SMTP auth (XOAUTH2 / OAUTHBEARER) */
-export interface SmtpAuthOAuth2 {
-	type: "OAUTH2";
-	user: string;
-	accessToken: string;
-}
-
-export type SmtpAuth = SmtpAuthPassword | SmtpAuthOAuth2;
-
 export interface SmtpConfig {
 	host: string;
 	port: number;
@@ -127,6 +111,7 @@ export const sendMail = async (
 					responseCode?: number;
 					code?: string;
 					command?: string;
+					response?: string;
 				},
 			) => {
 				const smtpCode = error.responseCode;
@@ -138,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,
 					);
 				}