Integrate #36, #38, #37 with resolved auth conflicts by benhalverson · Pull Request #40 · benhalverson/store

benhalverson · 2026-03-08T13:21:18Z

This PR integrates the auth-related PR sequence in the recommended order and resolves merge conflicts across shared auth files.

Merged in order:

Conflict resolutions:

src/context/AuthContext.tsx: kept session-as-source-of-truth flow (/api/auth/get-session) and profile hydration behavior.
src/pages/Signin.tsx: kept detailed error handling plus post-login fetchUser() refresh.
src/pages/Signup.tsx: resolved to a unified Better Auth signup + optional passkey registration flow, with auth context refresh via fetchUser().

Notes:

Local test run showed existing unrelated instability in src/components/ColorPicker.test.tsx and a Vitest worker OOM in this environment.
Auth-specific tests (src/pages/Signin.test.tsx) passed during run output.

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

…Context Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

… a11y Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

# Conflicts: # src/context/AuthContext.tsx # src/pages/Signin.tsx

# Conflicts: # src/pages/Signup.tsx

Copilot

Pull request overview

Integrates the auth-related PR sequence (#36 → #38 → #37) and resolves conflicts to align sign-in/sign-up flows with Better Auth session + native passkey endpoints, while adding/adjusting tests and minor formatting changes.

Changes:

Update auth state hydration to gate on GET /api/auth/get-session before fetching /profile.
Migrate Signin/Signup passkey flows to Better Auth native endpoints and refresh auth context via fetchUser().
Add Vitest coverage for Signin password + passkey flows; minor formatting/import-order cleanups in checkout/payment/order pages.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src/context/AuthContext.tsx	Uses Better Auth session as source-of-truth before profile hydration.
src/pages/Signin.tsx	Migrates passkey auth to Better Auth endpoints; improves error handling; refreshes auth via `fetchUser()`.
src/pages/Signin.test.tsx	Adds tests for password sign-in, passkey tab rendering, passkey error handling, and verify-authentication payload shape.
src/pages/Signup.tsx	Unifies signup into password signup + optional passkey registration; refreshes auth via `fetchUser()`.
src/utils/webauthn.ts	Adds `bufferToBase64url` helper for Better Auth/WebAuthn payload encoding.
src/pages/Checkout.tsx	Formatting-only refactor (line wrapping) around parsing and error messages.
src/pages/Payment.tsx	Import order + minor JSX formatting cleanup.
src/pages/OrderComplete.tsx	Formatting-only adjustments (quotes, wrapping, import order).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-08T13:26:58Z

+      // @ts-expect-error
      options.challenge = base64urlToUint8Array(
        options.challenge as unknown as string,
      ).buffer;
-      // @ts-ignore
+      // @ts-expect-error


The passkey options object is mutated using // @ts-expect-error to coerce challenge (and allowCredentials[].id) from string → buffer types. Suppressing these type errors can hide real mismatches over time; prefer building a new PublicKeyCredentialRequestOptions object with correctly typed fields instead of mutating the parsed JSON in place.

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-08T13:45:12Z

+      const optionsRes = await fetch(
+        `${BASE_URL}/api/auth/passkey/generate-register-options`,
+        { credentials: "include" },
+      );
+      if (!optionsRes.ok) throw new Error("Failed to get registration options");



handlePasskeyRegistration currently throws generic errors for non-OK responses (e.g., "Failed to get registration options"). Since the backend appears to return structured {message, code} errors (as handled in Signin.tsx/Profile.tsx), consider parsing and surfacing those details here as well to make failures actionable.

Copilot · 2026-03-08T13:45:12Z

+  const handlePasskeyRegistration = async () => {
+    setPasskeyRegistering(true);
+    const toastId = toast.loading("Registering passkey...");
    try {


The new signup + passkey registration flow is fairly complex (fetch options → WebAuthn create → verify-registration → auth refresh) but currently has no automated coverage. Since Signin.tsx now has Vitest coverage for similar Better Auth flows, adding tests for this passkey registration path (success + common failure cases) would help prevent regressions.

…onse field

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-08T13:53:23Z

+    await user.type(screen.getByLabelText(/email/i), "user@example.com");
+    await user.type(screen.getByLabelText(/password/i), "password123");
+    await user.click(screen.getByRole("button", { name: /sign in with password/i }));
+


This line exceeds the configured Biome formatter line width (80) and will likely be reformatted/flagged by biome check. Running Biome formatting on this file (or wrapping this call across multiple lines) should keep CI/style checks consistent.

Copilot · 2026-03-08T13:53:23Z

+    await user.type(screen.getByLabelText(/email/i), "bad@example.com");
+    await user.type(screen.getByLabelText(/password/i), "wrongpassword");
+    await user.click(screen.getByRole("button", { name: /sign in with password/i }));
+


This click assertion line is over the Biome formatter line width and is likely to be reformatted/flagged by biome check. Consider wrapping the getByRole call onto multiple lines (or run pnpm biome format).

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 14 out of 14 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot AI and others added 12 commits March 7, 2026 09:51

Initial plan

03aa318

feat: migrate Signin.tsx to Better Auth native auth + passkey endpoints

7dbdadf

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Initial plan

49e5b28

Initial plan

3c1b820

refactor: use Better Auth get-session as auth source of truth in Auth…

919d0ae

…Context Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Migrate Signup.tsx to Better Auth signup + passkey registration flow

cdddc80

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Remove package-lock.json artifact from PR

420c30c

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

feat: session-first fetchUser, add Signin.test.tsx, fix input ids for…

aced66f

… a11y Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Revert .gitignore changes

bf3de29

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

Merge PR #36: Better Auth signin + passkey migration

48affbb

Merge PR #38: AuthContext session source-of-truth refactor

2dac67a

# Conflicts: # src/context/AuthContext.tsx # src/pages/Signin.tsx

Merge PR #37: Better Auth signup + passkey registration flow

79ad0be

# Conflicts: # src/pages/Signup.tsx

Copilot AI review requested due to automatic review settings March 8, 2026 13:21

Copilot started reviewing on behalf of benhalverson March 8, 2026 13:21 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

benhalverson added 2 commits March 8, 2026 06:36

fix(auth): migrate profile passkey calls to /api/auth/passkey

590e312

fix(passkey): include credential aliases for verify-registration payload

1883649

Copilot AI review requested due to automatic review settings March 8, 2026 13:40

Copilot started reviewing on behalf of benhalverson March 8, 2026 13:40 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

benhalverson added 2 commits March 8, 2026 06:45

fix(passkey): send full credential object in verify-registration resp…

88719d4

…onse field

refactor(passkey): send minimal verify-registration payload

7f6dc4e

Copilot AI review requested due to automatic review settings March 8, 2026 13:48

Copilot started reviewing on behalf of benhalverson March 8, 2026 13:48 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

benhalverson added 2 commits March 8, 2026 07:01

fix(auth): address PR review follow-ups

7c4a7c0

style: resolve biome findings

0187f0d

Copilot AI review requested due to automatic review settings March 8, 2026 14:19

style: apply biome formatting to auth changes

e325449

Copilot started reviewing on behalf of benhalverson March 8, 2026 14:19 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

Comment thread src/pages/Profile.tsx

Comment thread src/pages/Signup.test.tsx

benhalverson added 2 commits March 8, 2026 07:27

test: stabilize ColorPicker loading assertion

3394932

test: fix product test OOM and serialize test runs

aea9e40

Copilot AI review requested due to automatic review settings March 8, 2026 14:48

Copilot started reviewing on behalf of benhalverson March 8, 2026 14:48 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

fixed passkey issues

7344362

benhalverson merged commit 98f4265 into main Mar 8, 2026

Conversation

benhalverson commented Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

benhalverson commented Mar 8, 2026 •

edited

Loading