') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); fix(express): forward clockSkewInMs in clerkMiddleware by jeremy-clerk · Pull Request #8287 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/red-pans-sing.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/express": patch
---

Forward `clockSkewInMs` from `clerkMiddleware()` to backend `authenticateRequest()`.
31 changes: 31 additions & 0 deletions packages/express/src/__tests__/clerkMiddleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ vi.mock('@clerk/backend/proxy', async () => {
};
});

import { authenticateRequest } from '../authenticateRequest';
import { clerkMiddleware } from '../clerkMiddleware';
import { getAuth } from '../getAuth';
import { assertNoDebugHeaders, assertSignedOutDebugHeaders, runMiddleware, runMiddlewareOnPath } from './helpers';
Expand DownExpand Up@@ -94,6 +95,36 @@ describe('clerkMiddleware', () => {
assertSignedOutDebugHeaders(response);
});

it('forwards clockSkewInMs to authenticateRequest', async () => {
const authenticateRequestMock = vi.fn().mockResolvedValue({});
const clerkClient = {
authenticateRequest: authenticateRequestMock,
} as any;

await authenticateRequest({
clerkClient,
request: {
method: 'GET',
url: '/',
headers: {
host: 'example.com',
},
} as Request,
options: {
publishableKey: 'pk_test_Y2xlcmsuZXhhbXBsZS5jb20k',
secretKey: 'sk_test_....',
clockSkewInMs: 12_345,
},
});

expect(authenticateRequestMock).toHaveBeenCalledWith(
expect.any(Object),
expect.objectContaining({
Comment thread
coderabbitai[bot] marked this conversation as resolved.
clockSkewInMs: 12_345,
}),
);
});

it('throws error if clerkMiddleware is not executed before getAuth', async () => {
const customMiddleware: RequestHandler = (request, response, next) => {
const auth = getAuth(request);
Expand Down
3 changes: 2 additions & 1 deletion packages/express/src/authenticateRequest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
*/
export const authenticateRequest = (opts: AuthenticateRequestParams) => {
const { clerkClient, request, options } = opts;
const { jwtKey, authorizedParties, audience, acceptsToken } = options || {};
const { jwtKey, authorizedParties, audience, acceptsToken, clockSkewInMs } = options || {};

const clerkRequest = createClerkRequest(incomingMessageToRequest(request));
const env = { ...loadApiEnv(), ...loadClientEnv() };
Expand DownExpand Up@@ -55,6 +55,7 @@
machineSecretKey,
publishableKey,
jwtKey,
clockSkewInMs,
authorizedParties,
proxyUrl,
isSatellite,
Expand DownExpand Up@@ -143,7 +144,7 @@
if (proxyResponse.body) {
const reader = proxyResponse.body.getReader();
const stream = new Readable({
async read() {

Check warning on line 147 in packages/express/src/authenticateRequest.ts

View workflow job for this annotation

GitHub Actions/ Static analysis

Promise-returning function provided to property where a void return was expected
try {
const { done, value } = await reader.read();
if (done) {
Expand Down
Loading