Skip to content

fix(showcase): stop passing a non-existent org column when seeding the phone demo user #3408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
os-zhuang merged 1 commit into from
Jul 22, 2026
Merged

fix(showcase): stop passing a non-existent org column when seeding the phone demo user #3408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 17 additions & 21 deletions examples/app-showcase/src/security/seed-approval-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,16 @@ async function assignAdminPositions(
}

/** Provision a phone-based demo user (best-effort; renders the phone surfaces). */
async function ensurePhoneDemoUser(ctx: ApprovalDemoContext, organizationId: string | null): Promise<void> {
async function ensurePhoneDemoUser(ctx: ApprovalDemoContext): Promise<void> {
const existing = await findOne(ctx, 'sys_user', { email: PHONE_DEMO_USER.email });
if (existing) return;
try {
await ctx.ql.insert(
'sys_user',
{
...PHONE_DEMO_USER,
...(organizationId ? { organization_id: organizationId } : {}),
},
{ context: SYS },
);
// `sys_user` carries NO org column — org membership lives on `sys_member`
// (see the resolution in `run` below). An `organization_id` key here is not
// silently dropped: it reaches SQL as a real column and the insert dies with
// "table sys_user has no column named organization_id", so the demo user is
// never provisioned and the phone surfaces render empty.
await ctx.ql.insert('sys_user', { ...PHONE_DEMO_USER }, { context: SYS });
ctx.logger?.info?.('[showcase] approval-demo phone user provisioned', { email: PHONE_DEMO_USER.email });
} catch (err) {
// Non-fatal: sign-in still needs a better-auth account; this row just makes
Expand Down Expand Up @@ -215,20 +213,18 @@ export function registerShowcaseApprovalDemo(ctx: ApprovalDemoContext): void {
return;
}
const adminId = String(admin.id);
// The active org lives on the better-auth membership (`sys_member`), NOT on
// `sys_user.organization_id` (which is null for the dev admin). Both the
// position rows AND the requests must carry this org, or the org-scoped
// approver resolution (`sys_user_position` filtered by org) and `getRequest`
// (org-scoped read that the inbox drawer uses) silently return nothing.
let organizationId = (admin.organization_id as string | undefined) ?? null;
if (!organizationId) {
const ownerMember = await findOne(ctx, 'sys_member', { user_id: adminId, role: 'owner' });
const anyMember = ownerMember ?? (await findOne(ctx, 'sys_member', { user_id: adminId }));
organizationId = (anyMember?.organization_id as string | undefined) ?? null;
}
// The active org lives on the better-auth membership (`sys_member`).
// `sys_user` has no org column at all, so there is nothing to read off the
// admin row first. Both the position rows AND the requests must carry this
// org, or the org-scoped approver resolution (`sys_user_position` filtered
// by org) and `getRequest` (the org-scoped read behind the inbox drawer)
// silently return nothing.
const ownerMember = await findOne(ctx, 'sys_member', { user_id: adminId, role: 'owner' });
const anyMember = ownerMember ?? (await findOne(ctx, 'sys_member', { user_id: adminId }));
const organizationId = (anyMember?.organization_id as string | undefined) ?? null;

await assignAdminPositions(ctx, adminId, organizationId);
await ensurePhoneDemoUser(ctx, organizationId);
await ensurePhoneDemoUser(ctx);

let engine: AutomationEngineLike | undefined;
try {
Expand Down
Loading