Skip to content

fix(clerk-js): Handle single part hostnames in getCookieDomain() #3357

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
LekoArts merged 2 commits into from
May 10, 2024
Merged

fix(clerk-js): Handle single part hostnames in getCookieDomain() #3357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
914eb76
fix(clerk-js): Handle single part hostnames in getCookieDomain()
brkalow May 9, 2024
fe3c0da
Merge branch 'main' into brk.fix/get-cookie-domain-single-host-name-part
LekoArts May 10, 2024
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/eighty-pens-chew.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Fix a bug where client_uat domain detection would not handle hostnames with a single part. This impacts locally defined custom hostnames used as aliases.
4 changes: 4 additions & 0 deletions packages/clerk-js/src/utils/cookies/__tests__/getCookieDomain.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ describe('getCookieDomain', () => {
}
});

it('handles custom hosts defined locally', () => {
expect(getCookieDomain('bryce-local')).toBe('bryce-local');
});

it('returns undefined if the domain could not be determined', () => {
const handler: CookieHandler = {
get: jest.fn().mockReturnValue(undefined),
Expand Down
5 changes: 5 additions & 0 deletions packages/clerk-js/src/utils/cookies/getCookieDomain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ export function getCookieDomain(hostname = window.location.hostname, cookieHandl

const hostnameParts = hostname.split('.');

// Account for custom hosts defined locally, e.g. 127.0.0.1 -> local-app
if (hostnameParts.length === 1) {
return hostname;
}

// we know for sure that the first entry is definitely a TLD, skip it
for (let i = hostnameParts.length - 2; i >= 0; i--) {
const eTLD = hostnameParts.slice(i).join('.');
Expand Down