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>
223 lines
6.6 KiB
TypeScript
223 lines
6.6 KiB
TypeScript
import {vi, describe, it, expect, beforeEach, type Mock} from 'vitest';
|
|
import {Request, Response} from 'express';
|
|
|
|
vi.mock('../../src/models/admin/admin.auth.js', () => ({
|
|
auth: {api: {getSession: vi.fn()}}
|
|
}));
|
|
vi.mock('../../src/models/admin/users/users.admin.service.js', () => ({
|
|
loadAccess: vi.fn()
|
|
}));
|
|
|
|
import {auth} from '../../src/models/admin/admin.auth.js';
|
|
import * as UsersService from '../../src/models/admin/users/users.admin.service.js';
|
|
import {requireAppAccess, requireSignedIn, resolveAccess} from '../../src/models/admin/admin.middleware.js';
|
|
|
|
const mockGetSession = auth.api.getSession as unknown as Mock;
|
|
const mockLoadAccess = UsersService.loadAccess as Mock;
|
|
|
|
const makeReq = (): Request => ({headers: {cookie: 'nachklang.session_token=abc'}} as unknown as Request);
|
|
|
|
const makeRes = (): Response => {
|
|
const res: any = {};
|
|
res.status = vi.fn().mockReturnValue(res);
|
|
res.send = vi.fn().mockReturnValue(res);
|
|
res.locals = {};
|
|
return res as Response;
|
|
};
|
|
|
|
const activeUser = {
|
|
id: 'u1',
|
|
email: 'a@nachklang.art',
|
|
displayName: 'A',
|
|
disabled: false,
|
|
permissions: [
|
|
{app: 'feedback', role: 'access'},
|
|
{app: 'admin', role: 'access'}
|
|
],
|
|
apps: ['feedback', 'admin']
|
|
};
|
|
|
|
describe('resolveAccess', () => {
|
|
beforeEach(() => {
|
|
mockGetSession.mockReset();
|
|
mockLoadAccess.mockReset();
|
|
});
|
|
|
|
it('returns null without a valid session', async () => {
|
|
mockGetSession.mockResolvedValue(null);
|
|
expect(await resolveAccess(makeReq())).toBeNull();
|
|
expect(mockLoadAccess).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('returns null when the session points at a user row that is gone', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue(null);
|
|
expect(await resolveAccess(makeReq())).toBeNull();
|
|
});
|
|
|
|
it('resolves identity and permissions in a single permission query', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue(activeUser);
|
|
|
|
expect(await resolveAccess(makeReq())).toEqual({
|
|
id: 'u1',
|
|
email: 'a@nachklang.art',
|
|
displayName: 'A',
|
|
disabled: false,
|
|
permissions: [
|
|
{app: 'feedback', role: 'access'},
|
|
{app: 'admin', role: 'access'}
|
|
],
|
|
apps: ['feedback', 'admin']
|
|
});
|
|
// No cookieCache: exactly one lookup per request, never zero.
|
|
expect(mockLoadAccess).toHaveBeenCalledTimes(1);
|
|
});
|
|
});
|
|
|
|
describe('requireSignedIn', () => {
|
|
beforeEach(() => {
|
|
mockGetSession.mockReset();
|
|
mockLoadAccess.mockReset();
|
|
});
|
|
|
|
it('401s without a session', async () => {
|
|
mockGetSession.mockResolvedValue(null);
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireSignedIn(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(401);
|
|
expect(next).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('403s a disabled user that still holds a valid cookie', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue({...activeUser, disabled: true});
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireSignedIn(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(next).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('admits a signed-in user with no app permissions at all', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue({...activeUser, apps: []});
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireSignedIn(makeReq(), res, next);
|
|
|
|
expect(next).toHaveBeenCalled();
|
|
expect(res.locals.admin.apps).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('requireAppAccess', () => {
|
|
beforeEach(() => {
|
|
mockGetSession.mockReset();
|
|
mockLoadAccess.mockReset();
|
|
});
|
|
|
|
it('401s without a session', async () => {
|
|
mockGetSession.mockResolvedValue(null);
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('feedback')(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(401);
|
|
});
|
|
|
|
it('403s a signed-in user without that app permission', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue({
|
|
...activeUser,
|
|
permissions: [{app: 'feedback', role: 'access'}],
|
|
apps: ['feedback']
|
|
});
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('tickets')(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(next).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('403s a disabled user even when they hold the permission', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue({...activeUser, disabled: true});
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('feedback')(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
});
|
|
|
|
it('passes through and exposes the identity the feedback/tickets services expect', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue(activeUser);
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('feedback')(makeReq(), res, next);
|
|
|
|
expect(next).toHaveBeenCalled();
|
|
expect(res.locals.admin).toMatchObject({id: 'u1', email: 'a@nachklang.art', displayName: 'A'});
|
|
});
|
|
|
|
it('500s (never allows through) when the permission query throws', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockRejectedValue(new Error('db down'));
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('feedback')(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(500);
|
|
expect(next).not.toHaveBeenCalled();
|
|
});
|
|
|
|
// The seam a finer per-app permission arrives through. Nothing passes a role
|
|
// today, so these two pin the behaviour before there is anything to break.
|
|
it('403s when a specific role is required and the user only holds another', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue({
|
|
...activeUser,
|
|
permissions: [{app: 'tickets', role: 'access'}],
|
|
apps: ['tickets']
|
|
});
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('tickets', 'refund')(makeReq(), res, next);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(next).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('passes when the user holds exactly the required role', async () => {
|
|
mockGetSession.mockResolvedValue({user: {id: 'u1'}});
|
|
mockLoadAccess.mockResolvedValue({
|
|
...activeUser,
|
|
permissions: [
|
|
{app: 'tickets', role: 'access'},
|
|
{app: 'tickets', role: 'refund'}
|
|
],
|
|
apps: ['tickets']
|
|
});
|
|
const res = makeRes();
|
|
const next = vi.fn();
|
|
|
|
await requireAppAccess('tickets', 'refund')(makeReq(), res, next);
|
|
|
|
expect(next).toHaveBeenCalled();
|
|
});
|
|
});
|