@remit/drizzle-service 0.0.87 → 0.0.89

package/src/repos/i4-account.ts

@@ -40,6 +40,7 @@ export function rowToAccount(
 		email: row.email,
 		authType: row.authType as AccountItem["authType"],
 		syncedServices: row.syncedServices as AccountItem["syncedServices"],
+		grantedScopes: row.grantedScopes as AccountItem["grantedScopes"],
 		passwordHash: row.passwordHash ?? undefined,
 		oauthRefreshTokenHash: row.oauthRefreshTokenHash ?? undefined,
 		oauthTokenUpdatedAt: row.oauthTokenUpdatedAt ?? undefined,
@@ -83,6 +84,7 @@ export class AccountRepo implements IAccountRepository {
 				email: input.email,
 				authType: input.authType ?? "password",
 				syncedServices: input.syncedServices ?? [AccountService.Mail],
+				grantedScopes: input.grantedScopes ?? [],
 				passwordHash: input.passwordHash,
 				oauthRefreshTokenHash: input.oauthRefreshTokenHash,
 				oauthTokenUpdatedAt: input.oauthTokenUpdatedAt,
@@ -148,6 +150,8 @@ export class AccountRepo implements IAccountRepository {
 		if (input.authType !== undefined) updates.authType = input.authType;
 		if (input.syncedServices !== undefined)
 			updates.syncedServices = input.syncedServices;
+		if (input.grantedScopes !== undefined)
+			updates.grantedScopes = input.grantedScopes;
 		if (input.passwordHash !== undefined)
 			updates.passwordHash = input.passwordHash;
 		if (input.oauthRefreshTokenHash !== undefined)

package/src/repos/i4-mailbox-special-use.sqlite.test.ts

@@ -16,6 +16,7 @@ import { createSqliteTestDb } from "../test-db-sqlite.js";
 import { AccountSettingRepo } from "./i4-account-setting.js";
 import { MailboxRepo } from "./i4-mailbox.js";
 import { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
+import { mailboxCreated } from "./test-helpers.js";
 
 const makeMailboxInput = (
 	accountId: string,
@@ -103,11 +104,15 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 
 	test("the appointment beats the folder the server flagged", async () => {
 		const { accountId, accountConfigId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const flagged = await mailboxes.create(makeMailboxInput(accountId, "Junk"));
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const flagged = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "Junk")),
+		);
 		await repo.create(flagged.mailboxId, "Junk");
-		const chosen = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX/Rubbish"),
+		const chosen = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Rubbish")),
 		);
 		await appoint(
 			accountConfigId,
@@ -126,10 +131,14 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		// the user keeps mail in. `bin` is no longer a hint, and an appointment
 		// overrides the proposal either way.
 		const { accountId, accountConfigId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const bin = await mailboxes.create(makeMailboxInput(accountId, "Bin"));
-		const gmailTrash = await mailboxes.create(
-			makeMailboxInput(accountId, "[Gmail]/Trash"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const bin = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "Bin")),
+		);
+		const gmailTrash = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "[Gmail]/Trash")),
 		);
 
 		assert.equal(
@@ -151,9 +160,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 
 	test("an appointment on a mailbox that is gone falls back rather than resolving to nothing", async () => {
 		const { accountId, accountConfigId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const archive = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX/Archive"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const archive = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Archive")),
 		);
 		await appoint(
 			accountConfigId,
@@ -171,12 +182,14 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		// `Deleted` matches the name proposal, and emptying it would destroy mail
 		// the user never put in a trash folder (audit #841).
 		const { accountId, accountConfigId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const keepsakes = await mailboxes.create(
-			makeMailboxInput(accountId, "Deleted"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const keepsakes = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "Deleted")),
 		);
-		const trash = await mailboxes.create(
-			makeMailboxInput(accountId, "[Gmail]/Trash"),
+		const trash = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "[Gmail]/Trash")),
 		);
 
 		const proposal = await repo.resolveTrashRole(accountId);
@@ -201,9 +214,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		// flagged folder both hide that; the resolution names the id the user chose
 		// so a refusal can offer the repair (#887).
 		const { accountId, accountConfigId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const flagged = await mailboxes.create(
-			makeMailboxInput(accountId, "[Gmail]/Trash"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const flagged = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "[Gmail]/Trash")),
 		);
 		await repo.create(flagged.mailboxId, "Trash");
 		const appointed = randomUUID();
@@ -237,9 +252,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 
 	test("resolves an INBOX-nested Junk folder that advertises \\Junk", async () => {
 		const { accountId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const spam = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX/Spam"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const spam = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Spam")),
 		);
 		await repo.create(spam.mailboxId, "Junk");
 
@@ -252,9 +269,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		// bare names, so `INBOX/Spam` resolved to nothing on a server that
 		// advertises no \Junk.
 		const { accountId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const spam = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX/Spam"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const spam = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Spam")),
 		);
 
 		const found = await repo.findJunkMailbox(accountId);
@@ -266,9 +285,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		// whole-path rule, so `INBOX/Trash` resolved to nothing and a delete
 		// refused on an account that plainly has a Trash folder.
 		const { accountId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const trash = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX/Trash"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const trash = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Trash")),
 		);
 
 		assert.equal(
@@ -286,9 +307,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 
 	test("resolves an INBOX-nested Archive folder that advertises no special use", async () => {
 		const { accountId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		const archive = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX/Archive"),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		const archive = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Archive")),
 		);
 
 		assert.equal(
@@ -299,12 +322,14 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 
 	test("splits the leaf on the account's own delimiter, not on a slash", async () => {
 		const { accountId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX", "."));
-		const trash = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX.Trash", "."),
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX", ".")),
 		);
-		const archive = await mailboxes.create(
-			makeMailboxInput(accountId, "INBOX.Archive", "."),
+		const trash = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX.Trash", ".")),
+		);
+		const archive = mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX.Archive", ".")),
 		);
 
 		assert.equal(
@@ -319,8 +344,12 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 
 	test("answers null when the account has no Junk folder at all", async () => {
 		const { accountId } = await makeAccount();
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
-		await mailboxes.create(makeMailboxInput(accountId, "INBOX/Work"));
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX")),
+		);
+		mailboxCreated(
+			await mailboxes.create(makeMailboxInput(accountId, "INBOX/Work")),
+		);
 
 		assert.equal(await repo.findJunkMailbox(accountId), null);
 	});

package/src/repos/i4-mailbox.sqlite.test.ts

@@ -11,6 +11,7 @@ import {
 	shippedTableDdl,
 } from "../test-shipped-sqlite-schema.js";
 import { MailboxRepo } from "./i4-mailbox.js";
+import { mailboxCreated } from "./test-helpers.js";
 
 function makeMailboxInput(accountId: string, fullPath = "INBOX") {
 	return {
@@ -50,10 +51,12 @@ describe("MailboxRepo (sqlite)", () => {
 		const accountId = randomUUID();
 		const modseq = "18446744073709551615";
 
-		const created = await repo.create({
-			...makeMailboxInput(accountId),
-			highestModseq: modseq,
-		});
+		const created = mailboxCreated(
+			await repo.create({
+				...makeMailboxInput(accountId),
+				highestModseq: modseq,
+			}),
+		);
 		assert.equal(created.highestModseq, modseq);
 
 		const fetched = await repo.get(accountId, created.mailboxId);
@@ -70,8 +73,8 @@ describe("MailboxRepo (sqlite)", () => {
 
 	test("a row written without a state reads back synced (D1)", async () => {
 		const accountId = randomUUID();
-		const created = await repo.create(
-			makeMailboxInput(accountId, "Discovered"),
+		const created = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Discovered")),
 		);
 		assert.equal(created.syncStatus, MailboxSyncStatus.synced);
 		const fetched = await repo.get(accountId, created.mailboxId);
@@ -80,7 +83,9 @@ describe("MailboxRepo (sqlite)", () => {
 
 	test("pendingPath round-trips and clears", async () => {
 		const accountId = randomUUID();
-		const created = await repo.create(makeMailboxInput(accountId, "Archive"));
+		const created = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Archive")),
+		);
 		assert.equal(created.pendingPath, undefined);
 
 		const claimed = await repo.transition(accountId, created.mailboxId, {
@@ -102,6 +107,53 @@ describe("MailboxRepo (sqlite)", () => {
 		assert.equal(settled?.pendingPath, undefined);
 		assert.equal(settled?.fullPath, "Records");
 	});
+
+	test("a second row at a path the account holds is refused as PathTaken", async () => {
+		const accountId = randomUUID();
+		const first = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Notifications")),
+		);
+
+		const second = await repo.create(
+			makeMailboxInput(accountId, "Notifications"),
+		);
+
+		assert.deepEqual(second, { outcome: "PathTaken" });
+		assert.equal(
+			(await repo.findByPath(accountId, "Notifications"))?.mailboxId,
+			first.mailboxId,
+		);
+	});
+
+	test("another account may hold the same path", async () => {
+		const created = await repo.create(
+			makeMailboxInput(randomUUID(), "Notifications"),
+		);
+		assert.equal(created.outcome, "Created");
+	});
+
+	test("a write that moves a row onto a path another row holds is rejected", async () => {
+		const accountId = randomUUID();
+		mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "INBOX/Notifications")),
+		);
+		const recreated = mailboxCreated(
+			await repo.create({
+				...makeMailboxInput(accountId, "Notifications"),
+				syncStatus: MailboxSyncStatus.pending,
+			}),
+		);
+
+		await assert.rejects(
+			repo.transition(accountId, recreated.mailboxId, {
+				from: [MailboxSyncStatus.pending],
+				wherePendingPath: null,
+				to: MailboxSyncStatus.synced,
+				set: { fullPath: "INBOX/Notifications" },
+			}),
+			/UNIQUE constraint failed: mailbox\.account_id, mailbox\.full_path/,
+		);
+	});
 });
 
 /**
@@ -126,6 +178,7 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 		applyMigration(sqlite, "0026_mailbox_sync_status_backfill");
 		applyMigration(sqlite, "0027_mailbox_sync_status_total");
 		applyMigration(sqlite, "0028_mailbox_pending_path");
+		applyMigration(sqlite, "0031_mailbox_path_unique");
 		const db = drizzle(sqlite, { schema: { mailbox: mailboxTable } });
 		repo = new MailboxRepo(db as never);
 		close = async () => {
@@ -146,10 +199,12 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 
 	test("reads a plain-digit cursor back as a string", async () => {
 		const accountId = randomUUID();
-		const created = await repo.create({
-			...makeMailboxInput(accountId),
-			highestModseq: "900",
-		});
+		const created = mailboxCreated(
+			await repo.create({
+				...makeMailboxInput(accountId),
+				highestModseq: "900",
+			}),
+		);
 
 		assert.strictEqual(created.highestModseq, "900");
 
@@ -159,10 +214,12 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 
 	test("keeps a resumable cursor intact", async () => {
 		const accountId = randomUUID();
-		const created = await repo.create({
-			...makeMailboxInput(accountId, "Archive"),
-			highestModseq: "900:149",
-		});
+		const created = mailboxCreated(
+			await repo.create({
+				...makeMailboxInput(accountId, "Archive"),
+				highestModseq: "900:149",
+			}),
+		);
 
 		const fetched = await repo.get(accountId, created.mailboxId);
 		assert.strictEqual(fetched.highestModseq, "900:149");
@@ -170,13 +227,17 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 
 	test("a row inserted without a state reads back synced", async () => {
 		const accountId = randomUUID();
-		const created = await repo.create(makeMailboxInput(accountId, "Notes"));
+		const created = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Notes")),
+		);
 		assert.equal(created.syncStatus, MailboxSyncStatus.synced);
 	});
 
 	test("pendingPath round-trips and clears on the shipped shape", async () => {
 		const accountId = randomUUID();
-		const created = await repo.create(makeMailboxInput(accountId, "Receipts"));
+		const created = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Receipts")),
+		);
 
 		const claimed = await repo.transition(accountId, created.mailboxId, {
 			from: [MailboxSyncStatus.synced],
@@ -196,10 +257,12 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 	test("round-trips a cursor above 2^53 with its exact digits", async () => {
 		const accountId = randomUUID();
 		const modseq = "18446744073709551615";
-		const created = await repo.create({
-			...makeMailboxInput(accountId, "Sent"),
-			highestModseq: modseq,
-		});
+		const created = mailboxCreated(
+			await repo.create({
+				...makeMailboxInput(accountId, "Sent"),
+				highestModseq: modseq,
+			}),
+		);
 
 		assert.strictEqual(created.highestModseq, modseq);
 		const fetched = await repo.get(accountId, created.mailboxId);