Merge branch 'master' into testing-improvements

This commit is contained in:
RevIQ
2026-01-10 15:31:37 +08:00
49 changed files with 2487 additions and 287 deletions

View File

@@ -26,6 +26,8 @@ export interface BootstrapInput {
tokenName?: string;
/** Optional token expiration in days (defaults to 365) */
tokenExpirationDays?: number;
/** Delete existing user and org if they exist (defaults to false) */
dangerouslyOverwriteExisting?: boolean;
}
/**
@@ -70,6 +72,7 @@ export const executeBootstrap = async (
orgDisplayName = "RevIQ",
tokenName = "CLI bootstrap token",
tokenExpirationDays = 365,
dangerouslyOverwriteExisting = false,
} = input;
// Validate password length
@@ -84,15 +87,93 @@ export const executeBootstrap = async (
const normalizedEmail = email.toLowerCase();
// Check if user already exists
const existing = await trx
.selectFrom("users")
.where("email", "=", normalizedEmail)
.select("id")
.executeTakeFirst();
// Handle overwrite mode - delete existing user and org
if (dangerouslyOverwriteExisting) {
// Delete existing user and related records
const existingUser = await trx
.selectFrom("users")
.where("email", "=", normalizedEmail)
.select("id")
.executeTakeFirst();
if (existing) {
throw new Error(`User with email ${email} already exists`);
if (existingUser) {
// Delete all user-related records (FK constraints)
await trx
.deleteFrom("api_tokens")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("email_verifications")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("login_requests")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("passkeys")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("password_resets")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("sessions")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("user_devices")
.where("user_id", "=", existingUser.id)
.execute();
await trx
.deleteFrom("org_members")
.where("user_id", "=", existingUser.id)
.execute();
// Delete invites created by this user
await trx
.deleteFrom("org_invites")
.where("invited_by", "=", existingUser.id)
.execute();
// Delete the user
await trx.deleteFrom("users").where("id", "=", existingUser.id).execute();
}
// Delete existing org and related records
const existingOrg = await trx
.selectFrom("orgs")
.where("slug", "=", orgSlug)
.select("id")
.executeTakeFirst();
if (existingOrg) {
// Delete all org-related records (FK constraints)
await trx
.deleteFrom("org_invites")
.where("org_id", "=", existingOrg.id)
.execute();
await trx
.deleteFrom("org_members")
.where("org_id", "=", existingOrg.id)
.execute();
await trx
.deleteFrom("org_sites")
.where("org_id", "=", existingOrg.id)
.execute();
// Delete the org
await trx.deleteFrom("orgs").where("id", "=", existingOrg.id).execute();
}
} else {
// Check if user already exists (normal mode)
const existing = await trx
.selectFrom("users")
.where("email", "=", normalizedEmail)
.select("id")
.executeTakeFirst();
if (existing) {
throw new Error(`User with email ${email} already exists`);
}
}
// Hash the password