Paddy
33489585a0
Two changes to the admin module, both made now because it is not deployed yet
and neither is free later.
Permissions were "an app", with a `role` column reserved for a future
fine-grained model. Reviewing whether that reservation was enough found three
problems:
- Every row was written with role = 'admin', hardcoded, and the column
defaulted to it. On a `tickets` row that reads as "tickets administrator"
when it only ever meant "has access", and once real roles existed there
would have been no way to tell an old plain grant from a deliberate one.
- The role never left the database. /admin/me, the user list, the user detail
and both write endpoints all spoke apps: AppName[]. Adding roles would have
been a breaking change to /admin/me - and after the cutover that endpoint
has two more consumers, turning a local edit into a coordinated deploy of
three apps.
- The key (user_id, app) allowed one role per app, i.e. a tier rather than a
set of capabilities. Choosing later means an ALTER on a live table.
So: the key is now (user_id, app, role), the role is `access`, and APP_ROLES
in admin.schema.ts is the contract - a role not listed there is rejected with
400 rather than written. permissions: [{app, role}] is on the wire alongside
the derived apps: AppName[], which is kept because the three frontends only
ever ask "may I show this app?". Both write endpoints accept either shape, and
the invitation column (now `permissions`) is parsed leniently: invitations live
seven days, so a deploy that changes the shape has in-flight rows in the old
one. requireAppAccess(app, role?) takes an optional role; nothing passes one
yet.
countActiveAdminsForUpdate now counts DISTINCT users rather than rows. With
several roles per app, counting rows would make a single admin holding two
roles look like two admins and defeat the last-admin guard at exactly the
moment it matters.
Separately, passkey registration now fills `name` from the authenticator's
AAGUID via registration.afterVerification and better-auth's own
getAuthenticatorName, yielding "1Password", "iCloud Keychain", "Windows Hello".
Without it the column stayed NULL and the account page could only label every
passkey "Passkey" - useless when someone has to remove the one on the device
they just lost. A client-supplied name still wins; an unknown AAGUID still
leaves it blank.
148 unit tests (up from 131, including the new admin.schema.test.ts) and 41
integration tests pass. The integration suite applies sql/admin/001_init.sql,
so the new key is exercised rather than trusted.
No production migration is needed - the module is not deployed. An existing dev
database needs three statements: set role = 'access', drop and re-add the
primary key, rename invitations.apps to permissions.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
100 lines
3.1 KiB
TypeScript
100 lines
3.1 KiB
TypeScript
import {describe, expect, it} from 'vitest';
|
|
import {
|
|
ACCESS_ROLE,
|
|
appsOf,
|
|
isAppPermission,
|
|
isAppRole,
|
|
toPermissions
|
|
} from '../../src/models/admin/admin.schema.js';
|
|
|
|
/**
|
|
* The permission model is (app, role). These tests pin the two properties the
|
|
* rest of the module leans on: that the older `['tickets']` shape still means
|
|
* "tickets at the access role", and that nothing outside APP_ROLES gets in.
|
|
*/
|
|
|
|
describe('toPermissions', () => {
|
|
it('reads the full (app, role) form', () => {
|
|
expect(toPermissions([{app: 'tickets', role: 'access'}])).toEqual([
|
|
{app: 'tickets', role: 'access'}
|
|
]);
|
|
});
|
|
|
|
it('reads a plain app list as that app at the access role', () => {
|
|
expect(toPermissions(['feedback', 'admin'])).toEqual([
|
|
{app: 'feedback', role: ACCESS_ROLE},
|
|
{app: 'admin', role: ACCESS_ROLE}
|
|
]);
|
|
});
|
|
|
|
it('accepts the two forms mixed, which is what a half-migrated caller sends', () => {
|
|
expect(toPermissions(['feedback', {app: 'tickets', role: 'access'}])).toEqual([
|
|
{app: 'feedback', role: ACCESS_ROLE},
|
|
{app: 'tickets', role: ACCESS_ROLE}
|
|
]);
|
|
});
|
|
|
|
it('drops duplicates of the same (app, role)', () => {
|
|
expect(toPermissions(['tickets', {app: 'tickets', role: 'access'}])).toEqual([
|
|
{app: 'tickets', role: ACCESS_ROLE}
|
|
]);
|
|
});
|
|
|
|
it('rejects rather than silently dropping an unknown app', () => {
|
|
// Silently ignoring it would let "grant calendar + nonsense" look like a
|
|
// success while granting less than the caller asked for.
|
|
expect(toPermissions(['calendar', 'nonsense'])).toBeNull();
|
|
});
|
|
|
|
it('rejects an unknown role', () => {
|
|
expect(toPermissions([{app: 'tickets', role: 'refund'}])).toBeNull();
|
|
});
|
|
|
|
it('rejects anything that is not a list', () => {
|
|
expect(toPermissions('admin')).toBeNull();
|
|
expect(toPermissions(null)).toBeNull();
|
|
expect(toPermissions({app: 'admin', role: 'access'})).toBeNull();
|
|
});
|
|
|
|
it('reads an empty list as "no permissions", not as invalid', () => {
|
|
expect(toPermissions([])).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('isAppRole', () => {
|
|
it('accepts the access role for every app', () => {
|
|
expect(isAppRole('admin', ACCESS_ROLE)).toBe(true);
|
|
expect(isAppRole('calendar', ACCESS_ROLE)).toBe(true);
|
|
});
|
|
|
|
it('rejects a role that does not exist yet', () => {
|
|
expect(isAppRole('tickets', 'refund')).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('isAppPermission', () => {
|
|
it('needs both halves to be valid', () => {
|
|
expect(isAppPermission({app: 'tickets', role: ACCESS_ROLE})).toBe(true);
|
|
expect(isAppPermission({app: 'tickets'})).toBe(false);
|
|
expect(isAppPermission({role: ACCESS_ROLE})).toBe(false);
|
|
expect(isAppPermission(null)).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('appsOf', () => {
|
|
it('collapses several roles on one app to a single entry', () => {
|
|
// The point of the derived list: a user with two roles on tickets has
|
|
// access to tickets once, not twice.
|
|
const apps = appsOf([
|
|
{app: 'tickets', role: ACCESS_ROLE},
|
|
{app: 'tickets', role: 'future-role'},
|
|
{app: 'admin', role: ACCESS_ROLE}
|
|
]);
|
|
expect(apps).toEqual(['tickets', 'admin']);
|
|
});
|
|
|
|
it('is empty for no permissions', () => {
|
|
expect(appsOf([])).toEqual([]);
|
|
});
|
|
});
|