Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions packages/dms/src/mcp/page-verify/accounts.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CROSS_INSTANCE } from "@antelopejs/interface-database";
import { CROSS_INSTANCE, ValueProxy } from "@antelopejs/interface-database";
import { GetModel } from "@antelopejs/interface-database-decorators";
import { createSession } from "@antelopejs/interface-dms/auth";
import {
Expand Down Expand Up @@ -81,38 +81,51 @@ async function ownerTenantId(owner: User): Promise<string> {
}

/**
* A member holding `roleId` and nothing more: any other role, or owning the
* workspace or the platform, could open what the role alone does not.
* A member of `model`'s instance holding `roleId` and nothing more: any other
* role, or owning the workspace or the platform, could open what the role
* alone does not.
*/
export function pickMember(
members: readonly MemberRoles[],
export async function pickMember(
model: TenantMemberModel,
roleId: string,
ownerIds: ReadonlySet<string>,
): MemberRoles | undefined {
return members.find(
(member) =>
member.roleIds.length === 1 &&
member.roleIds[0] === roleId &&
!member.isTenantOwner &&
!ownerIds.has(member.userId),
);
): Promise<MemberRoles | undefined> {
const member = await model.table
.filter((row) =>
row
.key("roleIds", [])
.eq([roleId])
.and(row.key("isTenantOwner").eq(true).not())
.and(
ValueProxy.constant<string[]>([...ownerIds])
.includes(row.key("userId"))
.not(),
),
)
.pluck("userId", "roleIds", "isTenantOwner")
.nth(0)
.default(null)
.run();
return member ?? undefined;
}

/** The owner's workspace, its roles, and a member to sign in as for each role. */
export async function loadWorkspace(): Promise<Workspace> {
const owner = await findOwner();
const tenantId = await ownerTenantId(owner);
const [roles, members, owners] = await Promise.all([
const [roles, owners] = await Promise.all([
GetModel(RoleModel, tenantId).getAll(),
GetModel(TenantMemberModel, tenantId).listAll(),
GetModel(UserModel).getOwners(),
]);
const ownerIds = new Set(owners.map((user) => user._id));
const memberByRole = new Map<string, MemberRoles>();
for (const role of roles) {
const member = pickMember(members, role._id, ownerIds);
if (member !== undefined) memberByRole.set(role._id, member);
}
const members = GetModel(TenantMemberModel, tenantId);
const picked = await Promise.all(
roles.map(async (role): Promise<Array<[string, MemberRoles]>> => {
const member = await pickMember(members, role._id, ownerIds);
return member === undefined ? [] : [[role._id, member]];
}),
);
const memberByRole = new Map(picked.flat());
return { tenantId, owner, roles, memberByRole };
}

Expand Down
4 changes: 0 additions & 4 deletions packages/dms/src/test/helpers/page-layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ class UnqueriedMemberModel extends TenantMemberModel {
return refuse("memberships");
}

override async listAll(): Promise<never> {
return refuse("memberships");
}

override async listOwners(): Promise<never> {
return refuse("memberships");
}
Expand Down
13 changes: 10 additions & 3 deletions packages/dms/src/test/integration/notification-recipients.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ async function recipients(): Promise<string[]> {
return rows.map((row) => row.userId).sort();
}

function holdersInJs(members: TenantMember[], roleIds: string[]): string[] {
function holdersInJs(
members: Pick<TenantMember, "userId" | "roleIds">[],
roleIds: string[],
): string[] {
const wanted = new Set(roleIds);
const userIds = new Set<string>();
for (const row of members) {
Expand Down Expand Up @@ -86,7 +89,9 @@ describe("Notification recipients (MongoDB adapter)", () => {
});

it("sends to a role the members of one tenant the in-memory filter picked", async () => {
const members = await GetModel(TenantMemberModel, "recipients-a").listAll();
const members = await GetModel(TenantMemberModel, "recipients-a")
.table.pluck("userId", "roleIds")
.run();

await internal.SendToRoles([ADMIN, SUPPORT], data, {
tenantId: "recipients-a",
Expand All @@ -99,7 +104,9 @@ describe("Notification recipients (MongoDB adapter)", () => {
});

it("sends once to a user holding the role in several tenants when read across them", async () => {
const members = await GetModel(TenantMemberModel, CROSS_INSTANCE).listAll();
const members = await GetModel(TenantMemberModel, CROSS_INSTANCE)
.table.pluck("userId", "roleIds")
.run();

await internal.SendToRoles([ADMIN, SUPPORT], data, { dedupe: false });

Expand Down
48 changes: 41 additions & 7 deletions packages/dms/src/test/unit/mcp/page-verify.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { GetModel } from "@antelopejs/interface-database-decorators";
import { TenantMemberModel } from "@antelopejs/interface-dms/db";
import type { JsonValue } from "@antelopejs/interface-dms/json";
import type { PageInfo } from "@antelopejs/interface-dms/page";
import { expect } from "chai";
import { isToolAllowed } from "../../../mcp/access";
import {
listFailures,
type MemberRoles,
pickMember,
type PageProbe,
type PageReport,
Expand Down Expand Up @@ -211,23 +212,56 @@ function namesSourcesAndJudgesOpeners(): void {
}

function checksRolesAndListsFailures(): void {
it("checks a role only through a member holding that role alone, never through an owner or a member with more roles", () => {
it("checks a role only through a member of the workspace holding that role alone, never through an owner or a member with more roles", async () => {
const tenant = "page-verify-pick-member";
const member = (
userId: string,
roleIds: string[],
isTenantOwner = false,
): MemberRoles => ({ userId, roleIds, isTenantOwner });
const members = [
) => ({
_id: `${tenant}-${userId}`,
userId,
roleIds,
isTenantOwner,
joinedAt: new Date("2026-06-01T00:00:00Z"),
invitedBy: null,
});
const members = GetModel(TenantMemberModel, tenant);
await members.insert([
member("both", ["nobody", "viewer"]),
member("owner", ["viewer"], true),
member("platform", ["viewer"]),
member("viewer-only", ["viewer"]),
];
member("auditor-only", ["auditor"]),
]);
await members.table
.insert({
_id: `${tenant}-unflagged`,
userId: "unflagged",
roleIds: ["editor"],
joinedAt: new Date("2026-06-01T00:00:00Z"),
invitedBy: null,
})
.run();
await GetModel(TenantMemberModel, `${tenant}-other`).insert([
member("elsewhere", ["solo"]),
]);
const owners = new Set(["platform"]);
expect(pickMember(members, "nobody", owners)).to.equal(undefined);
expect(pickMember(members, "viewer", owners)?.userId).to.equal(

expect(await pickMember(members, "nobody", owners)).to.equal(undefined);
expect(await pickMember(members, "solo", new Set())).to.equal(undefined);
expect((await pickMember(members, "viewer", owners))?.userId).to.equal(
"viewer-only",
);
expect((await pickMember(members, "auditor", new Set()))?.userId).to.equal(
"auditor-only",
);
expect(
await pickMember(members, "auditor", new Set(["auditor-only"])),
).to.equal(undefined);
expect((await pickMember(members, "editor", owners))?.userId).to.equal(
"unflagged",
);
});

it("lists one line per failed check and none for the checks that passed", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@ const CAPABILITIES = { canAdd: true, canEdit: true, canDelete: true };

const ROLE_KEYS = ["support", "admin", "ops-1", "ops-2", "unheld"];

/** The fields of a membership the in-memory answers read. */
type StoredMember = Pick<
TenantMember,
"_id" | "userId" | "roleIds" | "isTenantOwner"
>;

interface Fixture {
roles: Role[];
members: TenantMember[];
members: StoredMember[];
invites: UserInvite[];
}

Expand Down Expand Up @@ -136,7 +142,7 @@ function isInvitePending(invite: UserInvite, now: Date): boolean {
return new Date(invite.expiresAt).getTime() > now.getTime();
}

function holdsRole(roleId: string, member: TenantMember): boolean {
function holdsRole(roleId: string, member: StoredMember): boolean {
return (member.roleIds ?? []).includes(roleId);
}

Expand All @@ -153,7 +159,7 @@ function pendingInvitesFor(

function countRoleHoldersInJs(
roleId: string,
members: TenantMember[],
members: StoredMember[],
invites: UserInvite[],
now: Date,
): number {
Expand All @@ -163,7 +169,7 @@ function countRoleHoldersInJs(
);
}

function previewInJs(members: TenantMember[], userNames: Map<string, string>) {
function previewInJs(members: StoredMember[], userNames: Map<string, string>) {
return members.slice(0, ROLE_MEMBER_PREVIEW_LIMIT).map((member) => ({
userId: member.userId,
name: userNames.get(member.userId) ?? "",
Expand Down Expand Up @@ -196,7 +202,9 @@ function summarizeRolesInJs(

async function storedRows(tenantId: string) {
const [members, invites] = await Promise.all([
GetModel(TenantMemberModel, tenantId).listAll(),
GetModel(TenantMemberModel, tenantId)
.table.pluck("_id", "userId", "roleIds", "isTenantOwner")
.run(),
GetModel(UserInviteModel, tenantId).getAll(),
]);
return { members, invites };
Expand Down
1 change: 0 additions & 1 deletion packages/interface-dms/docs/1.core/5.tenancy.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ Table `tenant_members` in `dms-tenant`. It holds one row per member of the tenan
| ------ | ------- |
| `getByUser(userId)` | `Promise<TenantMember \| undefined>` |
| `existsByUser(userId)` | `Promise<boolean>` |
| `listAll()` | `Promise<TenantMember[]>` |
| `listOwners()` | `Promise<TenantMember[]>`, the members with `isTenantOwner` set |
| `listByUserWithTenantIds(userId)` | `Promise<Array<{ tenantId: string; member: TenantMember }>>` |
| `getOldestByUser(userId)` | `Promise<{ tenantId: string; member: TenantMember } \| undefined>`, the row with the earliest `joinedAt` |
Expand Down
7 changes: 0 additions & 7 deletions packages/interface-dms/src/db/models/tenantMembers.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ export class TenantMemberModel extends BasicDataModel(
return count > 0;
}

async listAll(): Promise<TenantMember[]> {
const rows = await this.table.run();
return rows
.map((row) => TenantMemberModel.fromDatabase(row))
.filter((member): member is TenantMember => member !== undefined);
}

async listOwners(): Promise<TenantMember[]> {
const rows = await this.table
.filter((row) => row.key("isTenantOwner").eq(true))
Expand Down
Loading