@remit/backend 0.0.148 → 0.0.149

package/dist/src/handlers/account.js

@@ -2,8 +2,9 @@ import { ensureAccountConfig } from "@remit/data-ports/account-config";
 import { AccountAuthType, AccountService, ConnectionState, } from "@remit/domain-enums";
 import { logger } from "@remit/logger";
 import { createMailOAuthService, microsoftProviderConfig, RefreshTokenError, } from "@remit/mail-oauth-service";
-import { ownedAccount, resolveConnectionCredentials, testImapConnection, testSmtpConnection, } from "@remit/mailbox-service";
+import { ownedAccount, resolveConnectionCredentials, testImapConnection, } from "@remit/mailbox-service";
 import { deserializeEncryptedPayload, serializeEncryptedPayload, } from "@remit/secrets-service";
+import { verifySmtpConnection } from "@remit/smtp-service";
 import { loadMsOAuth } from "../config/msoauth.js";
 import { deleteAccount } from "../service/account-deletion.js";
 import { fireAndForget } from "../service/fire-and-forget.js";
@@ -44,7 +45,7 @@ export const triggerAccountSyncSafe = async (client, accountId) => {
  * reauth-required case is mapped to the distinct `reauth_required` error code
  * so the UI can route the user into the OAuth re-auth flow.
  */
-const testOAuthConnection = async (msOAuth, existingAccount, account, secrets) => {
+const testOAuthConnection = async (msOAuth, existingAccount, account, secrets, mailTransports) => {
     const { config, credentials: app } = await loadMsOAuth(msOAuth);
     const tokenService = createMailOAuthService(microsoftProviderConfig({
         clientId: app.clientId,
@@ -93,19 +94,20 @@ const testOAuthConnection = async (msOAuth, existingAccount, account, secrets) =
         secure: existingAccount.imapTls,
         user: existingAccount.username,
         credentials,
-    });
+    }, mailTransports.imap(existingAccount.imapHost, existingAccount.imapTls));
     result.imapSuccess = imapResult.success;
     if (!imapResult.success) {
         result.imapError = imapResult.error;
     }
     // OAuth accounts share the same access token for IMAP and SMTP.
     if (existingAccount.smtpEnabled) {
-        const smtpResult = await testSmtpConnection({
+        const smtpResult = await verifySmtpConnection({
             host: existingAccount.smtpHost ?? "",
             port: existingAccount.smtpPort ?? 587,
             secure: existingAccount.smtpTls ?? false,
             user: existingAccount.smtpUsername || existingAccount.username,
             credentials,
+            getSocket: mailTransports.smtp,
         });
         result.smtpSuccess = smtpResult.success;
         if (!smtpResult.success) {
@@ -181,7 +183,7 @@ export const AccountOperations = {
     AccountOperations_testConnection: async (context, ctx) => {
         const accountConfigId = ctx.identity.accountConfigId;
         const input = context.request.requestBody;
-        const { account, secrets } = ctx.client;
+        const { account, secrets, mailTransports } = ctx.client;
         // Resolve password - use provided password or decrypt stored password
         let imapPassword = input.password;
         let smtpPassword = input.smtpPassword;
@@ -190,7 +192,7 @@ export const AccountOperations = {
             unwrap(ownedAccount(existingAccount, accountConfigId, "read"));
             const authType = existingAccount.authType ?? "password";
             if (authType === "oauthMicrosoft") {
-                return testOAuthConnection(ctx.config.msOAuth, existingAccount, account, secrets);
+                return testOAuthConnection(ctx.config.msOAuth, existingAccount, account, secrets, mailTransports);
             }
             if (existingAccount.passwordHash) {
                 const payload = deserializeEncryptedPayload(JSON.parse(existingAccount.passwordHash));
@@ -218,17 +220,16 @@ export const AccountOperations = {
             host: input.imapHost,
             port: input.imapPort,
             secure: input.imapTls,
-            startTls: input.imapStartTls,
             user: input.username,
             credentials: { kind: "password", password: imapPassword },
-        });
+        }, mailTransports.imap(input.imapHost, input.imapTls));
         result.imapSuccess = imapResult.success;
         if (!imapResult.success) {
             result.imapError = imapResult.error;
         }
         // Test SMTP connection if configured
         if (input.smtpHost) {
-            const smtpResult = await testSmtpConnection({
+            const smtpResult = await verifySmtpConnection({
                 host: input.smtpHost,
                 port: input.smtpPort ?? 587,
                 secure: input.smtpTls ?? false,
@@ -237,6 +238,7 @@ export const AccountOperations = {
                     kind: "password",
                     password: smtpPassword ?? imapPassword,
                 },
+                getSocket: mailTransports.smtp,
             });
             result.smtpSuccess = smtpResult.success;
             if (!smtpResult.success) {

package/dist/src/service/create-remit-client.d.ts

@@ -1,10 +1,15 @@
 import type { IAccountConfigRepository, IAccountExportRequestRepository, IAccountRepository, IAccountSettingRepository, IAddressRepository, ICalendarCollectionRepository, ICalendarEventIndexRepository, ICalendarFeedTokenRepository, ICalendarObjectRepository, ICalendarStore, ICalendarSuggestionRepository, IConfigImportRepository, IEnvelopeRepository, IFilterRepository, ILabelRepository, IMailboxLockRepository, IMailboxRepository, IMailboxSpecialUseRepository, IMessageFlagPushRepository, IMessageFlagRepository, IMessageLabelRepository, IMessagePlacementMoveRepository, IMessageRepository, IOrganizeJobRequestRepository, IOutboxAttachmentRepository, IOutboxMessageRepository, IQuarantineRepository, ISenderSignerStandingRepository, ISyncWarningRepository, IThreadMessageRepository } from "@remit/data-ports";
 import { BodySyncQueueService, BodySyncService, type ConnectionScope, type FilterConfig, FlagQueueService, type ImapTransport, MailboxQueueService, MessageMoveService, OutboxAttachmentService, OutboxQueueService, SpamReportService } from "@remit/mailbox-service";
 import { type SecretsService } from "@remit/secrets-service";
+import type { SmtpGetSocket } from "@remit/smtp-service";
 import type { StorageService } from "@remit/storage-service";
 import type { QueueName, RemitClientQueues } from "./queues.js";
 export type { ConnectionScope };
 export type ConnectionScopeFactory = (accountService: IAccountRepository, secretsService: SecretsService) => (accountId: string) => Promise<ConnectionScope>;
+export interface MailTransports {
+    imap: (host: string, secure: boolean) => ImapTransport;
+    smtp: SmtpGetSocket;
+}
 export interface RemitClientCore {
     accountConfig: IAccountConfigRepository;
     account: IAccountRepository;
@@ -39,6 +44,7 @@ export interface RemitClientCore {
     flagPush: IMessageFlagPushRepository;
     outboxAttachment: OutboxAttachmentService;
     createConnectionScope: (accountId: string) => Promise<ConnectionScope>;
+    mailTransports: MailTransports;
 }
 export interface SyncQueueServices {
     flagQueue: FlagQueueService;
@@ -94,6 +100,7 @@ export interface RemitClientSharedDeps {
     storage: StorageService;
     secrets: SecretsService;
     connectionScope: ConnectionScopeFactory;
+    mailTransports: MailTransports;
     queues: RemitClientQueues;
 }
 export interface RemitClientDeps extends RemitClientSharedDeps {

package/dist/src/service/create-remit-client.js

@@ -45,7 +45,7 @@ export const buildReadPathFilterConfig = (repositories, queues) => {
     });
 };
 export const createRemitCore = (deps) => {
-    const { repositories, storage, secrets, connectionScope } = deps;
+    const { repositories, storage, secrets, connectionScope, mailTransports } = deps;
     return {
         accountConfig: repositories.accountConfig,
         account: repositories.account,
@@ -87,6 +87,7 @@ export const createRemitCore = (deps) => {
             storage,
         }),
         createConnectionScope: connectionScope(repositories.account, secrets),
+        mailTransports,
     };
 };
 export const composeSyncServices = (core, queues) => {

package/dist/src/service/shared-deps.js

@@ -1,6 +1,7 @@
 import { nodeTransport } from "@remit/mailbox-service/node-transport";
 import { createCachedDataKeyProvider, createSecretsService, } from "@remit/secrets-service";
 import { createKmsDataKeyProvider, FAKE_KMS_KEY_ID, } from "@remit/secrets-service/kms";
+import { directSmtpSocket } from "@remit/smtp-service";
 import { createFifoQueueProducer, createStandardQueueProducer, } from "@remit/sqs-client/producer";
 import { createStorageService } from "@remit/storage-service/s3";
 import { env } from "expect-env";
@@ -21,9 +22,13 @@ export const sqsQueues = (urls) => ({
     }),
     body: createStandardQueueProducer({ queueUrl: urls.body }),
 });
-export const buildSharedDeps = (queues) => ({
-    storage: createStorageService(),
-    secrets: createSecretsService(createCachedDataKeyProvider(createKmsDataKeyProvider(process.env.KMS_KEY_ID ?? FAKE_KMS_KEY_ID))),
-    connectionScope: passwordConnectionScope(nodeTransport()),
-    queues,
-});
+export const buildSharedDeps = (queues) => {
+    const imapTransport = nodeTransport();
+    return {
+        storage: createStorageService(),
+        secrets: createSecretsService(createCachedDataKeyProvider(createKmsDataKeyProvider(process.env.KMS_KEY_ID ?? FAKE_KMS_KEY_ID))),
+        connectionScope: passwordConnectionScope(imapTransport),
+        mailTransports: { imap: () => imapTransport, smtp: directSmtpSocket },
+        queues,
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/backend",
-	"version": "0.0.148",
+	"version": "0.0.149",
 	"description": "Remit Mail Inspector API backend",
 	"license": "MIT",
 	"author": "",
@@ -101,6 +101,7 @@
 		"@remit/mail-oauth-service": "*",
 		"@remit/secrets-service": "*",
 		"@remit/mailbox-service": "*",
+		"@remit/smtp-service": "*",
 		"@remit/storage-service": "*",
 		"@remit/auth-service": "*",
 		"@remit/drizzle-service": "*",