Skip to content

fix(shared): Use safe env access in Netlify cache handler #6260

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
merged 7 commits into from
Jul 8, 2025
Merged

fix(shared): Use safe env access in Netlify cache handler #6260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
adf2972
Update netlifyCacheHandler.ts
tavoyne Jul 6, 2025
4a7d635
Update netlifyCacheHandler.ts
tavoyne Jul 6, 2025
b975740
Update netlifyCacheHandler.ts
tavoyne Jul 8, 2025
ab0f77c
chore: add changeset
wobsoriano Jul 8, 2025
da6f3c1
Merge branch 'main' into patch-1
wobsoriano Jul 8, 2025
3a5be05
chore: make sure URL is string
wobsoriano Jul 8, 2025
5a3e08d
chore: format
wobsoriano Jul 8, 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
5 changes: 5 additions & 0 deletions .changeset/itchy-ways-tell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clerk/shared": patch
---

Use shared safe environment variable access in Netlify cache handler
9 changes: 6 additions & 3 deletions packages/shared/src/netlifyCacheHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { getEnvVariable } from './getEnvVariable';
import { isDevelopmentFromPublishableKey } from './keys';

/**
Expand All @@ -19,7 +19,7 @@ export const CLERK_NETLIFY_CACHE_BUST_PARAM = '__clerk_netlify_cache_bust';
* The issue happens only on Clerk development instances running on Netlify. This is
* a workaround until we find a better solution.
*
* See https://answers.netlify.com/t/cache-handling-recommendation-for-authentication-handshake-redirects/143969/1
* See https://answers.netlify.com/t/cache-handling-recommendation-for-authentication-handshake-redirects/143969/1.
*
* @internal
*/
Expand All @@ -33,7 +33,10 @@ export function handleNetlifyCacheInDevInstance({
publishableKey: string;
}) {
const isOnNetlify =
process.env.NETLIFY || process.env.URL?.endsWith('netlify.app') || Boolean(process.env.NETLIFY_FUNCTIONS_TOKEN);
getEnvVariable('NETLIFY') ||
(typeof getEnvVariable('URL') === 'string' && getEnvVariable('URL').endsWith('netlify.app')) ||
Boolean(getEnvVariable('NETLIFY_FUNCTIONS_TOKEN'));

const isDevelopmentInstance = isDevelopmentFromPublishableKey(publishableKey);
if (isOnNetlify && isDevelopmentInstance) {
const hasHandshakeQueryParam = locationHeader.includes('__clerk_handshake');
Expand Down
Loading