admin) User management admin page (#35)
All checks were successful
Build and Push Image / docker-build-and-push (push) Successful in 2m20s
All checks were successful
Build and Push Image / docker-build-and-push (push) Successful in 2m20s
Reviewed-on: #35 Reviewed-by: shaun <shaun@campbellwireless.net> Co-authored-by: AI Agent <ai-agent@campbellwireless.net> Co-committed-by: AI Agent <ai-agent@campbellwireless.net>
This commit was merged in pull request #35.
This commit is contained in:
@@ -53,6 +53,18 @@ export function runMigrations(db: Database): void {
|
||||
)
|
||||
`);
|
||||
|
||||
db.run(`
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id TEXT PRIMARY KEY,
|
||||
username TEXT NOT NULL,
|
||||
full_name TEXT NOT NULL,
|
||||
email TEXT,
|
||||
auth_source TEXT NOT NULL,
|
||||
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
||||
)
|
||||
`);
|
||||
|
||||
db.run(`
|
||||
CREATE TABLE IF NOT EXISTS cities (
|
||||
id INTEGER PRIMARY KEY,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { db } from './db/index.js';
|
||||
import { randomUUID } from 'crypto';
|
||||
import { upsertUserProfile } from './users.js';
|
||||
|
||||
export interface Person {
|
||||
id: string;
|
||||
@@ -33,6 +34,7 @@ export function upsertSelfProfile(
|
||||
WHERE id = ?`,
|
||||
[firstName, lastName, email ?? null, existing.id]
|
||||
);
|
||||
upsertUserProfile(userId, `${firstName} ${lastName}`.trim(), email ?? null);
|
||||
return db.get<Person>('SELECT * FROM people WHERE id = ?', [existing.id])!;
|
||||
}
|
||||
const id = randomUUID();
|
||||
@@ -41,6 +43,7 @@ export function upsertSelfProfile(
|
||||
VALUES (?, ?, ?, ?, ?, 1)`,
|
||||
[id, userId, firstName, lastName, email ?? null]
|
||||
);
|
||||
upsertUserProfile(userId, `${firstName} ${lastName}`.trim(), email ?? null);
|
||||
return db.get<Person>('SELECT * FROM people WHERE id = ?', [id])!;
|
||||
}
|
||||
|
||||
|
||||
102
src/lib/server/users.test.ts
Normal file
102
src/lib/server/users.test.ts
Normal file
@@ -0,0 +1,102 @@
|
||||
import { beforeEach, afterEach, describe, expect, it } from 'vitest';
|
||||
import { setupTestDb } from '../../tests/helpers.js';
|
||||
import type { Database } from './db/types.js';
|
||||
import {
|
||||
deleteUser,
|
||||
listUsers,
|
||||
updateUser,
|
||||
upsertUserFromAuth,
|
||||
upsertUserProfile
|
||||
} from './users.js';
|
||||
|
||||
let database: Database;
|
||||
beforeEach(() => {
|
||||
database = setupTestDb();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
database.close();
|
||||
});
|
||||
|
||||
describe('upsertUserFromAuth', () => {
|
||||
it('creates a new user with profile data', () => {
|
||||
const created = upsertUserFromAuth({
|
||||
id: 'u1',
|
||||
username: 'jdoe',
|
||||
fullName: 'Jane Doe',
|
||||
email: 'jane@example.com',
|
||||
authSource: 'OIDC - Synology'
|
||||
});
|
||||
expect(created.id).toBe('u1');
|
||||
expect(created.username).toBe('jdoe');
|
||||
expect(created.full_name).toBe('Jane Doe');
|
||||
expect(created.email).toBe('jane@example.com');
|
||||
expect(created.auth_source).toBe('OIDC - Synology');
|
||||
expect(listUsers()).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('updates existing users with new auth data', () => {
|
||||
upsertUserFromAuth({
|
||||
id: 'u1',
|
||||
username: 'jdoe',
|
||||
fullName: 'Jane Doe',
|
||||
email: 'jane@example.com',
|
||||
authSource: 'OIDC - Synology'
|
||||
});
|
||||
const updated = upsertUserFromAuth({
|
||||
id: 'u1',
|
||||
username: 'janed',
|
||||
email: 'jane.doe@example.com'
|
||||
});
|
||||
expect(updated.username).toBe('janed');
|
||||
expect(updated.email).toBe('jane.doe@example.com');
|
||||
});
|
||||
});
|
||||
|
||||
describe('upsertUserProfile', () => {
|
||||
it('creates a user from profile details', () => {
|
||||
const created = upsertUserProfile('u2', 'Sam Sample', 'sam@example.com');
|
||||
expect(created.id).toBe('u2');
|
||||
expect(created.full_name).toBe('Sam Sample');
|
||||
expect(created.email).toBe('sam@example.com');
|
||||
});
|
||||
});
|
||||
|
||||
describe('updateUser', () => {
|
||||
it('updates user fields and syncs self profile when present', () => {
|
||||
upsertUserFromAuth({
|
||||
id: 'u3',
|
||||
username: 'sarah',
|
||||
fullName: 'Sarah Lee',
|
||||
email: 'sarah@example.com'
|
||||
});
|
||||
database.run(
|
||||
`INSERT INTO people (id, user_id, first_name, last_name, email, is_self)
|
||||
VALUES (?, ?, ?, ?, ?, 1)`,
|
||||
['p1', 'u3', 'Sarah', 'Lee', 'sarah@example.com']
|
||||
);
|
||||
|
||||
updateUser({ id: 'u3', username: 'slee', fullName: 'Sarah Smith', email: 'ss@example.com' });
|
||||
|
||||
const user = listUsers().find((item) => item.id === 'u3');
|
||||
expect(user?.username).toBe('slee');
|
||||
expect(user?.full_name).toBe('Sarah Smith');
|
||||
expect(user?.email).toBe('ss@example.com');
|
||||
|
||||
const profile = database.get<{ first_name: string; last_name: string; email: string | null }>(
|
||||
'SELECT first_name, last_name, email FROM people WHERE user_id = ? AND is_self = 1',
|
||||
['u3']
|
||||
);
|
||||
expect(profile?.first_name).toBe('Sarah');
|
||||
expect(profile?.last_name).toBe('Smith');
|
||||
expect(profile?.email).toBe('ss@example.com');
|
||||
});
|
||||
});
|
||||
|
||||
describe('deleteUser', () => {
|
||||
it('removes the user record', () => {
|
||||
upsertUserFromAuth({ id: 'u4', username: 'delete-me', fullName: 'Delete Me' });
|
||||
deleteUser('u4');
|
||||
expect(listUsers().find((item) => item.id === 'u4')).toBeUndefined();
|
||||
});
|
||||
});
|
||||
138
src/lib/server/users.ts
Normal file
138
src/lib/server/users.ts
Normal file
@@ -0,0 +1,138 @@
|
||||
import { db } from './db/index.js';
|
||||
|
||||
export interface AppUser {
|
||||
id: string;
|
||||
username: string;
|
||||
full_name: string;
|
||||
email: string | null;
|
||||
auth_source: string;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
}
|
||||
|
||||
const DEFAULT_AUTH_SOURCE = 'OIDC - Synology';
|
||||
|
||||
const normalizeOptional = (value?: string | null): string | undefined => {
|
||||
const trimmed = value?.trim();
|
||||
return trimmed ? trimmed : undefined;
|
||||
};
|
||||
|
||||
const normalizeEmail = (value?: string | null): string | null | undefined => {
|
||||
if (value === undefined) return undefined;
|
||||
if (value === null) return null;
|
||||
const trimmed = value.trim();
|
||||
return trimmed ? trimmed : null;
|
||||
};
|
||||
|
||||
export function listUsers(): AppUser[] {
|
||||
return db.all<AppUser>(
|
||||
`SELECT id, username, full_name, email, auth_source, created_at, updated_at
|
||||
FROM users
|
||||
ORDER BY username COLLATE NOCASE`
|
||||
);
|
||||
}
|
||||
|
||||
export function upsertUserFromAuth(input: {
|
||||
id: string;
|
||||
username?: string | null;
|
||||
fullName?: string | null;
|
||||
email?: string | null;
|
||||
authSource?: string | null;
|
||||
}): AppUser {
|
||||
const existing = db.get<AppUser>('SELECT * FROM users WHERE id = ?', [input.id]);
|
||||
const username = normalizeOptional(input.username) ?? existing?.username ?? input.id;
|
||||
const fullName = normalizeOptional(input.fullName) ?? existing?.full_name ?? '';
|
||||
const email = normalizeOptional(input.email) ?? existing?.email ?? null;
|
||||
const authSource =
|
||||
normalizeOptional(input.authSource) ?? existing?.auth_source ?? DEFAULT_AUTH_SOURCE;
|
||||
|
||||
if (existing) {
|
||||
const setClauses: string[] = [];
|
||||
const values: Array<string | null> = [];
|
||||
if (username !== existing.username) {
|
||||
setClauses.push('username = ?');
|
||||
values.push(username);
|
||||
}
|
||||
if (fullName !== existing.full_name) {
|
||||
setClauses.push('full_name = ?');
|
||||
values.push(fullName);
|
||||
}
|
||||
if (email !== existing.email) {
|
||||
setClauses.push('email = ?');
|
||||
values.push(email);
|
||||
}
|
||||
if (authSource !== existing.auth_source) {
|
||||
setClauses.push('auth_source = ?');
|
||||
values.push(authSource);
|
||||
}
|
||||
if (setClauses.length > 0) {
|
||||
setClauses.push("updated_at = datetime('now')");
|
||||
values.push(input.id);
|
||||
db.run(`UPDATE users SET ${setClauses.join(', ')} WHERE id = ?`, values);
|
||||
}
|
||||
} else {
|
||||
db.run(
|
||||
`INSERT INTO users (id, username, full_name, email, auth_source)
|
||||
VALUES (?, ?, ?, ?, ?)`,
|
||||
[input.id, username, fullName, email, authSource]
|
||||
);
|
||||
}
|
||||
return db.get<AppUser>('SELECT * FROM users WHERE id = ?', [input.id])!;
|
||||
}
|
||||
|
||||
export function upsertUserProfile(
|
||||
userId: string,
|
||||
fullName: string,
|
||||
email?: string | null
|
||||
): AppUser {
|
||||
return upsertUserFromAuth({ id: userId, fullName, email, authSource: DEFAULT_AUTH_SOURCE });
|
||||
}
|
||||
|
||||
export function updateUser(input: {
|
||||
id: string;
|
||||
username: string;
|
||||
fullName: string;
|
||||
email?: string | null;
|
||||
}): void {
|
||||
const existing = db.get<{ email: string | null }>('SELECT email FROM users WHERE id = ?', [
|
||||
input.id
|
||||
]);
|
||||
const email = normalizeEmail(input.email);
|
||||
const nextEmail = email === undefined ? existing?.email ?? null : email;
|
||||
db.run(
|
||||
`UPDATE users
|
||||
SET username = ?, full_name = ?, email = ?, updated_at = datetime('now')
|
||||
WHERE id = ?`,
|
||||
[input.username.trim(), input.fullName.trim(), nextEmail, input.id]
|
||||
);
|
||||
syncSelfProfile(input.id, input.fullName, nextEmail);
|
||||
}
|
||||
|
||||
export function deleteUser(id: string): void {
|
||||
db.run('DELETE FROM users WHERE id = ?', [id]);
|
||||
}
|
||||
|
||||
function syncSelfProfile(userId: string, fullName: string, email?: string | null): void {
|
||||
const profile = db.get<{ id: string; first_name: string; last_name: string; email: string | null }>(
|
||||
`SELECT id, first_name, last_name, email FROM people WHERE user_id = ? AND is_self = 1 LIMIT 1`,
|
||||
[userId]
|
||||
);
|
||||
if (!profile) return;
|
||||
|
||||
const trimmed = fullName.trim();
|
||||
let firstName = profile.first_name;
|
||||
let lastName = profile.last_name;
|
||||
if (trimmed) {
|
||||
const parts = trimmed.split(/\s+/);
|
||||
firstName = parts[0] ?? profile.first_name;
|
||||
if (parts.length > 1) {
|
||||
lastName = parts.slice(1).join(' ');
|
||||
}
|
||||
}
|
||||
const nextEmail = email === undefined ? profile.email : email;
|
||||
db.run(
|
||||
`UPDATE people SET first_name = ?, last_name = ?, email = ?, updated_at = datetime('now')
|
||||
WHERE id = ?`,
|
||||
[firstName, lastName, nextEmail, profile.id]
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user