@remit/config-transfer 0.0.12 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/config-transfer",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/import.test.ts

@@ -50,7 +50,6 @@ const IDENTITY = {
 };
 
 const TARGET_CONFIG_ID = "1a2b3c4d5e6f7a8b9c0d1e2f3";
-const TARGET_USER_ID = "9f8e7d6c-5b4a-4938-8271-605f4e3d2c1b";
 
 const INBOX_ID = "mbx-inbox";
 const SENT_ID = "mbx-sent";
@@ -541,7 +540,6 @@ const apply = (
 ) =>
 	importConfig(depsOf(store, TARGET_CONFIG_ID), {
 		accountConfigId: TARGET_CONFIG_ID,
-		userId: TARGET_USER_ID,
 		document,
 		mode: "apply",
 		onExisting,
@@ -647,7 +645,6 @@ test("validate writes nothing and still says what an apply would do", async () =
 
 	const outcome = await importConfig(depsOf(store, TARGET_CONFIG_ID), {
 		accountConfigId: TARGET_CONFIG_ID,
-		userId: TARGET_USER_ID,
 		document,
 		mode: "validate",
 		onExisting: "abort",
@@ -675,7 +672,6 @@ test("a configuration that already holds something refuses the default import",
 
 	const outcome = await importConfig(depsOf(store, ACCOUNT_CONFIG_ID), {
 		accountConfigId: ACCOUNT_CONFIG_ID,
-		userId: TARGET_USER_ID,
 		document,
 		mode: "apply",
 		onExisting: "abort",
@@ -702,7 +698,6 @@ test("a junk-only sender the user decided about still holds the configuration",
 
 	const outcome = await importConfig(depsOf(store, ACCOUNT_CONFIG_ID), {
 		accountConfigId: ACCOUNT_CONFIG_ID,
-		userId: TARGET_USER_ID,
 		document,
 		mode: "apply",
 		onExisting: "abort",
@@ -918,7 +913,6 @@ test("the dry run names the filters an apply would leave off", async () => {
 
 	const outcome = await importConfig(depsOf(store, TARGET_CONFIG_ID), {
 		accountConfigId: TARGET_CONFIG_ID,
-		userId: TARGET_USER_ID,
 		document,
 		mode: "validate",
 		onExisting: "abort",
@@ -1521,7 +1515,6 @@ test("the dry run names the same folders and credentials the apply does", async
 	const planned = reportOf(
 		await importConfig(depsOf(planStore, TARGET_CONFIG_ID), {
 			accountConfigId: TARGET_CONFIG_ID,
-			userId: TARGET_USER_ID,
 			document,
 			mode: "validate",
 			onExisting: "abort",
@@ -1595,7 +1588,7 @@ test("the configuration row is created when the database holds none, and named f
 	assert.equal(store.accountConfigs.get(TARGET_CONFIG_ID)?.name, "Matthijs");
 	assert.equal(
 		store.accountConfigs.get(TARGET_CONFIG_ID)?.userId,
-		TARGET_USER_ID,
+		TARGET_CONFIG_ID,
 	);
 	assert.equal(
 		store.settings.get("DefaultComposerFormat")?.value.value,

package/src/import.ts

@@ -14,11 +14,11 @@ import {
 	type FilterItem,
 	type LabelItem,
 } from "@remit/data-ports";
+import { ensureAccountConfig } from "@remit/data-ports/account-config";
 import {
 	type AccountSettingNameValue,
 	composeSettingName,
 } from "@remit/data-ports/account-settings";
-import { NotFoundError } from "@remit/data-ports/errors";
 import type { CanonicalMailboxRoleValue } from "@remit/data-ports/folder-role";
 import { deriveAddressId } from "@remit/data-ports/id";
 import {
@@ -44,8 +44,6 @@ const NO_ACTION = "None";
 
 export interface ImportConfigInput {
 	accountConfigId: string;
-	/** Owner of a configuration this import may have to create the row for. */
-	userId: string;
 	document: unknown;
 	mode: "validate" | "apply";
 	onExisting: "abort" | "merge";
@@ -367,7 +365,7 @@ const applyDocument = async (
 	// First: everything below hangs off it, and on a fresh instance there is no
 	// row for an account to reference until this has run.
 	await write(ConfigImportSection.Settings, "accountConfig", () =>
-		ensureAccountConfig(deps, input, document),
+		nameAccountConfig(deps, input, document),
 	);
 
 	// ---- accounts -------------------------------------------------------
@@ -687,32 +685,17 @@ const writeAddressFlags = async (
 /**
  * The configuration row itself. A fresh instance holds none — `GET /config`
  * synthesizes an empty answer rather than writing one — so an import into a
- * dropped database has to materialize it before anything can hang off it.
+ * dropped database has to materialize it, the same way every other first write
+ * does, before anything can hang off it.
  */
-const ensureAccountConfig = async (
+const nameAccountConfig = async (
 	deps: ConfigImportDeps,
 	input: ImportConfigInput,
 	document: ReaderConfigDocument,
 ): Promise<void> => {
 	const { accountConfig } = deps.repositories;
-	// Absence is the expected answer on a fresh instance and the only one that
-	// means "create it"; anything else is a store fault and belongs to the caller.
-	const held = await accountConfig
-		.get(input.accountConfigId)
-		.catch((error: unknown) => {
-			if (error instanceof NotFoundError) return undefined;
-			throw error;
-		});
+	const held = await ensureAccountConfig(accountConfig, input.accountConfigId);
 	const name = document.accountConfig.name;
-
-	if (!held) {
-		await accountConfig.create({
-			accountConfigId: input.accountConfigId,
-			userId: input.userId,
-			name,
-		});
-		return;
-	}
 	if (name !== "" && name !== held.name) {
 		await accountConfig.update(input.accountConfigId, { name });
 	}