@remit/imap-worker 0.0.58 → 0.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1055.0",
+    "@remit/config-transfer": "*",
     "@remit/data-ports": "*",
     "@remit/smtp-service": "*",
     "@remit/logger-lambda": "*",

package/src/handlers/sync-mailboxes.ts

@@ -1,10 +1,16 @@
 import { getClient } from "@remit/backend/client";
+import { writeFolderRoleAppointment } from "@remit/backend/folder-role-appointments";
+import {
+	bindImportedFolders,
+	type ConfigBinderDeps,
+} from "@remit/config-transfer";
 import type {
 	AccountItem,
 	IAccountRepository,
 	IMailboxRepository,
 	IMailboxSpecialUseRepository,
 } from "@remit/data-ports";
+import type { CanonicalMailboxRoleValue } from "@remit/data-ports/folder-role";
 import { SyncPhase } from "@remit/domain-enums";
 import type { Logger } from "@remit/logger-lambda";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
@@ -82,12 +88,25 @@ export const syncMailboxes = async (
 	event: SyncMailboxesEvent,
 	log: Logger,
 ): Promise<void> => {
+	const client = await getClient();
 	const {
 		account: accountService,
 		mailbox: mailboxService,
 		mailboxSpecialUse: mailboxSpecialUseService,
 		secrets,
-	} = await getClient();
+	} = client;
+	const binder: ConfigBinderDeps = {
+		repositories: client,
+		appointFolderRole: (configId, accountId, role, mailboxId, lastKnownPath) =>
+			writeFolderRoleAppointment(
+				client.accountSetting,
+				configId,
+				accountId,
+				role as CanonicalMailboxRoleValue,
+				mailboxId,
+				lastKnownPath,
+			),
+	};
 
 	const { accountId } = event;
 	log.info({ event: event.type, accountId }, "Handling event");
@@ -125,6 +144,7 @@ export const syncMailboxes = async (
 					mailboxService,
 					mailboxSpecialUseService,
 					accountService,
+					binder,
 					log,
 				);
 			} catch (err) {
@@ -157,6 +177,7 @@ const syncMailboxesForAccount = async (
 	mailboxService: IMailboxRepository,
 	mailboxSpecialUseService: IMailboxSpecialUseRepository,
 	accountService: IAccountRepository,
+	binder: ConfigBinderDeps,
 	log: Logger,
 ): Promise<void> => {
 	const { accountId } = account;
@@ -194,6 +215,20 @@ const syncMailboxesForAccount = async (
 
 	log.info({ result }, "Mailbox sync complete");
 
+	// The folder list this account holds is now known, which is the one thing a
+	// configuration import could not know when it ran: every folder in a file is
+	// named by IMAP path, and the ids are minted here. Binding what is bindable
+	// belongs at exactly this point, and is idempotent, so a later discovery
+	// simply finds nothing left to do.
+	const bound = await bindImportedFolders(
+		binder,
+		account.accountConfigId,
+		accountId,
+	);
+	if (bound.bound > 0 || bound.stillPending > 0) {
+		log.info({ accountId, ...bound }, "Bound imported folder references");
+	}
+
 	const allMailboxes = await collectAllMailboxes(accountId, mailboxService);
 
 	// This fan-out is where an account's IMAP work is decided: one SEARCH per

package/src/handlers/sync-message-body.ts

@@ -158,6 +158,8 @@ export const syncMessageBody = async (
 		mailboxSpecialUse: mailboxSpecialUseRepository,
 		quarantine: quarantineRepository,
 		flagQueue: flagQueueService,
+		calendarSuggestion: calendarSuggestionService,
+		calendarUnitOfWork,
 	} = await getClient();
 
 	const account = await accountService.get(accountId);
@@ -274,6 +276,9 @@ export const syncMessageBody = async (
 					attempts: receiveCount,
 				},
 				{ flagQueueService },
+				// An invitation becomes a card the first time the message is seen,
+				// alongside the filters that run on the same pass (issue #1033).
+				{ calendarSuggestionService, calendarUnitOfWork, filterService },
 			);
 
 			// Guard at the openBox choke point (epic #1281 invariants 3 & 5). The