tyler
7cd0603cfb
BREAKING: dev_session cookie bypass removed. Admin access now requires a real Auth.js v5 session (Google OAuth in production). Provision users by inserting into users + tenant_users tables. New in this commit: - db/migrations/0001_init.sql: 18-table SaaS schema with RLS (tenants, users, tenant_users, plans, add_ons, subscriptions, tenant_add_ons, products, product_images, stops, customers, orders, order_items, brand_settings, email_templates, campaigns, files, audit_log) - db/schema/: Drizzle TypeScript mirror of every table - db/client.ts: withTenant() / withPlatformAdmin() query wrappers that set Postgres GUCs (app.current_tenant_id, app.platform_admin) for RLS enforcement. Never query a tenant-scoped table without one. - db/seed.ts: seeds 3 plans, 6 add-ons, 2 tenants (Tuxedo, Indian River Direct), brand_settings, sample products/stops/customers - scripts/migrate.js: applies migrations in lexical order with tracking - scripts/db-reset.js: drops + recreates DB, runs migrate + seed - DATABASE_URL now uses rc_app (non-superuser, NOBYPASSRLS). RLS is enforced even for the app user. DATABASE_ADMIN_URL for migrations. - src/lib/admin-permissions.ts: getAdminUser() reads Auth.js session, looks up user + tenant in Postgres. brand_id kept as alias for backward compat. - src/middleware.ts: Auth.js-only route protection, dev_session gone - src/app/login/LoginClient.tsx: Google OAuth only, no demo mode - src/components/admin/AdminSidebar.tsx + AdminHeader.tsx: signOutAction replaces supabase signout - @/db/* path aliases in tsconfig.json + vitest.config.ts - drizzle.config.ts added - db/auth_schema.sql removed (was a stub; replaced by real schema) - src/app/api/dev-login/route.ts deleted - tests: updated to remove dev_session coverage
79 lines
2.5 KiB
TypeScript
79 lines
2.5 KiB
TypeScript
/**
|
|
* Tenancy + auth tables. Source of truth: `db/migrations/0001_init.sql`.
|
|
*/
|
|
import {
|
|
pgTable,
|
|
uuid,
|
|
text,
|
|
timestamp,
|
|
index,
|
|
uniqueIndex,
|
|
primaryKey,
|
|
} from "drizzle-orm/pg-core";
|
|
import { sql } from "drizzle-orm";
|
|
import {
|
|
tenantStatusEnum,
|
|
authProviderEnum,
|
|
roleEnum,
|
|
} from "./enums";
|
|
|
|
export const tenants = pgTable("tenants", {
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
name: text("name").notNull(),
|
|
slug: text("slug").notNull().unique(),
|
|
status: text("status", { enum: tenantStatusEnum }).notNull().default("trial"),
|
|
trialEndsAt: timestamp("trial_ends_at", { withTimezone: true }),
|
|
stripeCustomerId: text("stripe_customer_id"),
|
|
createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
|
|
updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
|
|
});
|
|
|
|
export const users = pgTable(
|
|
"users",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
email: text("email").unique(),
|
|
name: text("name"),
|
|
image: text("image"),
|
|
authProvider: text("auth_provider", { enum: authProviderEnum })
|
|
.notNull()
|
|
.default("dev"),
|
|
authSubject: text("auth_subject"),
|
|
emailVerifiedAt: timestamp("email_verified_at", { withTimezone: true }),
|
|
createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
|
|
updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
|
|
},
|
|
(t) => ({
|
|
authSubjectIdx: uniqueIndex("users_auth_subject_idx")
|
|
.on(t.authProvider, t.authSubject)
|
|
.where(sql`${t.authSubject} IS NOT NULL`),
|
|
}),
|
|
);
|
|
|
|
export const tenantUsers = pgTable(
|
|
"tenant_users",
|
|
{
|
|
tenantId: uuid("tenant_id")
|
|
.notNull()
|
|
.references(() => tenants.id, { onDelete: "cascade" }),
|
|
userId: uuid("user_id")
|
|
.notNull()
|
|
.references(() => users.id, { onDelete: "cascade" }),
|
|
role: text("role", { enum: roleEnum }).notNull().default("brand_admin"),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
(t) => ({
|
|
pk: primaryKey({ columns: [t.tenantId, t.userId] }),
|
|
userIdx: index("tenant_users_user_idx").on(t.userId),
|
|
}),
|
|
);
|
|
|
|
export type Tenant = typeof tenants.$inferSelect;
|
|
export type NewTenant = typeof tenants.$inferInsert;
|
|
export type User = typeof users.$inferSelect;
|
|
export type NewUser = typeof users.$inferInsert;
|
|
export type TenantUser = typeof tenantUsers.$inferSelect;
|
|
export type NewTenantUser = typeof tenantUsers.$inferInsert;
|