mirror of
https://github.com/screentinker/screentinker.git
synced 2026-06-15 10:43:36 -06:00
White-label is stored per-workspace (white_labels.workspace_id); unbranded and
new workspaces - and the login page - fell back to hardcoded ScreenTinker. Add a
single platform default that everything inherits beneath the per-workspace layer.
Resolution (lib/branding.js): workspace row -> custom-domain match -> platform
default -> hardcoded ScreenTinker. Row-level override: a workspace with its own
row keeps it (current behavior); only row-less workspaces inherit the default,
so editing the default propagates instantly (no row-copying at creation).
The platform default is a white_labels row with a FIXED id ('platform-default'),
not a "workspace_id IS NULL" sentinel - legacy pre-multitenancy rows can also
have a null workspace_id, which would be ambiguous.
- routes/admin.js: GET/PUT /api/admin/branding (requirePlatformAdmin) to read/
upsert the single platform-default row; audit-logged.
- server.js: public GET /api/branding (domain match -> platform default ->
hardcoded) for pre-login/pre-workspace contexts.
- routes/white-label.js: authed GET now falls back to the platform default
(was hardcoded) for row-less workspaces.
- Frontend: login page resolves + applies branding (logo, name, colors, favicon,
custom CSS) pre-auth; Admin page gets a "Default branding" form.
Tests: resolver order incl. legacy null-ws safety; admin GET/PUT (single row,
upsert, platform-admin-only 403). Full suite 37/37. Verified end-to-end:
public + authed + login-page all inherit the platform default; per-workspace
override preserved.
Closes #15.
277 lines
15 KiB
JavaScript
277 lines
15 KiB
JavaScript
const express = require('express');
|
|
const router = express.Router();
|
|
const bcrypt = require('bcryptjs');
|
|
const { v4: uuidv4 } = require('uuid');
|
|
const { db } = require('../db/database');
|
|
const { canAdminWorkspace } = require('../lib/permissions');
|
|
const { requirePlatformAdmin } = require('../middleware/auth');
|
|
const { logActivity, getClientIp } = require('../services/activity');
|
|
const { platformDefaultRow, HARDCODED_BRANDING, PLATFORM_DEFAULT_ID } = require('../lib/branding');
|
|
|
|
// Admin-provisioned user creation (#10). Operates on a target workspace
|
|
// specified in the body, NOT the caller's active workspace - so this router is
|
|
// mounted with requireAuth only (no resolveTenancy), mirroring routes/workspaces.js.
|
|
// Permission is gated per-handler via canAdminWorkspace() against the TARGET
|
|
// workspace, which:
|
|
// - lets a platform_admin create users anywhere,
|
|
// - scopes an org_admin / org_owner to workspaces in orgs they administer,
|
|
// - and excludes platform_operator (isPlatformRole owner-only) - operators
|
|
// have no user/role-management power (#13).
|
|
|
|
// Same email shape the invite-create endpoint validates against (workspaces.js).
|
|
const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
|
const WORKSPACE_ROLES = ['workspace_admin', 'workspace_editor', 'workspace_viewer'];
|
|
// Mirror the server-side minimum enforced by PUT /api/auth/me and register.
|
|
const MIN_PASSWORD_LENGTH = 8;
|
|
|
|
// POST /api/admin/users - create a user with an admin-set password and assign
|
|
// them to a workspace + role. The result is indistinguishable from an
|
|
// invite-accepted user (a global users row + a workspace_members row).
|
|
router.post('/users', (req, res) => {
|
|
const email = String(req.body?.email || '').trim().toLowerCase();
|
|
const name = String(req.body?.name || '').trim();
|
|
const password = String(req.body?.password || '');
|
|
// Accept workspaceId (preferred) or orgId as an alias for the target field.
|
|
const workspaceId = String(req.body?.workspaceId || req.body?.orgId || '').trim();
|
|
const role = String(req.body?.role || '').trim();
|
|
const mustChangePassword = !!req.body?.mustChangePassword;
|
|
|
|
if (!email || !EMAIL_RE.test(email)) {
|
|
return res.status(400).json({ error: 'Valid email required' });
|
|
}
|
|
if (!WORKSPACE_ROLES.includes(role)) {
|
|
return res.status(400).json({ error: 'Role must be workspace_admin, workspace_editor, or workspace_viewer' });
|
|
}
|
|
if (password.length < MIN_PASSWORD_LENGTH) {
|
|
return res.status(400).json({ error: `Password must be at least ${MIN_PASSWORD_LENGTH} characters` });
|
|
}
|
|
if (!workspaceId) {
|
|
return res.status(400).json({ error: 'workspaceId required' });
|
|
}
|
|
|
|
const ws = db.prepare('SELECT * FROM workspaces WHERE id = ?').get(workspaceId);
|
|
if (!ws) return res.status(404).json({ error: 'Workspace not found' });
|
|
if (!canAdminWorkspace(db, req.user, ws)) {
|
|
return res.status(403).json({ error: 'Admin access required' });
|
|
}
|
|
// Stamp the target workspace so the activityLogger middleware (and our
|
|
// explicit audit row) attribute to the right tenant.
|
|
req.workspaceId = ws.id;
|
|
|
|
// Email uniqueness: clean 409, never overwrite an existing account.
|
|
const existing = db.prepare('SELECT id FROM users WHERE email = ?').get(email);
|
|
if (existing) {
|
|
return res.status(409).json({ error: 'A user with that email already exists' });
|
|
}
|
|
|
|
const id = uuidv4();
|
|
const passwordHash = bcrypt.hashSync(password, 10);
|
|
|
|
// HOSTED_INSTANCE: an admin-provisioned user is already set up with a
|
|
// password, so they must NOT receive the welcome email or enter the
|
|
// activation-nudge lifecycle. We never call sendSignupEmails here, and the
|
|
// nudge sweep already excludes them (they have a workspace_members row); we
|
|
// additionally stamp both *_sent_at sentinels so any future sweep treats them
|
|
// as already-handled. See services/signupEmails.js + services/activationNudge.js.
|
|
const txn = db.transaction(() => {
|
|
db.prepare(`
|
|
INSERT INTO users (
|
|
id, email, name, password_hash, auth_provider, role, plan_id,
|
|
must_change_password, welcome_email_sent_at, activation_nudge_sent_at
|
|
) VALUES (?, ?, ?, ?, 'local', 'user', 'free', ?, strftime('%s','now'), strftime('%s','now'))
|
|
`).run(id, email, name || email.split('@')[0], passwordHash, mustChangePassword ? 1 : 0);
|
|
|
|
// Same membership footprint as an accepted invite: one workspace_members
|
|
// row, invited_by = the admin who created them.
|
|
db.prepare(`
|
|
INSERT INTO workspace_members (workspace_id, user_id, role, invited_by)
|
|
VALUES (?, ?, ?, ?)
|
|
`).run(ws.id, id, role, req.user.id);
|
|
});
|
|
txn();
|
|
|
|
// Explicit audit row - who created whom, where, with what role. Never the
|
|
// plaintext password (and the generic activityLogger only summarizes name).
|
|
logActivity(req.user.id, 'admin_create_user', `target: ${email}, role: ${role}`, null, getClientIp(req), ws.id);
|
|
|
|
// Response never includes password or hash.
|
|
const created = db.prepare(
|
|
'SELECT id, email, name, role, auth_provider, plan_id, must_change_password, created_at FROM users WHERE id = ?'
|
|
).get(id);
|
|
res.status(201).json({ ...created, workspace_id: ws.id, workspace_role: role });
|
|
});
|
|
|
|
// PUT /api/admin/users/:id/workspace - move/assign a SINGLE-workspace user to a
|
|
// different workspace (platform Users admin page). Platform-admin only: this is
|
|
// a cross-org, platform-level action (requirePlatformAdmin excludes
|
|
// platform_operator, mirroring the page gating).
|
|
//
|
|
// Single-workspace model: refuses (400) a user who belongs to >1 workspace -
|
|
// a single pick must never silently clobber multiple memberships; those are
|
|
// managed in the workspace members view. Mirrors the frontend guard.
|
|
router.put('/users/:id/workspace', requirePlatformAdmin, (req, res) => {
|
|
const workspaceId = String(req.body?.workspaceId || '').trim();
|
|
if (!workspaceId) return res.status(400).json({ error: 'workspaceId required' });
|
|
|
|
const target = db.prepare('SELECT id, email FROM users WHERE id = ?').get(req.params.id);
|
|
if (!target) return res.status(404).json({ error: 'User not found' });
|
|
|
|
const memberships = db.prepare('SELECT workspace_id FROM workspace_members WHERE user_id = ?').all(target.id);
|
|
if (memberships.length > 1) {
|
|
return res.status(400).json({ error: 'User belongs to multiple workspaces - manage in the workspace members view' });
|
|
}
|
|
|
|
const ws = db.prepare('SELECT id, name, organization_id FROM workspaces WHERE id = ?').get(workspaceId);
|
|
if (!ws) return res.status(404).json({ error: 'Workspace not found' });
|
|
|
|
const org = db.prepare('SELECT name FROM organizations WHERE id = ?').get(ws.organization_id);
|
|
|
|
// No-op if the chosen workspace is already their sole membership (preserve role).
|
|
if (memberships.length === 1 && memberships[0].workspace_id === ws.id) {
|
|
const cur = db.prepare('SELECT role FROM workspace_members WHERE user_id = ? AND workspace_id = ?').get(target.id, ws.id);
|
|
return res.json({ user_id: target.id, workspace_id: ws.id, workspace_name: ws.name, organization_name: org?.name || null, role: cur ? cur.role : 'workspace_viewer', unchanged: true });
|
|
}
|
|
|
|
req.workspaceId = ws.id; // audit attribution
|
|
// Move (drop the existing single membership) or assign (none to drop), then
|
|
// add the chosen one at the default role. Guarded above to <=1 membership, so
|
|
// the DELETE removes at most one row.
|
|
const txn = db.transaction(() => {
|
|
db.prepare('DELETE FROM workspace_members WHERE user_id = ?').run(target.id);
|
|
db.prepare('INSERT INTO workspace_members (workspace_id, user_id, role, invited_by) VALUES (?, ?, ?, ?)')
|
|
.run(ws.id, target.id, 'workspace_viewer', req.user.id);
|
|
});
|
|
txn();
|
|
|
|
logActivity(req.user.id, 'admin_set_user_workspace', `target: ${target.email}, workspace: ${ws.id}`, null, getClientIp(req), ws.id);
|
|
|
|
res.json({ user_id: target.id, workspace_id: ws.id, workspace_name: ws.name, organization_name: org?.name || null, role: 'workspace_viewer' });
|
|
});
|
|
|
|
// ===================== Per-user workspace membership management =====================
|
|
// Platform-admin only (cross-org, platform-level). Unlike the single-workspace
|
|
// "move" above, these manage a user's FULL set of memberships - a user can
|
|
// belong to several workspaces, each with its own role - from the platform Users
|
|
// page "Manage workspaces" modal. requirePlatformAdmin excludes platform_operator
|
|
// (no user/role management, #13).
|
|
|
|
function userMembershipList(userId) {
|
|
return db.prepare(`
|
|
SELECT wm.workspace_id, w.name AS workspace_name, o.name AS organization_name, wm.role
|
|
FROM workspace_members wm
|
|
JOIN workspaces w ON w.id = wm.workspace_id
|
|
JOIN organizations o ON o.id = w.organization_id
|
|
WHERE wm.user_id = ?
|
|
ORDER BY o.name, w.name
|
|
`).all(userId);
|
|
}
|
|
|
|
// GET - list every workspace the user belongs to (with role + org/workspace name).
|
|
router.get('/users/:id/workspaces', requirePlatformAdmin, (req, res) => {
|
|
const target = db.prepare('SELECT id FROM users WHERE id = ?').get(req.params.id);
|
|
if (!target) return res.status(404).json({ error: 'User not found' });
|
|
res.json(userMembershipList(req.params.id));
|
|
});
|
|
|
|
// POST - add the user to a workspace (or update their role if already a member).
|
|
router.post('/users/:id/workspaces', requirePlatformAdmin, (req, res) => {
|
|
const role = String(req.body?.role || '').trim();
|
|
const workspaceId = String(req.body?.workspaceId || '').trim();
|
|
if (!workspaceId) return res.status(400).json({ error: 'workspaceId required' });
|
|
if (!WORKSPACE_ROLES.includes(role)) {
|
|
return res.status(400).json({ error: 'Role must be workspace_admin, workspace_editor, or workspace_viewer' });
|
|
}
|
|
const target = db.prepare('SELECT id, email FROM users WHERE id = ?').get(req.params.id);
|
|
if (!target) return res.status(404).json({ error: 'User not found' });
|
|
const ws = db.prepare('SELECT id, name, organization_id FROM workspaces WHERE id = ?').get(workspaceId);
|
|
if (!ws) return res.status(404).json({ error: 'Workspace not found' });
|
|
req.workspaceId = ws.id;
|
|
|
|
const existing = db.prepare('SELECT role FROM workspace_members WHERE workspace_id = ? AND user_id = ?').get(ws.id, target.id);
|
|
if (existing) {
|
|
db.prepare('UPDATE workspace_members SET role = ? WHERE workspace_id = ? AND user_id = ?').run(role, ws.id, target.id);
|
|
} else {
|
|
db.prepare('INSERT INTO workspace_members (workspace_id, user_id, role, invited_by) VALUES (?, ?, ?, ?)').run(ws.id, target.id, role, req.user.id);
|
|
}
|
|
logActivity(req.user.id, 'admin_add_user_workspace', `target: ${target.email}, workspace: ${ws.id}, role: ${role}`, null, getClientIp(req), ws.id);
|
|
const org = db.prepare('SELECT name FROM organizations WHERE id = ?').get(ws.organization_id);
|
|
res.status(existing ? 200 : 201).json({ workspace_id: ws.id, workspace_name: ws.name, organization_name: org?.name || null, role });
|
|
});
|
|
|
|
// PUT - change the user's role in a specific workspace.
|
|
router.put('/users/:id/workspaces/:workspaceId', requirePlatformAdmin, (req, res) => {
|
|
const role = String(req.body?.role || '').trim();
|
|
if (!WORKSPACE_ROLES.includes(role)) {
|
|
return res.status(400).json({ error: 'Role must be workspace_admin, workspace_editor, or workspace_viewer' });
|
|
}
|
|
const member = db.prepare('SELECT 1 FROM workspace_members WHERE workspace_id = ? AND user_id = ?').get(req.params.workspaceId, req.params.id);
|
|
if (!member) return res.status(404).json({ error: 'Membership not found' });
|
|
db.prepare('UPDATE workspace_members SET role = ? WHERE workspace_id = ? AND user_id = ?').run(role, req.params.workspaceId, req.params.id);
|
|
req.workspaceId = req.params.workspaceId;
|
|
const target = db.prepare('SELECT email FROM users WHERE id = ?').get(req.params.id);
|
|
logActivity(req.user.id, 'admin_set_user_workspace_role', `target: ${target?.email}, workspace: ${req.params.workspaceId}, role: ${role}`, null, getClientIp(req), req.params.workspaceId);
|
|
res.json({ workspace_id: req.params.workspaceId, role });
|
|
});
|
|
|
|
// DELETE - remove the user from a workspace. Allowed even if it's their last one
|
|
// (they become Unassigned - the no-workspace state from #12).
|
|
router.delete('/users/:id/workspaces/:workspaceId', requirePlatformAdmin, (req, res) => {
|
|
const member = db.prepare('SELECT 1 FROM workspace_members WHERE workspace_id = ? AND user_id = ?').get(req.params.workspaceId, req.params.id);
|
|
if (!member) return res.status(404).json({ error: 'Membership not found' });
|
|
db.prepare('DELETE FROM workspace_members WHERE workspace_id = ? AND user_id = ?').run(req.params.workspaceId, req.params.id);
|
|
req.workspaceId = req.params.workspaceId;
|
|
const target = db.prepare('SELECT email FROM users WHERE id = ?').get(req.params.id);
|
|
logActivity(req.user.id, 'admin_remove_user_workspace', `target: ${target?.email}, workspace: ${req.params.workspaceId}`, null, getClientIp(req), req.params.workspaceId);
|
|
res.json({ success: true });
|
|
});
|
|
|
|
// ===================== Instance-level default branding (#15) =====================
|
|
// Platform-admin only. The "platform default" is a single white_labels row with
|
|
// workspace_id IS NULL that every workspace inherits unless it set its own
|
|
// (resolution lives in lib/branding.js). Editable here / in the Admin UI.
|
|
|
|
const BRANDING_FIELDS = ['brand_name', 'logo_url', 'favicon_url', 'primary_color', 'secondary_color', 'bg_color', 'custom_css', 'hide_branding'];
|
|
|
|
// GET - the current platform-default branding (falls back to hardcoded so the
|
|
// admin form always has values to show).
|
|
router.get('/branding', requirePlatformAdmin, (req, res) => {
|
|
res.json(platformDefaultRow(db) || { ...HARDCODED_BRANDING });
|
|
});
|
|
|
|
// PUT - upsert the single platform-default row (workspace_id IS NULL).
|
|
router.put('/branding', requirePlatformAdmin, (req, res) => {
|
|
const existing = platformDefaultRow(db);
|
|
if (existing) {
|
|
const updates = [];
|
|
const values = [];
|
|
for (const f of BRANDING_FIELDS) {
|
|
if (req.body[f] !== undefined) {
|
|
updates.push(`${f} = ?`);
|
|
values.push(f === 'hide_branding' ? (req.body[f] ? 1 : 0) : (req.body[f] || null));
|
|
}
|
|
}
|
|
if (updates.length) {
|
|
updates.push("updated_at = strftime('%s','now')");
|
|
values.push(existing.id);
|
|
db.prepare(`UPDATE white_labels SET ${updates.join(', ')} WHERE id = ?`).run(...values);
|
|
}
|
|
} else {
|
|
// Fixed id sentinel (not workspace_id IS NULL - see lib/branding.js).
|
|
// user_id is NOT NULL on the legacy table; stamp the acting admin.
|
|
db.prepare(`
|
|
INSERT INTO white_labels (id, user_id, workspace_id, brand_name, logo_url, favicon_url, primary_color, secondary_color, bg_color, custom_css, hide_branding)
|
|
VALUES (?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
`).run(
|
|
PLATFORM_DEFAULT_ID, req.user.id,
|
|
req.body.brand_name || 'ScreenTinker',
|
|
req.body.logo_url || null, req.body.favicon_url || null,
|
|
req.body.primary_color || '#3B82F6', req.body.secondary_color || '#1E293B', req.body.bg_color || '#111827',
|
|
req.body.custom_css || null, req.body.hide_branding ? 1 : 0
|
|
);
|
|
}
|
|
logActivity(req.user.id, 'admin_set_platform_branding', `brand: ${req.body.brand_name || ''}`, null, getClientIp(req), null);
|
|
res.json(platformDefaultRow(db));
|
|
});
|
|
|
|
module.exports = router;
|