Compare commits
3 Commits
todo/mvp1-
...
todo/mvp1-
| Author | SHA1 | Date | |
|---|---|---|---|
|
37f62a8007
|
|||
|
d1face36c5
|
|||
|
39178c2d8d
|
48
TODO.md
48
TODO.md
@@ -160,7 +160,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
- [~] [P1] Customer records (contact profile, notes, consent flags, recurrence marker)
|
||||
- [~] [P1] Customer-to-commission linkage and reuse workflow (no re-entry for recurring customers)
|
||||
- [~] [P1] Kanban workflow for commissions (new, scoped, in-progress, review, done)
|
||||
- [ ] [P1] Header banner management (message, CTA, active window)
|
||||
- [x] [P1] Header banner management (message, CTA, active window)
|
||||
- [~] [P1] Announcements management (prominent site notices with schedule, priority, and audience targeting)
|
||||
- [~] [P2] News/blog editorial workflow (draft/review/publish, authoring metadata)
|
||||
|
||||
@@ -174,7 +174,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
- [ ] [P1] Translation-ready content model for public entities (pages/news/navigation labels)
|
||||
- [ ] [P2] Artwork views and listing filters
|
||||
- [ ] [P1] Commission request submission flow
|
||||
- [ ] [P1] Header banner render logic and fallbacks
|
||||
- [x] [P1] Header banner render logic and fallbacks
|
||||
- [ ] [P1] Announcement render slots (homepage + optional global/top banner position)
|
||||
|
||||
### News / Blog (Secondary Track)
|
||||
@@ -187,14 +187,48 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
### Testing
|
||||
|
||||
- [x] [P1] Unit tests for content schemas and service logic
|
||||
- [ ] [P1] Component tests for admin forms (pages/media/navigation)
|
||||
- [ ] [P1] Integration tests for owner invariant and hidden support-user protection
|
||||
- [ ] [P1] Integration tests for registration allow/deny behavior
|
||||
- [~] [P1] Component tests for admin forms (pages/media/navigation)
|
||||
- [x] [P1] Integration tests for owner invariant and hidden support-user protection
|
||||
- [x] [P1] Integration tests for registration allow/deny behavior
|
||||
- [ ] [P1] Integration tests for translated content CRUD and locale-specific validation
|
||||
- [~] [P1] E2E happy paths: create page, publish, see on public app
|
||||
- [~] [P1] E2E happy paths: media upload + artwork refinement display
|
||||
- [~] [P1] E2E happy paths: commissions kanban transitions
|
||||
|
||||
### Code Documentation And Handover
|
||||
|
||||
- [ ] [P1] Create architecture map per package/app (`what exists`, `why`, `how to extend`) for `@cms/db`, `@cms/content`, `@cms/crud`, `@cms/ui`, `apps/admin`, `apps/web`
|
||||
- [ ] [P1] Add module-level ownership docs for auth, media, pages/navigation, commissions, announcements/news flows
|
||||
- [ ] [P1] Document critical invariants (single owner rule, protected support user, registration policy gates, media storage key contract)
|
||||
- [ ] [P1] Add “request lifecycle” docs for key flows (auth sign-in/up, media upload, page publish, commission status change)
|
||||
- [ ] [P1] Add coding handover playbook: local setup, migration workflow, test strategy, branch/release process, common failure recovery
|
||||
- [ ] [P2] Add code-level diagrams (Mermaid) for service boundaries and data relationships
|
||||
- [ ] [P2] Add route/action inventory for admin and public apps with linked source files
|
||||
|
||||
## MVP 1.5: UX/UI And Theming
|
||||
|
||||
### MVP1.5 Suggested Branch Order
|
||||
|
||||
- [ ] [P1] `todo/mvp15-design-tokens-foundation`:
|
||||
establish shared design tokens (color, spacing, radius, typography scale, motion) in `@cms/ui` and app-level theme contracts
|
||||
- [ ] [P1] `todo/mvp15-admin-layout-polish`:
|
||||
refine admin shell, navigation hierarchy, spacing rhythm, table/form visual consistency, empty/loading/error states
|
||||
- [ ] [P1] `todo/mvp15-public-layout-and-templates`:
|
||||
define public visual direction (hero/header/footer/content widths), page templates for home/content/news/portfolio
|
||||
- [ ] [P2] `todo/mvp15-component-library-pass`:
|
||||
align shadcn-based primitives with CMS brand system (buttons, inputs, cards, badges, tabs, dialogs, toasts)
|
||||
- [ ] [P2] `todo/mvp15-responsive-and-a11y-pass`:
|
||||
mobile/tablet breakpoints, keyboard flow, focus states, contrast checks, reduced-motion support
|
||||
- [ ] [P2] `todo/mvp15-visual-regression-baseline`:
|
||||
add screenshot baselines for critical admin/public routes to guard layout regressions
|
||||
|
||||
### Deliverables
|
||||
|
||||
- [ ] [P1] Admin UI baseline feels production-ready for daily editorial use
|
||||
- [ ] [P1] Public UI baseline is template-ready for artist branding and portfolio storytelling
|
||||
- [ ] [P2] Shared UI primitives are consistent across admin and public apps
|
||||
- [ ] [P2] Core routes have visual-regression coverage for the new layout baseline
|
||||
|
||||
## MVP 2: Production Readiness
|
||||
|
||||
### Admin App
|
||||
@@ -281,6 +315,10 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
- [2026-02-12] Public news routes now exist at `/news` and `/news/:slug` (detail restricted to published posts).
|
||||
- [2026-02-12] Added `e2e/happy-paths.pw.ts` covering admin login, page publish/public rendering, announcement rendering, media upload, and commission status transition.
|
||||
- [2026-02-12] Expanded unit coverage for content/domain schemas and post service behavior (`packages/content/src/domain-schemas.test.ts`, `packages/db/src/posts.test.ts`).
|
||||
- [2026-02-12] Added auth flow integration tests for `/login`, `/register`, `/welcome` to validate registration allow/deny and owner bootstrap redirects.
|
||||
- [2026-02-12] Admin settings now manage public header banner (enabled/message/CTA), backed by `system_setting` and consumed by public layout rendering.
|
||||
- [2026-02-12] Added owner/support invariant integration tests for auth guards (`apps/admin/src/lib/auth/server.test.ts`), covering protected-user deletion blocking and one-owner repair/promotion rules.
|
||||
- [2026-02-12] Started admin form component tests with media upload behavior coverage (`apps/admin/src/components/media/media-upload-form.test.tsx`).
|
||||
|
||||
## How We Use This File
|
||||
|
||||
|
||||
67
apps/admin/src/app/login/page.test.tsx
Normal file
67
apps/admin/src/app/login/page.test.tsx
Normal file
@@ -0,0 +1,67 @@
|
||||
import type { ReactElement } from "react"
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||
|
||||
const { redirectMock, resolveRoleFromServerContextMock, hasOwnerUserMock } = vi.hoisted(() => ({
|
||||
redirectMock: vi.fn((path: string) => {
|
||||
throw new Error(`REDIRECT:${path}`)
|
||||
}),
|
||||
resolveRoleFromServerContextMock: vi.fn(),
|
||||
hasOwnerUserMock: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock("next/navigation", () => ({
|
||||
redirect: redirectMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/lib/access-server", () => ({
|
||||
resolveRoleFromServerContext: resolveRoleFromServerContextMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/lib/auth/server", () => ({
|
||||
hasOwnerUser: hasOwnerUserMock,
|
||||
}))
|
||||
|
||||
vi.mock("./login-form", () => ({
|
||||
LoginForm: ({ mode }: { mode: string }) => ({ type: "login-form", props: { mode } }),
|
||||
}))
|
||||
|
||||
import LoginPage from "./page"
|
||||
|
||||
function expectRedirect(call: () => Promise<unknown>, path: string) {
|
||||
return expect(call()).rejects.toThrow(`REDIRECT:${path}`)
|
||||
}
|
||||
|
||||
describe("login page", () => {
|
||||
beforeEach(() => {
|
||||
redirectMock.mockClear()
|
||||
resolveRoleFromServerContextMock.mockReset()
|
||||
hasOwnerUserMock.mockReset()
|
||||
})
|
||||
|
||||
it("redirects authenticated users to dashboard", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue("manager")
|
||||
|
||||
await expectRedirect(() => LoginPage({ searchParams: Promise.resolve({}) }), "/")
|
||||
})
|
||||
|
||||
it("redirects to welcome if owner is missing", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(false)
|
||||
|
||||
await expectRedirect(
|
||||
() => LoginPage({ searchParams: Promise.resolve({ next: "/settings" }) }),
|
||||
"/welcome?next=%2Fsettings",
|
||||
)
|
||||
})
|
||||
|
||||
it("renders sign-in mode once owner exists", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(true)
|
||||
|
||||
const page = (await LoginPage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||
mode: string
|
||||
}>
|
||||
|
||||
expect(page.props.mode).toBe("signin")
|
||||
})
|
||||
})
|
||||
91
apps/admin/src/app/register/page.test.tsx
Normal file
91
apps/admin/src/app/register/page.test.tsx
Normal file
@@ -0,0 +1,91 @@
|
||||
import type { ReactElement } from "react"
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||
|
||||
const {
|
||||
redirectMock,
|
||||
resolveRoleFromServerContextMock,
|
||||
hasOwnerUserMock,
|
||||
isSelfRegistrationEnabledMock,
|
||||
} = vi.hoisted(() => ({
|
||||
redirectMock: vi.fn((path: string) => {
|
||||
throw new Error(`REDIRECT:${path}`)
|
||||
}),
|
||||
resolveRoleFromServerContextMock: vi.fn(),
|
||||
hasOwnerUserMock: vi.fn(),
|
||||
isSelfRegistrationEnabledMock: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock("next/navigation", () => ({
|
||||
redirect: redirectMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/lib/access-server", () => ({
|
||||
resolveRoleFromServerContext: resolveRoleFromServerContextMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/lib/auth/server", () => ({
|
||||
hasOwnerUser: hasOwnerUserMock,
|
||||
isSelfRegistrationEnabled: isSelfRegistrationEnabledMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/app/login/login-form", () => ({
|
||||
LoginForm: ({ mode }: { mode: string }) => ({ type: "login-form", props: { mode } }),
|
||||
}))
|
||||
|
||||
import RegisterPage from "./page"
|
||||
|
||||
function expectRedirect(call: () => Promise<unknown>, path: string) {
|
||||
return expect(call()).rejects.toThrow(`REDIRECT:${path}`)
|
||||
}
|
||||
|
||||
describe("register page", () => {
|
||||
beforeEach(() => {
|
||||
redirectMock.mockClear()
|
||||
resolveRoleFromServerContextMock.mockReset()
|
||||
hasOwnerUserMock.mockReset()
|
||||
isSelfRegistrationEnabledMock.mockReset()
|
||||
})
|
||||
|
||||
it("redirects authenticated users to dashboard", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue("admin")
|
||||
|
||||
await expectRedirect(
|
||||
() => RegisterPage({ searchParams: Promise.resolve({ next: "/pages" }) }),
|
||||
"/",
|
||||
)
|
||||
})
|
||||
|
||||
it("redirects to welcome when no owner exists", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(false)
|
||||
|
||||
await expectRedirect(
|
||||
() => RegisterPage({ searchParams: Promise.resolve({ next: "/pages" }) }),
|
||||
"/welcome?next=%2Fpages",
|
||||
)
|
||||
})
|
||||
|
||||
it("shows disabled mode when self registration is off", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(true)
|
||||
isSelfRegistrationEnabledMock.mockResolvedValue(false)
|
||||
|
||||
const page = (await RegisterPage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||
mode: string
|
||||
}>
|
||||
|
||||
expect(page.props.mode).toBe("signup-disabled")
|
||||
})
|
||||
|
||||
it("shows sign-up mode when self registration is enabled", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(true)
|
||||
isSelfRegistrationEnabledMock.mockResolvedValue(true)
|
||||
|
||||
const page = (await RegisterPage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||
mode: string
|
||||
}>
|
||||
|
||||
expect(page.props.mode).toBe("signup-user")
|
||||
})
|
||||
})
|
||||
@@ -1,4 +1,9 @@
|
||||
import { isAdminSelfRegistrationEnabled, setAdminSelfRegistrationEnabled } from "@cms/db"
|
||||
import {
|
||||
getPublicHeaderBannerConfig,
|
||||
isAdminSelfRegistrationEnabled,
|
||||
setAdminSelfRegistrationEnabled,
|
||||
setPublicHeaderBannerConfig,
|
||||
} from "@cms/db"
|
||||
import { Button } from "@cms/ui/button"
|
||||
import { revalidatePath } from "next/cache"
|
||||
import Link from "next/link"
|
||||
@@ -79,6 +84,53 @@ async function updateRegistrationPolicyAction(formData: FormData) {
|
||||
)
|
||||
}
|
||||
|
||||
async function updatePublicHeaderBannerAction(formData: FormData) {
|
||||
"use server"
|
||||
|
||||
await requireSettingsPermission()
|
||||
const t = await getSettingsTranslator()
|
||||
const enabled = formData.get("bannerEnabled") === "on"
|
||||
const message = toSingleValue(formData.get("bannerMessage")?.toString())?.trim() ?? ""
|
||||
const ctaLabel = toSingleValue(formData.get("bannerCtaLabel")?.toString())?.trim() ?? ""
|
||||
const ctaHref = toSingleValue(formData.get("bannerCtaHref")?.toString())?.trim() ?? ""
|
||||
|
||||
if (enabled && message.length === 0) {
|
||||
redirect(
|
||||
`/settings?error=${encodeURIComponent(
|
||||
t(
|
||||
"settings.banner.errors.messageRequired",
|
||||
"Banner message is required while banner is enabled.",
|
||||
),
|
||||
)}`,
|
||||
)
|
||||
}
|
||||
|
||||
try {
|
||||
await setPublicHeaderBannerConfig({
|
||||
enabled,
|
||||
message,
|
||||
ctaLabel: ctaLabel || null,
|
||||
ctaHref: ctaHref || null,
|
||||
})
|
||||
} catch {
|
||||
redirect(
|
||||
`/settings?error=${encodeURIComponent(
|
||||
t(
|
||||
"settings.banner.errors.updateFailed",
|
||||
"Saving banner settings failed. Ensure database migrations are applied.",
|
||||
),
|
||||
)}`,
|
||||
)
|
||||
}
|
||||
|
||||
revalidatePath("/settings")
|
||||
redirect(
|
||||
`/settings?notice=${encodeURIComponent(
|
||||
t("settings.banner.success.updated", "Public header banner settings updated."),
|
||||
)}`,
|
||||
)
|
||||
}
|
||||
|
||||
export default async function SettingsPage({ searchParams }: { searchParams: SearchParamsInput }) {
|
||||
const role = await requirePermissionForRoute({
|
||||
nextPath: "/settings",
|
||||
@@ -86,10 +138,11 @@ export default async function SettingsPage({ searchParams }: { searchParams: Sea
|
||||
scope: "global",
|
||||
})
|
||||
|
||||
const [params, locale, isRegistrationEnabled] = await Promise.all([
|
||||
const [params, locale, isRegistrationEnabled, publicBanner] = await Promise.all([
|
||||
searchParams,
|
||||
resolveAdminLocale(),
|
||||
isAdminSelfRegistrationEnabled(),
|
||||
getPublicHeaderBannerConfig(),
|
||||
])
|
||||
const messages = await getAdminMessages(locale)
|
||||
const t = (key: string, fallback: string) => translateMessage(messages, key, fallback)
|
||||
@@ -175,6 +228,72 @@ export default async function SettingsPage({ searchParams }: { searchParams: Sea
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="rounded-xl border border-neutral-200 p-6">
|
||||
<div className="space-y-5">
|
||||
<div className="space-y-2">
|
||||
<h2 className="text-xl font-medium">
|
||||
{t("settings.banner.title", "Public header banner")}
|
||||
</h2>
|
||||
<p className="text-sm text-neutral-600">
|
||||
{t(
|
||||
"settings.banner.description",
|
||||
"Control the top banner shown on the public app header.",
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<form action={updatePublicHeaderBannerAction} className="space-y-4">
|
||||
<label className="flex items-center gap-3 text-sm">
|
||||
<input
|
||||
type="checkbox"
|
||||
name="bannerEnabled"
|
||||
defaultChecked={publicBanner.enabled}
|
||||
className="h-4 w-4 rounded border-neutral-300"
|
||||
/>
|
||||
<span>{t("settings.banner.enabledLabel", "Enable public header banner")}</span>
|
||||
</label>
|
||||
|
||||
<label className="space-y-1 text-sm">
|
||||
<span className="text-xs text-neutral-600">
|
||||
{t("settings.banner.messageLabel", "Message")}
|
||||
</span>
|
||||
<input
|
||||
name="bannerMessage"
|
||||
defaultValue={publicBanner.message}
|
||||
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<div className="grid gap-3 md:grid-cols-2">
|
||||
<label className="space-y-1 text-sm">
|
||||
<span className="text-xs text-neutral-600">
|
||||
{t("settings.banner.ctaLabelLabel", "CTA label (optional)")}
|
||||
</span>
|
||||
<input
|
||||
name="bannerCtaLabel"
|
||||
defaultValue={publicBanner.ctaLabel ?? ""}
|
||||
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||
/>
|
||||
</label>
|
||||
<label className="space-y-1 text-sm">
|
||||
<span className="text-xs text-neutral-600">
|
||||
{t("settings.banner.ctaHrefLabel", "CTA URL (optional)")}
|
||||
</span>
|
||||
<input
|
||||
name="bannerCtaHref"
|
||||
defaultValue={publicBanner.ctaHref ?? ""}
|
||||
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<Button type="submit">
|
||||
{t("settings.banner.actions.save", "Save banner settings")}
|
||||
</Button>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
</AdminShell>
|
||||
)
|
||||
}
|
||||
|
||||
70
apps/admin/src/app/welcome/page.test.tsx
Normal file
70
apps/admin/src/app/welcome/page.test.tsx
Normal file
@@ -0,0 +1,70 @@
|
||||
import type { ReactElement } from "react"
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||
|
||||
const { redirectMock, resolveRoleFromServerContextMock, hasOwnerUserMock } = vi.hoisted(() => ({
|
||||
redirectMock: vi.fn((path: string) => {
|
||||
throw new Error(`REDIRECT:${path}`)
|
||||
}),
|
||||
resolveRoleFromServerContextMock: vi.fn(),
|
||||
hasOwnerUserMock: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock("next/navigation", () => ({
|
||||
redirect: redirectMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/lib/access-server", () => ({
|
||||
resolveRoleFromServerContext: resolveRoleFromServerContextMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/lib/auth/server", () => ({
|
||||
hasOwnerUser: hasOwnerUserMock,
|
||||
}))
|
||||
|
||||
vi.mock("@/app/login/login-form", () => ({
|
||||
LoginForm: ({ mode }: { mode: string }) => ({ type: "login-form", props: { mode } }),
|
||||
}))
|
||||
|
||||
import WelcomePage from "./page"
|
||||
|
||||
function expectRedirect(call: () => Promise<unknown>, path: string) {
|
||||
return expect(call()).rejects.toThrow(`REDIRECT:${path}`)
|
||||
}
|
||||
|
||||
describe("welcome page", () => {
|
||||
beforeEach(() => {
|
||||
redirectMock.mockClear()
|
||||
resolveRoleFromServerContextMock.mockReset()
|
||||
hasOwnerUserMock.mockReset()
|
||||
})
|
||||
|
||||
it("redirects authenticated users to dashboard", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue("admin")
|
||||
|
||||
await expectRedirect(
|
||||
() => WelcomePage({ searchParams: Promise.resolve({ next: "/media" }) }),
|
||||
"/",
|
||||
)
|
||||
})
|
||||
|
||||
it("redirects to login after owner exists", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(true)
|
||||
|
||||
await expectRedirect(
|
||||
() => WelcomePage({ searchParams: Promise.resolve({ next: "/media" }) }),
|
||||
"/login?next=%2Fmedia",
|
||||
)
|
||||
})
|
||||
|
||||
it("renders owner sign-up mode when owner is missing", async () => {
|
||||
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||
hasOwnerUserMock.mockResolvedValue(false)
|
||||
|
||||
const page = (await WelcomePage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||
mode: string
|
||||
}>
|
||||
|
||||
expect(page.props.mode).toBe("signup-owner")
|
||||
})
|
||||
})
|
||||
84
apps/admin/src/components/media/media-upload-form.test.tsx
Normal file
84
apps/admin/src/components/media/media-upload-form.test.tsx
Normal file
@@ -0,0 +1,84 @@
|
||||
/* @vitest-environment jsdom */
|
||||
|
||||
import { fireEvent, render, screen, waitFor } from "@testing-library/react"
|
||||
import { afterEach, describe, expect, it, vi } from "vitest"
|
||||
|
||||
import { MediaUploadForm } from "./media-upload-form"
|
||||
|
||||
describe("MediaUploadForm", () => {
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
it("updates accepted MIME list based on selected media type", () => {
|
||||
render(<MediaUploadForm />)
|
||||
|
||||
const fileInput = screen.getByLabelText("File") as HTMLInputElement
|
||||
const typeSelect = screen.getByLabelText("Type") as HTMLSelectElement
|
||||
|
||||
expect(fileInput.accept).toContain("image/jpeg")
|
||||
|
||||
fireEvent.change(typeSelect, { target: { value: "video" } })
|
||||
|
||||
expect(fileInput.accept).toContain("video/mp4")
|
||||
expect(fileInput.accept).not.toContain("image/jpeg")
|
||||
})
|
||||
|
||||
it("shows API error message when upload fails", async () => {
|
||||
const fetchMock = vi.spyOn(globalThis, "fetch").mockResolvedValue({
|
||||
ok: false,
|
||||
json: async () => ({ message: "Invalid file type" }),
|
||||
} as Response)
|
||||
|
||||
render(<MediaUploadForm />)
|
||||
|
||||
const form = screen.getByRole("button", { name: "Upload media" }).closest("form")
|
||||
|
||||
if (!form) {
|
||||
throw new Error("Upload form not found")
|
||||
}
|
||||
|
||||
const fileInput = screen.getByLabelText("File") as HTMLInputElement
|
||||
fireEvent.change(fileInput, {
|
||||
target: {
|
||||
files: [new File(["x"], "demo.png", { type: "image/png" })],
|
||||
},
|
||||
})
|
||||
|
||||
fireEvent.submit(form)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.queryByText("Invalid file type")).not.toBeNull()
|
||||
})
|
||||
|
||||
expect(fetchMock).toHaveBeenCalledWith(
|
||||
"/api/media/upload",
|
||||
expect.objectContaining({ method: "POST" }),
|
||||
)
|
||||
})
|
||||
|
||||
it("shows network error message when request throws", async () => {
|
||||
vi.spyOn(globalThis, "fetch").mockRejectedValue(new Error("network down"))
|
||||
|
||||
render(<MediaUploadForm />)
|
||||
|
||||
const form = screen.getByRole("button", { name: "Upload media" }).closest("form")
|
||||
|
||||
if (!form) {
|
||||
throw new Error("Upload form not found")
|
||||
}
|
||||
|
||||
const fileInput = screen.getByLabelText("File") as HTMLInputElement
|
||||
fireEvent.change(fileInput, {
|
||||
target: {
|
||||
files: [new File(["x"], "demo.png", { type: "image/png" })],
|
||||
},
|
||||
})
|
||||
|
||||
fireEvent.submit(form)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.queryByText("Upload request failed. Please retry.")).not.toBeNull()
|
||||
})
|
||||
})
|
||||
})
|
||||
238
apps/admin/src/lib/auth/server.test.ts
Normal file
238
apps/admin/src/lib/auth/server.test.ts
Normal file
@@ -0,0 +1,238 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||
|
||||
const { mockDb, mockIsAdminSelfRegistrationEnabled, mockAuth, mockAuthRouteHandlers } = vi.hoisted(
|
||||
() => {
|
||||
const mockDb = {
|
||||
user: {
|
||||
count: vi.fn(),
|
||||
findUnique: vi.fn(),
|
||||
findMany: vi.fn(),
|
||||
findFirst: vi.fn(),
|
||||
update: vi.fn(),
|
||||
updateMany: vi.fn(),
|
||||
},
|
||||
$transaction: vi.fn(),
|
||||
}
|
||||
|
||||
return {
|
||||
mockDb,
|
||||
mockIsAdminSelfRegistrationEnabled: vi.fn(),
|
||||
mockAuth: {
|
||||
api: {
|
||||
getSession: vi.fn(),
|
||||
},
|
||||
$context: Promise.resolve({
|
||||
internalAdapter: {
|
||||
findUserByEmail: vi.fn(),
|
||||
linkAccount: vi.fn(),
|
||||
createUser: vi.fn(),
|
||||
},
|
||||
password: {
|
||||
hash: vi.fn(async (value: string) => `hashed:${value}`),
|
||||
},
|
||||
}),
|
||||
},
|
||||
mockAuthRouteHandlers: {
|
||||
GET: vi.fn(),
|
||||
POST: vi.fn(),
|
||||
PATCH: vi.fn(),
|
||||
PUT: vi.fn(),
|
||||
DELETE: vi.fn(),
|
||||
},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
vi.mock("@cms/db", () => ({
|
||||
db: mockDb,
|
||||
isAdminSelfRegistrationEnabled: mockIsAdminSelfRegistrationEnabled,
|
||||
}))
|
||||
|
||||
vi.mock("better-auth", () => ({
|
||||
betterAuth: vi.fn(() => mockAuth),
|
||||
}))
|
||||
|
||||
vi.mock("better-auth/adapters/prisma", () => ({
|
||||
prismaAdapter: vi.fn(() => ({})),
|
||||
}))
|
||||
|
||||
vi.mock("better-auth/next-js", () => ({
|
||||
toNextJsHandler: vi.fn(() => mockAuthRouteHandlers),
|
||||
}))
|
||||
|
||||
import {
|
||||
canDeleteUserAccount,
|
||||
enforceOwnerInvariant,
|
||||
promoteFirstRegisteredUserToOwner,
|
||||
} from "./server"
|
||||
|
||||
describe("auth owner/support invariants", () => {
|
||||
beforeEach(() => {
|
||||
mockIsAdminSelfRegistrationEnabled.mockReset()
|
||||
mockDb.user.count.mockReset()
|
||||
mockDb.user.findUnique.mockReset()
|
||||
mockDb.user.findMany.mockReset()
|
||||
mockDb.user.findFirst.mockReset()
|
||||
mockDb.user.update.mockReset()
|
||||
mockDb.user.updateMany.mockReset()
|
||||
mockDb.$transaction.mockReset()
|
||||
})
|
||||
|
||||
it("blocks deletion of protected users", async () => {
|
||||
mockDb.user.findUnique.mockResolvedValue({
|
||||
role: "support",
|
||||
isProtected: true,
|
||||
})
|
||||
|
||||
const allowed = await canDeleteUserAccount("user-protected")
|
||||
|
||||
expect(allowed).toBe(false)
|
||||
})
|
||||
|
||||
it("allows deletion of non-owner non-protected users", async () => {
|
||||
mockDb.user.findUnique.mockResolvedValue({
|
||||
role: "editor",
|
||||
isProtected: false,
|
||||
})
|
||||
|
||||
const allowed = await canDeleteUserAccount("user-editor")
|
||||
|
||||
expect(allowed).toBe(true)
|
||||
})
|
||||
|
||||
it("keeps sole owner non-deletable", async () => {
|
||||
mockDb.user.findUnique.mockResolvedValue({
|
||||
role: "owner",
|
||||
isProtected: false,
|
||||
})
|
||||
mockDb.user.count.mockResolvedValue(1)
|
||||
|
||||
const allowed = await canDeleteUserAccount("owner-1")
|
||||
|
||||
expect(allowed).toBe(false)
|
||||
})
|
||||
|
||||
it("promotes earliest non-support user when no owner exists", async () => {
|
||||
const tx = {
|
||||
user: {
|
||||
findMany: vi.fn().mockResolvedValue([]),
|
||||
findFirst: vi.fn().mockResolvedValue({ id: "candidate-1" }),
|
||||
update: vi.fn().mockResolvedValue({ id: "candidate-1" }),
|
||||
updateMany: vi.fn(),
|
||||
},
|
||||
}
|
||||
|
||||
mockDb.$transaction.mockImplementation(async (callback: (trx: typeof tx) => unknown) =>
|
||||
callback(tx),
|
||||
)
|
||||
|
||||
const result = await enforceOwnerInvariant()
|
||||
|
||||
expect(result).toEqual({
|
||||
ownerId: "candidate-1",
|
||||
ownerCount: 1,
|
||||
repaired: true,
|
||||
})
|
||||
expect(tx.user.update).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it("demotes extra owners and repairs canonical owner protection", async () => {
|
||||
const tx = {
|
||||
user: {
|
||||
findMany: vi.fn().mockResolvedValue([
|
||||
{ id: "owner-a", isProtected: false, isBanned: true },
|
||||
{ id: "owner-b", isProtected: true, isBanned: false },
|
||||
]),
|
||||
findFirst: vi.fn(),
|
||||
update: vi.fn().mockResolvedValue({ id: "owner-a" }),
|
||||
updateMany: vi.fn().mockResolvedValue({ count: 1 }),
|
||||
},
|
||||
}
|
||||
|
||||
mockDb.$transaction.mockImplementation(async (callback: (trx: typeof tx) => unknown) =>
|
||||
callback(tx),
|
||||
)
|
||||
|
||||
const result = await enforceOwnerInvariant()
|
||||
|
||||
expect(result).toEqual({
|
||||
ownerId: "owner-a",
|
||||
ownerCount: 1,
|
||||
repaired: true,
|
||||
})
|
||||
expect(tx.user.updateMany).toHaveBeenCalledWith({
|
||||
where: { id: { in: ["owner-b"] } },
|
||||
data: { role: "admin", isProtected: false },
|
||||
})
|
||||
expect(tx.user.update).toHaveBeenCalledWith({
|
||||
where: { id: "owner-a" },
|
||||
data: { isProtected: true, isBanned: false },
|
||||
})
|
||||
})
|
||||
|
||||
it("does not promote first registration when an owner already exists", async () => {
|
||||
mockDb.$transaction.mockImplementationOnce(
|
||||
async (
|
||||
callback: (tx: {
|
||||
user: { findFirst: () => Promise<{ id: string }>; update: () => void }
|
||||
}) => unknown,
|
||||
) =>
|
||||
callback({
|
||||
user: {
|
||||
findFirst: vi.fn().mockResolvedValue({ id: "owner-existing" }),
|
||||
update: vi.fn(),
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
const promoted = await promoteFirstRegisteredUserToOwner("candidate")
|
||||
|
||||
expect(promoted).toBe(false)
|
||||
})
|
||||
|
||||
it("promotes first registration and re-enforces owner invariant", async () => {
|
||||
mockDb.$transaction
|
||||
.mockImplementationOnce(
|
||||
async (
|
||||
callback: (tx: {
|
||||
user: { findFirst: () => Promise<null>; update: () => Promise<{ id: string }> }
|
||||
}) => unknown,
|
||||
) =>
|
||||
callback({
|
||||
user: {
|
||||
findFirst: vi.fn().mockResolvedValue(null),
|
||||
update: vi.fn().mockResolvedValue({ id: "candidate" }),
|
||||
},
|
||||
}),
|
||||
)
|
||||
.mockImplementationOnce(
|
||||
async (
|
||||
callback: (tx: {
|
||||
user: {
|
||||
findMany: () => Promise<
|
||||
Array<{ id: string; isProtected: boolean; isBanned: boolean }>
|
||||
>
|
||||
findFirst: () => void
|
||||
update: () => void
|
||||
updateMany: () => void
|
||||
}
|
||||
}) => unknown,
|
||||
) =>
|
||||
callback({
|
||||
user: {
|
||||
findMany: vi
|
||||
.fn()
|
||||
.mockResolvedValue([{ id: "candidate", isProtected: true, isBanned: false }]),
|
||||
findFirst: vi.fn(),
|
||||
update: vi.fn(),
|
||||
updateMany: vi.fn(),
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
const promoted = await promoteFirstRegisteredUserToOwner("candidate")
|
||||
|
||||
expect(promoted).toBe(true)
|
||||
expect(mockDb.$transaction).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
@@ -57,9 +57,11 @@ export {
|
||||
registerPostCrudAuditHook,
|
||||
updatePost,
|
||||
} from "./posts"
|
||||
export type { PublicHeaderBanner } from "./settings"
|
||||
export type { PublicHeaderBanner, PublicHeaderBannerConfig } from "./settings"
|
||||
export {
|
||||
getPublicHeaderBanner,
|
||||
getPublicHeaderBannerConfig,
|
||||
isAdminSelfRegistrationEnabled,
|
||||
setAdminSelfRegistrationEnabled,
|
||||
setPublicHeaderBannerConfig,
|
||||
} from "./settings"
|
||||
|
||||
92
packages/db/src/settings.test.ts
Normal file
92
packages/db/src/settings.test.ts
Normal file
@@ -0,0 +1,92 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||
|
||||
const { mockDb } = vi.hoisted(() => ({
|
||||
mockDb: {
|
||||
systemSetting: {
|
||||
findUnique: vi.fn(),
|
||||
upsert: vi.fn(),
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock("./client", () => ({
|
||||
db: mockDb,
|
||||
}))
|
||||
|
||||
import {
|
||||
getPublicHeaderBanner,
|
||||
getPublicHeaderBannerConfig,
|
||||
isAdminSelfRegistrationEnabled,
|
||||
setPublicHeaderBannerConfig,
|
||||
} from "./settings"
|
||||
|
||||
describe("settings service", () => {
|
||||
const previousEnv = process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED
|
||||
|
||||
beforeEach(() => {
|
||||
mockDb.systemSetting.findUnique.mockReset()
|
||||
mockDb.systemSetting.upsert.mockReset()
|
||||
process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED = previousEnv
|
||||
})
|
||||
|
||||
it("falls back to env flag when registration setting is missing", async () => {
|
||||
process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED = "true"
|
||||
mockDb.systemSetting.findUnique.mockResolvedValue(null)
|
||||
|
||||
const enabled = await isAdminSelfRegistrationEnabled()
|
||||
|
||||
expect(enabled).toBe(true)
|
||||
})
|
||||
|
||||
it("reads active public header banner payload", async () => {
|
||||
mockDb.systemSetting.findUnique.mockResolvedValue({
|
||||
value: JSON.stringify({
|
||||
enabled: true,
|
||||
message: "Commissions open",
|
||||
ctaLabel: "Book now",
|
||||
ctaHref: "/contact",
|
||||
}),
|
||||
})
|
||||
|
||||
const banner = await getPublicHeaderBanner()
|
||||
|
||||
expect(banner).toEqual({
|
||||
message: "Commissions open",
|
||||
ctaLabel: "Book now",
|
||||
ctaHref: "/contact",
|
||||
})
|
||||
})
|
||||
|
||||
it("returns a disabled default config for invalid data", async () => {
|
||||
mockDb.systemSetting.findUnique.mockResolvedValue({
|
||||
value: "not-json",
|
||||
})
|
||||
|
||||
const config = await getPublicHeaderBannerConfig()
|
||||
|
||||
expect(config).toEqual({
|
||||
enabled: false,
|
||||
message: "",
|
||||
ctaLabel: null,
|
||||
ctaHref: null,
|
||||
})
|
||||
})
|
||||
|
||||
it("writes banner config to system settings", async () => {
|
||||
mockDb.systemSetting.upsert.mockResolvedValue({})
|
||||
|
||||
await setPublicHeaderBannerConfig({
|
||||
enabled: true,
|
||||
message: "Holiday schedule",
|
||||
ctaLabel: "Details",
|
||||
ctaHref: "/news",
|
||||
})
|
||||
|
||||
expect(mockDb.systemSetting.upsert).toHaveBeenCalledTimes(1)
|
||||
expect(mockDb.systemSetting.upsert.mock.calls[0]?.[0]).toMatchObject({
|
||||
where: {
|
||||
key: "public.header_banner",
|
||||
},
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -16,6 +16,13 @@ export type PublicHeaderBanner = {
|
||||
ctaHref?: string
|
||||
}
|
||||
|
||||
export type PublicHeaderBannerConfig = {
|
||||
enabled: boolean
|
||||
message: string
|
||||
ctaLabel: string | null
|
||||
ctaHref: string | null
|
||||
}
|
||||
|
||||
function resolveEnvFallback(): boolean {
|
||||
return process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED === "true"
|
||||
}
|
||||
@@ -114,3 +121,69 @@ export async function getPublicHeaderBanner(): Promise<PublicHeaderBanner | null
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export async function getPublicHeaderBannerConfig(): Promise<PublicHeaderBannerConfig> {
|
||||
try {
|
||||
const setting = await db.systemSetting.findUnique({
|
||||
where: { key: PUBLIC_HEADER_BANNER_KEY },
|
||||
select: { value: true },
|
||||
})
|
||||
|
||||
if (!setting) {
|
||||
return {
|
||||
enabled: false,
|
||||
message: "",
|
||||
ctaLabel: null,
|
||||
ctaHref: null,
|
||||
}
|
||||
}
|
||||
|
||||
const parsed = parsePublicHeaderBanner(setting.value)
|
||||
|
||||
if (!parsed) {
|
||||
return {
|
||||
enabled: false,
|
||||
message: "",
|
||||
ctaLabel: null,
|
||||
ctaHref: null,
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: parsed.enabled,
|
||||
message: parsed.message,
|
||||
ctaLabel: parsed.ctaLabel ?? null,
|
||||
ctaHref: parsed.ctaHref ?? null,
|
||||
}
|
||||
} catch {
|
||||
return {
|
||||
enabled: false,
|
||||
message: "",
|
||||
ctaLabel: null,
|
||||
ctaHref: null,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export async function setPublicHeaderBannerConfig(input: PublicHeaderBannerConfig): Promise<void> {
|
||||
await db.systemSetting.upsert({
|
||||
where: { key: PUBLIC_HEADER_BANNER_KEY },
|
||||
create: {
|
||||
key: PUBLIC_HEADER_BANNER_KEY,
|
||||
value: JSON.stringify({
|
||||
enabled: input.enabled,
|
||||
message: input.message,
|
||||
ctaLabel: input.ctaLabel ?? undefined,
|
||||
ctaHref: input.ctaHref ?? undefined,
|
||||
}),
|
||||
},
|
||||
update: {
|
||||
value: JSON.stringify({
|
||||
enabled: input.enabled,
|
||||
message: input.message,
|
||||
ctaLabel: input.ctaLabel ?? undefined,
|
||||
ctaHref: input.ctaHref ?? undefined,
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user