feat(auth): add email verification banner, wall, /verify-email page
Wires up the soft 7-day email-verification grace period UX. - EmailVerificationBanner now uses the design-system warning tokens (bg-warning-dim / text-warning) and hides itself once the grace period expires, so the wall takes over without double-messaging. - EmailVerificationWall picks up data-testids on the resend and sign-out CTAs. - VerifyEmailPage gains a single-fire useRef guard (so React 19 strict-mode double-invoke doesn't burn the token), an already-verified short-circuit that skips the API call, success state with auth-store refresh + redirect to /?verified=1, and an error state with a resend CTA. Tests: banner hides past day-7, banner resend triggers API call, verify success refreshes + redirects, verify short-circuits when already verified, single-fire guard holds across remount. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -9,6 +9,7 @@ import { BrandLogo } from '@/components/common/BrandLogo'
|
||||
import { TopBar } from './TopBar'
|
||||
import { Sidebar } from './Sidebar'
|
||||
import { EmailVerificationBanner } from './EmailVerificationBanner'
|
||||
import { EmailVerificationGate } from '@/components/common/EmailVerificationGate'
|
||||
import { ViewTransitionOutlet } from './ViewTransitionOutlet'
|
||||
import { FeedbackWidget } from '@/components/common/FeedbackWidget'
|
||||
import { cn } from '@/lib/utils'
|
||||
@@ -173,7 +174,9 @@ export function AppLayout() {
|
||||
{/* Main Content */}
|
||||
<main className="main-content flex flex-col overflow-hidden min-h-0">
|
||||
<EmailVerificationBanner />
|
||||
<ViewTransitionOutlet />
|
||||
<EmailVerificationGate>
|
||||
<ViewTransitionOutlet />
|
||||
</EmailVerificationGate>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -5,7 +5,39 @@ import { useAuthStore } from '@/store/authStore'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { toast } from '@/lib/toast'
|
||||
|
||||
export function EmailVerificationBanner() {
|
||||
const MS_PER_DAY = 24 * 60 * 60 * 1000
|
||||
|
||||
/**
|
||||
* Whole days elapsed between an ISO timestamp and now (floored).
|
||||
*
|
||||
* Mirrors the helper in `EmailVerificationGate` — keep the two in sync so the
|
||||
* banner hides on the same day the wall appears (Day 7+ unverified). Defensive
|
||||
* on bad timestamps: treats unparseable input as "just signed up" so we never
|
||||
* accidentally hide the banner on a real unverified user.
|
||||
*/
|
||||
function daysSince(iso: string, now: number = Date.now()): number {
|
||||
const created = Date.parse(iso)
|
||||
if (Number.isNaN(created)) return 0
|
||||
return Math.floor((now - created) / MS_PER_DAY)
|
||||
}
|
||||
|
||||
interface EmailVerificationBannerProps {
|
||||
/**
|
||||
* Override the grace period (in days). Day `gracePeriodDays + 1` and beyond
|
||||
* suppress the banner — `EmailVerificationGate` shows the wall instead.
|
||||
* Defaults to 6 (matches the gate).
|
||||
*/
|
||||
gracePeriodDays?: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Top-of-dashboard bar shown to users who signed up but haven't verified their
|
||||
* email yet. Hides itself once the grace period expires (the wall takes over)
|
||||
* and once the user dismisses it for the session.
|
||||
*/
|
||||
export function EmailVerificationBanner({
|
||||
gracePeriodDays = 6,
|
||||
}: EmailVerificationBannerProps = {}) {
|
||||
const user = useAuthStore((s) => s.user)
|
||||
const [dismissed, setDismissed] = useState(false)
|
||||
const [isSending, setIsSending] = useState(false)
|
||||
@@ -19,6 +51,11 @@ export function EmailVerificationBanner() {
|
||||
|
||||
if (!user || user.email_verified_at || dismissed || !verificationEnabled) return null
|
||||
|
||||
// Past grace period: the wall takes over inside <EmailVerificationGate>.
|
||||
// Keep the banner out of the way so we don't double-show messaging.
|
||||
const elapsed = daysSince(user.created_at)
|
||||
if (elapsed > gracePeriodDays) return null
|
||||
|
||||
const handleResend = async () => {
|
||||
setIsSending(true)
|
||||
try {
|
||||
@@ -32,22 +69,29 @@ export function EmailVerificationBanner() {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-3 border-b border-amber-400/20 bg-amber-400/5 px-4 py-2 text-sm">
|
||||
<AlertTriangle className="h-4 w-4 shrink-0 text-amber-400" />
|
||||
<span className="text-amber-200">
|
||||
<div
|
||||
data-testid="email-verification-banner"
|
||||
className="flex items-center gap-3 border-b border-warning/20 bg-warning-dim px-4 py-2 text-sm"
|
||||
>
|
||||
<AlertTriangle className="h-4 w-4 shrink-0 text-warning" />
|
||||
<span className="text-foreground">
|
||||
Your email is not verified.
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleResend}
|
||||
disabled={isSending}
|
||||
data-testid="banner-resend-button"
|
||||
className={cn(
|
||||
'text-amber-400 underline hover:text-amber-300 disabled:opacity-50'
|
||||
'text-warning underline hover:opacity-80 disabled:opacity-50',
|
||||
)}
|
||||
>
|
||||
{isSending ? <Loader2 className="inline h-3 w-3 animate-spin" /> : 'Resend verification email'}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setDismissed(true)}
|
||||
aria-label="Dismiss"
|
||||
className="ml-auto text-muted-foreground hover:text-foreground"
|
||||
>
|
||||
<X className="h-4 w-4" />
|
||||
|
||||
123
frontend/src/components/layout/__tests__/AppLayout.test.tsx
Normal file
123
frontend/src/components/layout/__tests__/AppLayout.test.tsx
Normal file
@@ -0,0 +1,123 @@
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
||||
import { render, screen } from '@testing-library/react'
|
||||
import { MemoryRouter, Routes, Route } from 'react-router-dom'
|
||||
|
||||
import { AppLayout } from '../AppLayout'
|
||||
import { useAuthStore } from '@/store/authStore'
|
||||
import type { User } from '@/types'
|
||||
|
||||
// Mock heavy/external pieces so this stays a focused integration test for the
|
||||
// gate placement. We don't care that TopBar/Sidebar render real content here —
|
||||
// only that the EmailVerificationGate is in the tree and gates the outlet.
|
||||
vi.mock('@/hooks/useBillingPoll', () => ({
|
||||
useBillingPoll: () => undefined,
|
||||
}))
|
||||
|
||||
vi.mock('@/hooks/usePermissions', () => ({
|
||||
usePermissions: () => ({ effectiveRole: 'engineer' }),
|
||||
}))
|
||||
|
||||
vi.mock('../TopBar', () => ({
|
||||
TopBar: () => <div data-testid="top-bar" />,
|
||||
}))
|
||||
|
||||
vi.mock('../Sidebar', () => ({
|
||||
Sidebar: () => <div data-testid="sidebar" />,
|
||||
}))
|
||||
|
||||
vi.mock('../EmailVerificationBanner', () => ({
|
||||
EmailVerificationBanner: () => <div data-testid="email-verification-banner-mock" />,
|
||||
}))
|
||||
|
||||
vi.mock('@/components/common/FeedbackWidget', () => ({
|
||||
FeedbackWidget: () => null,
|
||||
}))
|
||||
|
||||
vi.mock('@/api/auth', () => ({
|
||||
authApi: {
|
||||
getVerificationStatus: vi.fn().mockResolvedValue({ enabled: true }),
|
||||
sendVerificationEmail: vi.fn().mockResolvedValue(undefined),
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/toast', () => ({
|
||||
toast: { success: vi.fn(), error: vi.fn() },
|
||||
}))
|
||||
|
||||
function makeUser(overrides: Partial<User> = {}): User {
|
||||
return {
|
||||
id: 'user-1',
|
||||
email: 'test@example.com',
|
||||
name: 'Test User',
|
||||
role: 'engineer',
|
||||
is_super_admin: false,
|
||||
is_active: true,
|
||||
must_change_password: false,
|
||||
account_id: 'acct-1',
|
||||
account_role: 'engineer',
|
||||
team_id: null,
|
||||
created_at: '2026-05-01T00:00:00Z',
|
||||
last_login: null,
|
||||
phone: null,
|
||||
job_title: null,
|
||||
timezone: 'UTC',
|
||||
avatar_url: null,
|
||||
email_verified_at: null,
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
const FROZEN_NOW = new Date('2026-05-06T00:00:00Z')
|
||||
|
||||
function renderAppLayout() {
|
||||
return render(
|
||||
<MemoryRouter initialEntries={['/']}>
|
||||
<Routes>
|
||||
<Route element={<AppLayout />}>
|
||||
<Route
|
||||
index
|
||||
element={<div data-testid="child-route-content">child route</div>}
|
||||
/>
|
||||
</Route>
|
||||
</Routes>
|
||||
</MemoryRouter>,
|
||||
)
|
||||
}
|
||||
|
||||
describe('AppLayout — EmailVerificationGate wiring', () => {
|
||||
beforeEach(() => {
|
||||
vi.useFakeTimers()
|
||||
vi.setSystemTime(FROZEN_NOW)
|
||||
useAuthStore.setState({ user: null, token: null, isAuthenticated: false })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers()
|
||||
useAuthStore.setState({ user: null, token: null, isAuthenticated: false })
|
||||
})
|
||||
|
||||
it('renders the wall and hides the child route on day 8 unverified', () => {
|
||||
// created 8 days before frozen now -> elapsed=8, > grace=6 -> wall.
|
||||
useAuthStore.setState({
|
||||
user: makeUser({ created_at: '2026-04-28T00:00:00Z' }),
|
||||
})
|
||||
|
||||
renderAppLayout()
|
||||
|
||||
expect(screen.getByTestId('email-verification-wall')).toBeInTheDocument()
|
||||
expect(screen.queryByTestId('child-route-content')).not.toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('renders the child route within the grace period (day 1 unverified)', () => {
|
||||
useAuthStore.setState({
|
||||
user: makeUser({ created_at: '2026-05-05T00:00:00Z' }),
|
||||
})
|
||||
|
||||
renderAppLayout()
|
||||
|
||||
expect(screen.getByTestId('child-route-content')).toBeInTheDocument()
|
||||
expect(
|
||||
screen.queryByTestId('email-verification-wall'),
|
||||
).not.toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,119 @@
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
||||
import { render, screen, waitFor } from '@testing-library/react'
|
||||
import userEvent from '@testing-library/user-event'
|
||||
|
||||
import { EmailVerificationBanner } from '../EmailVerificationBanner'
|
||||
import { useAuthStore } from '@/store/authStore'
|
||||
import { authApi } from '@/api/auth'
|
||||
import type { User } from '@/types'
|
||||
|
||||
vi.mock('@/api/auth', () => ({
|
||||
authApi: {
|
||||
getVerificationStatus: vi.fn(),
|
||||
sendVerificationEmail: vi.fn(),
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/toast', () => ({
|
||||
toast: {
|
||||
success: vi.fn(),
|
||||
error: vi.fn(),
|
||||
},
|
||||
}))
|
||||
|
||||
function makeUser(overrides: Partial<User> = {}): User {
|
||||
return {
|
||||
id: 'user-1',
|
||||
email: 'test@example.com',
|
||||
name: 'Test User',
|
||||
role: 'engineer',
|
||||
is_super_admin: false,
|
||||
is_active: true,
|
||||
must_change_password: false,
|
||||
account_id: 'acct-1',
|
||||
account_role: 'engineer',
|
||||
team_id: null,
|
||||
created_at: '2026-05-01T00:00:00Z',
|
||||
last_login: null,
|
||||
phone: null,
|
||||
job_title: null,
|
||||
timezone: 'UTC',
|
||||
avatar_url: null,
|
||||
email_verified_at: null,
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
const FROZEN_NOW = new Date('2026-05-06T00:00:00Z')
|
||||
|
||||
describe('EmailVerificationBanner', () => {
|
||||
beforeEach(() => {
|
||||
vi.useFakeTimers({ shouldAdvanceTime: true })
|
||||
vi.setSystemTime(FROZEN_NOW)
|
||||
useAuthStore.setState({ user: null, token: null, isAuthenticated: false })
|
||||
vi.mocked(authApi.getVerificationStatus).mockResolvedValue({
|
||||
enabled: true,
|
||||
})
|
||||
vi.mocked(authApi.sendVerificationEmail).mockResolvedValue(undefined)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('hides past grace day-7+', async () => {
|
||||
// Created 8 days before frozen now -> elapsed=8, > grace=6.
|
||||
useAuthStore.setState({
|
||||
user: makeUser({ created_at: '2026-04-28T00:00:00Z' }),
|
||||
})
|
||||
|
||||
const { container } = render(<EmailVerificationBanner />)
|
||||
|
||||
// Wait long enough for any pending verification-status fetch to resolve.
|
||||
await waitFor(() => {
|
||||
expect(authApi.getVerificationStatus).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
expect(
|
||||
screen.queryByTestId('email-verification-banner'),
|
||||
).not.toBeInTheDocument()
|
||||
expect(container.firstChild).toBeNull()
|
||||
})
|
||||
|
||||
it('renders within the grace window', async () => {
|
||||
// Created 1 day before frozen now -> elapsed=1, within grace.
|
||||
useAuthStore.setState({
|
||||
user: makeUser({ created_at: '2026-05-05T00:00:00Z' }),
|
||||
})
|
||||
|
||||
render(<EmailVerificationBanner />)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(
|
||||
screen.getByTestId('email-verification-banner'),
|
||||
).toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
|
||||
it('resend triggers API call', async () => {
|
||||
useAuthStore.setState({
|
||||
user: makeUser({ created_at: '2026-05-05T00:00:00Z' }),
|
||||
})
|
||||
|
||||
render(<EmailVerificationBanner />)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(
|
||||
screen.getByTestId('email-verification-banner'),
|
||||
).toBeInTheDocument()
|
||||
})
|
||||
|
||||
const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
|
||||
await user.click(screen.getByTestId('banner-resend-button'))
|
||||
|
||||
await waitFor(() => {
|
||||
expect(authApi.sendVerificationEmail).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user