Skip to content

chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers#7448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wobsoriano merged 3 commits into from
Dec 13, 2025
Merged

chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers #7448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8343a87
chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…
wobsoriano Dec 12, 2025
7461ac0
chore: add placeholder changeset
wobsoriano Dec 12, 2025
c8275d0
Merge branch 'main' into rob/port-7445-and-7431
wobsoriano Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/dull-forks-agree.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
1 change: 0 additions & 1 deletion integration/templates/tanstack-react-start/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
"@tanstack/react-start": "1.132.51",
"react": "18.3.1",
"react-dom": "18.3.1",
"srvx": "0.8.15",
"tailwind-merge": "^2.5.4"
},
"devDependencies": {
Expand Down
35 changes: 35 additions & 0 deletions packages/backend/src/tokens/__tests__/clerkRequest.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
expect(json.cookies).toBe('{}');
});
});

describe('duck typing detection (instanceof workaround)', () => {
it('should create a new ClerkRequest from a regular Request', () => {
const regularRequest = new Request('http://localhost:3000');
const clerkRequest = createClerkRequest(regularRequest);

expect(clerkRequest).not.toBe(regularRequest);
expect(clerkRequest.clerkUrl).toBeDefined();
expect(clerkRequest.cookies).toBeDefined();
});

it('should return an existing ClerkRequest instance unchanged', () => {
const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
const secondClerkRequest = createClerkRequest(firstClerkRequest);

expect(secondClerkRequest).toBe(firstClerkRequest);
});

it('should work correctly with bundler-scoped Request classes', () => {
// Simulate bundler creating a scoped Request class (like Request$1)
class RequestScoped extends Request {
constructor(input: RequestInfo | URL, init?: RequestInit) {
super(input, init);
}
}

const scopedRequest = new RequestScoped('http://localhost:3000');
const clerkRequest = createClerkRequest(scopedRequest);

// Should create a new ClerkRequest even though scopedRequest is a different Request class
expect(clerkRequest).not.toBe(scopedRequest);
expect(clerkRequest.clerkUrl).toBeDefined();
expect(clerkRequest.cookies).toBeDefined();
});
});
});
7 changes: 6 additions & 1 deletion packages/backend/src/tokens/clerkRequest.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
// Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
// (e.g., in TanStack Start or other environments with multiple Request class instances)
// ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };
18 changes: 9 additions & 9 deletions packages/nextjs/src/__tests__/keyless-custom-headers.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
});

describe('formatMetadataHeaders', () => {
it('should format complete metadata object with all fields present', () => {
it('should format complete metadata object with all fields present', async () => {
const metadata = {
nodeVersion: 'v18.17.0',
nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
isCI: false,
};

const result = formatMetadataHeaders(metadata);
const result = await formatMetadataHeaders(metadata);

// Test exact header casing and values
expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
});

it('should handle missing optional fields gracefully', () => {
it('should handle missing optional fields gracefully', async () => {
const metadata = {
userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
// Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
};

const result = formatMetadataHeaders(metadata);
const result = await formatMetadataHeaders(metadata);

// Test that only present fields are set
expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
expect(result.get('Clerk-Node-Port')).toBeNull();
});

it('should handle undefined values for optional fields', () => {
it('should handle undefined values for optional fields', async () => {
const metadata = {
nodeVersion: undefined,
nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
isCI: false,
};

const result = formatMetadataHeaders(metadata);
const result = await formatMetadataHeaders(metadata);

// Test that undefined fields are not set
expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
});

it('should handle empty string values', () => {
it('should handle empty string values', async () => {
const metadata = {
nodeVersion: '',
nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
isCI: false,
};

const result = formatMetadataHeaders(metadata);
const result = await formatMetadataHeaders(metadata);

// Empty strings should not be set as headers
expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

// Collect metadata and format headers
const metadata = await collectKeylessMetadata();
const headers = formatMetadataHeaders(metadata);
const headers = await formatMetadataHeaders(metadata);

// Verify the full pipeline works correctly
expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/server/keyless-custom-headers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
* Converts metadata to HTTP headers
*/
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
const headers = new Headers();

if (metadata.nodeVersion) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers by wobsoriano · Pull Request #7448 · clerk/javascript · GitHub
Skip to content
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers#7448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers by wobsoriano · Pull Request #7448 · clerk/javascript · GitHub
Skip to content
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers#7448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers by wobsoriano · Pull Request #7448 · clerk/javascript · GitHub
Skip to content
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers#7448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers by wobsoriano · Pull Request #7448 · clerk/javascript · GitHub
Skip to content
chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers#7448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 3 commits into

from

Dec 13, 2025
 Merged


chore(backend,nextjs): Fix ClerkRequest instance check and keyless custom headers
#7448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8343a87

chore(backend,nextjs): Fix ClerkRequest instance check and keyless cu…


wobsoriano Dec 12, 2025
7461ac0

chore: add placeholder changeset


wobsoriano Dec 12, 2025
c8275d0

Merge branch 'main' into rob/port-7445-and-7431


wobsoriano Dec 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-forks-agree.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
integration/templates/tanstack-react-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@
 "@tanstack/react-start": "1.132.51",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "srvx": "0.8.15",
 "tailwind-merge": "^2.5.4"
 },
 "devDependencies": {
Expand Down

35 changes: 35 additions & 0 deletions
packages/backend/src/tokens/__tests__/clerkRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,4 +204,39 @@ describe('createClerkRequest', () => {
 expect(json.cookies).toBe('{}');
 });
 });

 describe('duck typing detection (instanceof workaround)', () => {
 it('should create a new ClerkRequest from a regular Request', () => {
 const regularRequest = new Request('http://localhost:3000');
 const clerkRequest = createClerkRequest(regularRequest);

 expect(clerkRequest).not.toBe(regularRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });

 it('should return an existing ClerkRequest instance unchanged', () => {
 const firstClerkRequest = createClerkRequest(new Request('http://localhost:3000'));
 const secondClerkRequest = createClerkRequest(firstClerkRequest);

 expect(secondClerkRequest).toBe(firstClerkRequest);
 });

 it('should work correctly with bundler-scoped Request classes', () => {
 // Simulate bundler creating a scoped Request class (like Request$1)
 class RequestScoped extends Request {
 constructor(input: RequestInfo | URL, init?: RequestInit) {
 super(input, init);
 }
 }

 const scopedRequest = new RequestScoped('http://localhost:3000');
 const clerkRequest = createClerkRequest(scopedRequest);

 // Should create a new ClerkRequest even though scopedRequest is a different Request class
 expect(clerkRequest).not.toBe(scopedRequest);
 expect(clerkRequest.clerkUrl).toBeDefined();
 expect(clerkRequest.cookies).toBeDefined();
 });
 });
});

7 changes: 6 additions & 1 deletion
packages/backend/src/tokens/clerkRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,12 @@ class ClerkRequest extends Request {
}

export const createClerkRequest = (...args: ConstructorParameters<typeof ClerkRequest>): ClerkRequest => {
 return args[0] instanceof ClerkRequest ? args[0] : new ClerkRequest(...args);
 // Use duck typing instead of instanceof to avoid issues with polyfilled Request classes
 // (e.g., in TanStack Start or other environments with multiple Request class instances)
 // ClerkRequest has unique properties 'clerkUrl' and 'cookies' that distinguish it from Request
 const isClerkRequest = args[0] && typeof args[0] === 'object' && 'clerkUrl' in args[0] && 'cookies' in args[0];

 return isClerkRequest ? (args[0] as ClerkRequest) : new ClerkRequest(...args);
};

export type { ClerkRequest };

18 changes: 9 additions & 9 deletions
packages/nextjs/src/__tests__/keyless-custom-headers.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ describe('keyless-custom-headers', () => {
 });

 describe('formatMetadataHeaders', () => {
 it('should format complete metadata object with all fields present', () => {
 it('should format complete metadata object with all fields present', async () => {
 const metadata = {
 nodeVersion: 'v18.17.0',
 nextVersion: 'next-server (v15.4.5)',
Expand All@@ -181,7 +181,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test exact header casing and values
 expect(result.get('Clerk-Node-Version')).toBe('v18.17.0');
Expand All@@ -196,7 +196,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('signed-out');
 });

 it('should handle missing optional fields gracefully', () => {
 it('should handle missing optional fields gracefully', async () => {
 const metadata = {
 userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
 host: 'localhost:3000',
Expand All@@ -208,7 +208,7 @@ describe('keyless-custom-headers', () => {
 // Missing: nodeVersion, nextVersion, npmConfigUserAgent, port
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that only present fields are set
 expect(result.get('Clerk-Client-User-Agent')).toBe('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)');
Expand All@@ -225,7 +225,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Node-Port')).toBeNull();
 });

 it('should handle undefined values for optional fields', () => {
 it('should handle undefined values for optional fields', async () => {
 const metadata = {
 nodeVersion: undefined,
 nextVersion: undefined,
Expand All@@ -240,7 +240,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Test that undefined fields are not set
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand All@@ -257,7 +257,7 @@ describe('keyless-custom-headers', () => {
 expect(result.get('Clerk-Auth-Status')).toBe('test-auth-status');
 });

 it('should handle empty string values', () => {
 it('should handle empty string values', async () => {
 const metadata = {
 nodeVersion: '',
 nextVersion: '',
Expand All@@ -272,7 +272,7 @@ describe('keyless-custom-headers', () => {
 isCI: false,
 };

 const result = formatMetadataHeaders(metadata);
 const result = await formatMetadataHeaders(metadata);

 // Empty strings should not be set as headers
 expect(result.get('Clerk-Node-Version')).toBeNull();
Expand DownExpand Up@@ -513,7 +513,7 @@ describe('keyless-custom-headers', () => {

 // Collect metadata and format headers
 const metadata = await collectKeylessMetadata();
 const headers = formatMetadataHeaders(metadata);
 const headers = await formatMetadataHeaders(metadata);

 // Verify the full pipeline works correctly
 expect(headers.get('Clerk-Client-User-Agent')).toBe('Integration-Test-Agent');
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/server/keyless-custom-headers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ function getNextVersion(): string | undefined {
/**
 * Converts metadata to HTTP headers
 */
export function formatMetadataHeaders(metadata: MetadataHeaders): Headers {
export async function formatMetadataHeaders(metadata: MetadataHeaders): Promise<Headers> {
 const headers = new Headers();

 if (metadata.nodeVersion) {
Expand Down