Merge pull request #196 from cartsnitch/uat

chore: promote uat to main (ReceiptWitness config validation)

auth/src/auth.ts

@@ -4,23 +4,17 @@ import pg from "pg";
 
 const { Pool } = pg;
 
+const pool = new Pool({
+  connectionString:
+    process.env.DATABASE_URL ??
+    "postgresql://cartsnitch:cartsnitch@localhost:5432/cartsnitch",
+});
+
 const secret = process.env.BETTER_AUTH_SECRET;
 if (!secret) {
   throw new Error("BETTER_AUTH_SECRET environment variable is required");
 }
 
-const databaseUrl = process.env.DATABASE_URL;
-if (!databaseUrl) {
-  console.warn(
-    "WARNING: DATABASE_URL is not set — using default localhost connection. " +
-    "Set DATABASE_URL for production deployments."
-  );
-}
-
-const pool = new Pool({
-  connectionString: databaseUrl ?? "postgresql://cartsnitch:cartsnitch@localhost:5432/cartsnitch",
-});
-
 export const auth = betterAuth({
   database: pool,
   basePath: "/auth",

e2e/fixtures.ts

@@ -1,4 +1,4 @@
-import { test as base, expect, type Page } from "@playwright/test";
+import { test as base, expect } from "@playwright/test";
 import AxeBuilder from "@axe-core/playwright";
 
 export const test = base.extend<{ axeCheck: void }>({
@@ -10,90 +10,3 @@ export const test = base.extend<{ axeCheck: void }>({
 });
 
 export { expect } from "@playwright/test";
-
-const MOCK_USER_ID = "mock_user_123";
-const MOCK_SESSION_ID = "mock_session_456";
-
-function mockAuthRoutes(page: Page, authenticated = false) {
-  page.route(/.*\/auth\/sign-up\/email.*/, async (route) => {
-    await route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({
-        token: null,
-        user: {
-          id: MOCK_USER_ID,
-          email: "mock@cartsnitch.test",
-          name: "Mock User",
-          emailVerified: true,
-          createdAt: new Date().toISOString(),
-          updatedAt: new Date().toISOString(),
-        },
-      }),
-    });
-  });
-
-  page.route(/.*\/auth\/sign-in\/email.*/, async (route) => {
-    await route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({
-        redirect: false,
-        token: "mock_token_123",
-        user: {
-          id: MOCK_USER_ID,
-          email: "mock@cartsnitch.test",
-          name: "Mock User",
-          emailVerified: true,
-          createdAt: new Date().toISOString(),
-          updatedAt: new Date().toISOString(),
-        },
-      }),
-    });
-  });
-
-  page.route(/.*\/auth\/get-session.*/, async (route) => {
-    if (authenticated) {
-      await route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({
-          session: {
-            id: MOCK_SESSION_ID,
-            expiresAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-            createdAt: new Date().toISOString(),
-            updatedAt: new Date().toISOString(),
-            ipAddress: null,
-            userAgent: null,
-          },
-          user: {
-            id: MOCK_USER_ID,
-            email: "mock@cartsnitch.test",
-            name: "Mock User",
-            emailVerified: true,
-            createdAt: new Date().toISOString(),
-            updatedAt: new Date().toISOString(),
-          },
-        }),
-      });
-    } else {
-      await route.fulfill({
-        status: 401,
-        contentType: "application/json",
-        body: JSON.stringify({ error: "Unauthorized" }),
-      });
-    }
-  });
-}
-
-export function mockSessionPending(page: Page) {
-  page.route(/.*\/auth\/session.*/, async (route) => {
-    await route.fulfill({
-      status: 401,
-      contentType: "application/json",
-      body: JSON.stringify({ error: "Unauthorized" }),
-    });
-  });
-}
-
-export { mockAuthRoutes };

e2e/journeys/j1-registration-login.spec.ts

@@ -1,18 +1,18 @@
 import { test, expect } from '@playwright/test';
-import { mockAuthRoutes } from '../fixtures';
 
 const uniqueEmail = () => `betty+e2e-${Date.now()}@cartsnitch.test`;
 
 test.describe('J1: Registration and Login', () => {
-  test('can register a new account and see check your email screen', async ({ page }) => {
-    mockAuthRoutes(page, true);
+  test('can register a new account and lands on dashboard', async ({ page }) => {
     await page.goto('/register');
     await page.fill('[placeholder="Full Name"]', 'Betty Tester');
     await page.fill('[placeholder="Email"]', uniqueEmail());
     await page.fill('[placeholder="Password (min. 8 characters)"]', 'TestPass123!');
     await page.click('button[type="submit"]');
 
-    await expect(page.getByRole('heading', { name: /check your email/i })).toBeVisible();
+    // With VITE_MOCK_AUTH=true the app navigates to "/" on success
+    await expect(page).toHaveURL('http://localhost:5173/');
+    await expect(page.getByRole('heading', { name: /cart/i })).toBeVisible();
   });
 
   test('shows validation error when registration fields are empty', async ({ page }) => {
@@ -31,9 +31,22 @@ test.describe('J1: Registration and Login', () => {
   });
 
   test('can sign in with credentials and land on dashboard', async ({ page }) => {
-    mockAuthRoutes(page, true);
+    // Register first so we have a real account
+    const email = uniqueEmail();
+    await page.goto('/register');
+    await page.fill('[placeholder="Full Name"]', 'Login Betty');
+    await page.fill('[placeholder="Email"]', email);
+    await page.fill('[placeholder="Password (min. 8 characters)"]', 'TestPass123!');
+    await page.click('button[type="submit"]');
+    await expect(page).toHaveURL('http://localhost:5173/');
+
+    // Sign out by clearing the mock session (reload with no session)
+    await page.goto('/');
+    await page.reload();
+
+    // Now sign in
     await page.goto('/login');
-    await page.fill('[placeholder="Email"]', 'test@cartsnitch.test');
+    await page.fill('[placeholder="Email"]', email);
     await page.fill('[placeholder="Password"]', 'TestPass123!');
     await page.click('button[type="submit"]');
 

e2e/journeys/j8-unauth-access.spec.ts

@@ -1,9 +1,8 @@
 import { test, expect } from '@playwright/test';
-import { mockAuthRoutes } from '../fixtures';
 
 test.describe('J8: Unauthenticated Access', () => {
   test('redirects /dashboard (/) to /login when not authenticated', async ({ page }) => {
-    mockAuthRoutes(page, false);
+    // No session cookie — start fresh
     await page.context().clearCookies();
     await page.goto('/');
 
@@ -12,7 +11,6 @@ test.describe('J8: Unauthenticated Access', () => {
   });
 
   test('redirects /purchases to /login when not authenticated', async ({ page }) => {
-    mockAuthRoutes(page, false);
     await page.context().clearCookies();
     await page.goto('/purchases');
 
@@ -21,7 +19,6 @@ test.describe('J8: Unauthenticated Access', () => {
   });
 
   test('redirects /products to /login when not authenticated', async ({ page }) => {
-    mockAuthRoutes(page, false);
     await page.context().clearCookies();
     await page.goto('/products');
 
@@ -30,7 +27,6 @@ test.describe('J8: Unauthenticated Access', () => {
   });
 
   test('redirects /coupons to /login when not authenticated', async ({ page }) => {
-    mockAuthRoutes(page, false);
     await page.context().clearCookies();
     await page.goto('/coupons');
 
@@ -39,9 +35,15 @@ test.describe('J8: Unauthenticated Access', () => {
   });
 
   test('shows loading spinner while auth session is pending', async ({ page }) => {
-    mockAuthRoutes(page, false);
+    // Intercept but don't respond — session stays pending
     await page.context().clearCookies();
+    await page.request.fetch('/api/auth/session', {
+      method: 'GET',
+    });
+
+    // Just navigate to a protected route — ProtectedRoute will show spinner while session is pending
     await page.goto('/purchases');
+    // Spinner is visible briefly; once resolved, should redirect to login
     await expect(page).toHaveURL(/\/login/, { timeout: 10_000 });
   });
 });

e2e/smoke.spec.ts

@@ -1,7 +1,6 @@
-import { test, expect, mockAuthRoutes } from './fixtures';
+import { test, expect } from './fixtures';
 
 test('app loads', async ({ page }) => {
-  mockAuthRoutes(page, false);
   await page.goto('/');
   // Unauthenticated users are redirected to /login
   await expect(page).toHaveURL(/\/login/);

package-lock.json

@@ -9805,9 +9805,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz",
-      "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
+      "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {

playwright.config.ts

@@ -9,12 +9,9 @@ export default defineConfig({
     },
   ],
   webServer: {
-    command: 'npm run dev',
+    command: 'VITE_MOCK_AUTH=true npm run dev',
     url: 'http://localhost:5173',
     reuseExistingServer: !process.env.CI,
-    env: {
-      VITE_MOCK_AUTH: 'true',
-    },
   },
   use: {
     baseURL: 'http://localhost:5173',

src/pages/Login.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Link } from 'react-router-dom'
+import { Link, useNavigate } from 'react-router-dom'
 import { authClient } from '../lib/auth-client.ts'
 import { useAuthStore } from '../stores/auth.ts'
 
@@ -8,6 +8,7 @@ export function Login() {
   const [password, setPassword] = useState('')
   const [error, setError] = useState('')
   const [loading, setLoading] = useState(false)
+  const navigate = useNavigate()
   const setAuthenticated = useAuthStore((s) => s.setAuthenticated)
 
   async function handleSubmit(e: React.FormEvent) {
@@ -30,12 +31,11 @@ export function Login() {
         throw new Error(authError.message ?? 'Sign in failed')
       }
 
-      // After successful signIn, force a full page reload so Better-Auth's
-      // useSession() reinitializes with fresh cookie-backed session state.
-      // Using React Router's navigate() races with Better-Auth's internal update.
+      // After successful signIn, force a session fetch to confirm the cookie is set
+      // before navigating to the protected route
       const sessionResult = await authClient.getSession()
       if (sessionResult.data) {
-        window.location.href = '/'
+        navigate('/')
       } else {
         setError('Sign in failed. Please try again.')
       }