fix(tanstack-react-start): Apply response headers - #6057

Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged

fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom
dios-david:tanstack-start-apply-headers

Conversation

@dios-david

@dios-daviddios-david commented Jun 3, 2025

Copy link
Copy Markdown
Contributor

Description

I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).

I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.

I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.

Any feedback or help would be much appreciated!

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Jun 3, 2025•
edited
Loading

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: f15fc4f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 3, 2025

Copy link
Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@dios-david

dios-david commented Jun 3, 2025

Copy link
Copy Markdown
ContributorAuthor

Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?

@wobsorianowobsoriano changed the title fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano approved these changes Jun 4, 2025
View reviewed changes

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!

@pkg-pr-new

pkg-pr-newBot commented Jun 4, 2025•
edited
Loading

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express

npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types

npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f

@dios-david

dios-david commented Jun 4, 2025

Copy link
Copy Markdown
ContributorAuthor

@wobsoriano 🙌
can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related

@nikosdouvlis
nikosdouvlis merged commit 7d680bc into clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie mentioned this pull request Jun 4, 2025
Merged
@thaohienhomesthaohienhomes mentioned this pull request Jun 16, 2026
Merged
1 task
thaohienhomes added a commit to thaohienhomes/pho-chat-v1 that referenced this pull request Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees

No one assigned

Labels

integrationtanstack

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(tanstack-react-start): Apply response headers - #6057
Merged
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Jun 4, 2025
Merged
fix(tanstack-react-start): Apply response headers#6057
nikosdouvlis merged 4 commits into
clerk:mainfrom 
dios-david:tanstack-start-apply-headers
Conversation
@dios-david
@dios-daviddios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

Contributor
Description
I'm using @tanstack/react-start@1.120.15 and @clerk/tanstack-react-start@0.15.8 in a project and I noticed that the Clerk response headers are not being set on the response, which is needed for some key functionalities (e.g. for the handshake).
I noticed that the getResponseClerkState() function already returns the headers, and they are added to router.update(), but this doesn't seem to work.
I applied these changes to my local project and I can confirm that I see the response headers now (x-clerk-auth-reason and x-clerk-auth-status when not logged in), but I'm not sure what is the best way to fully verify this - I added a test case to the integration tests but I don't have access to run them.
Any feedback or help would be much appreciated!
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@changeset-bot
changeset-botBot
commented
Jun 3, 2025•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: f15fc4f
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/tanstack-react-startPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 3, 2025

Copy link


Copy Markdown

@dios-david is attempting to deploy a commit to the Clerk Production Team on Vercel.
A member of the Team first needs to authorize it.
@dios-david
dios-david
commented
Jun 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Hi @octoper, tagging you as I saw that you contributed the most to this package. Can you take a look at this please?
@wobsorianowobsoriano
changed the title
fix(tanstack-start): Apply response headersfix(tanstack-react-start): Apply response headersJun 4, 2025
wobsoriano
wobsoriano
approved these changes
Jun 4, 2025
View reviewed changes
@wobsorianowobsoriano
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch, thank you for the PR!
@pkg-pr-new
pkg-pr-newBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/agent-toolkit
npm i https://pkg.pr.new/@clerk/agent-toolkit@6057

@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@6057

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@6057

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@6057

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@6057

@clerk/dev-cli
npm i https://pkg.pr.new/@clerk/dev-cli@6057

@clerk/elements
npm i https://pkg.pr.new/@clerk/elements@6057

@clerk/clerk-expo
npm i https://pkg.pr.new/@clerk/clerk-expo@6057

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@6057

@clerk/express
npm i https://pkg.pr.new/@clerk/express@6057

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@6057

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@6057

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@6057

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@6057

@clerk/clerk-react
npm i https://pkg.pr.new/@clerk/clerk-react@6057

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@6057

@clerk/remix
npm i https://pkg.pr.new/@clerk/remix@6057

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@6057

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@6057

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@6057

@clerk/themes
npm i https://pkg.pr.new/@clerk/themes@6057

@clerk/types
npm i https://pkg.pr.new/@clerk/types@6057

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@6057

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@6057

commit: f15fc4f
@dios-david
dios-david
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
@wobsoriano 🙌

can you help me resolving these integration test issues? not sure but looks like it's something permisson/certificate related
@nikosdouvlis
nikosdouvlis
merged commit 7d680bc
into
clerk:mainJun 4, 2025
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 4, 2025
 Merged

@thaohienhomesthaohienhomes
mentioned this pull request
Jun 16, 2026
 Merged

1 task
thaohienhomes added a commit
to thaohienhomes/pho-chat-v1
that referenced
this pull request
Jun 16, 2026
@thaohienhomes@claude
🐛 fix(auth): don't rewrite Clerk handshake requests (fixes session-to…
e270596
…ken 401) (#76)
Root cause of the production auth incident where signed-in users (incognito 100%,
normal browser intermittently) get 401 on every Clerk-cookie-authed endpoint
(tRPC /trpc/lambda/*, /api/subscription/usage-stats + models/allowed), which
greys out PRO/flagship models in the picker.
Vercel logs show `[ClerkAuth] signed-in client but no userId resolved` with
reason `client-uat-but-no-session-token`, status `signed-out`: the client has
`__client_uat` (signed in) but the `__session` token is never established, so
`authenticateRequest()` resolves no userId → tRPC UNAUTHORIZED / route 401.
The cause is the middleware's locale/variant `NextResponse.rewrite()`. When Clerk
redirects back with its handshake nonce (`__clerk_handshake`), clerkMiddleware
must set the session cookies and 307-redirect to the clean URL — but Next.js
ignores a `Location` header once `x-middleware-rewrite` is set, so the rewrite
swallows the handshake and `__session` is never set. The chat endpoint is
unaffected because it authenticates via the header token, not the cookie.
Fix: in defaultMiddleware, skip the rewrite (return NextResponse.next()) when the
request carries a Clerk handshake param, so Clerk fully owns the handshake
round-trip. Ref: clerk/javascript#6057.
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tmilewskitmilewskitmilewski approved these changes
@wobsorianowobsorianowobsoriano approved these changes

Assignees


No one assigned


Labels

integrationtanstack

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

6 participants

@dios-david@tmilewski@wobsoriano@nikosdouvlis@clerk-cookie@LekoArts