Skip to content

fix(repo): Handle framework query param in keyless claim URLs integration tests #7808

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 11 commits into from
Feb 10, 2026
+40 −22
Merged

fix(repo): Handle framework query param in keyless claim URLs integration tests #7808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e86b0ef
chore(repo): Fix keyless E2E tests
wobsoriano Feb 9, 2026
6608a4b
chore: placeholder changeset
wobsoriano Feb 9, 2026
ba223aa
chore: additional checks
wobsoriano Feb 9, 2026
f8b6e2b
remove logs
wobsoriano Feb 9, 2026
4aecffb
revert
wobsoriano Feb 9, 2026
e40201a
revert
wobsoriano Feb 9, 2026
0581857
Test without query params
wobsoriano Feb 10, 2026
211d882
add back query params
wobsoriano Feb 10, 2026
37a7105
remove framework check
wobsoriano Feb 10, 2026
2ec1f65
fix query param location check
wobsoriano Feb 10, 2026
31fc985
clean up tests
wobsoriano Feb 10, 2026
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/wild-clocks-stare.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
30 changes: 19 additions & 11 deletions integration/tests/next-quickstart-keyless.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,28 @@ test.describe('Keyless mode @quickstart', () => {
await newPage.waitForLoadState();

await newPage.waitForURL(url => {
const urlToReturnTo = `${dashboardUrl}apps/claim?token=`;

const signInForceRedirectUrl = url.searchParams.get('sign_in_force_redirect_url');
const signUpForceRedirectUrl = url.searchParams.get('sign_up_force_redirect_url');

const signUpForceRedirectUrlCheck =
signUpForceRedirectUrl?.startsWith(urlToReturnTo) ||
(signUpForceRedirectUrl?.startsWith(`${dashboardUrl}prepare-account`) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('apps/claim?token=')));
const signInHasRequiredParams =
signInForceRedirectUrl?.includes(`${dashboardUrl}apps/claim`) &&
signInForceRedirectUrl?.includes('token=') &&
signInForceRedirectUrl?.includes('framework=nextjs');

const signUpRegularCase =
signUpForceRedirectUrl?.includes(`${dashboardUrl}apps/claim`) &&
signUpForceRedirectUrl?.includes('token=') &&
signUpForceRedirectUrl?.includes('framework=nextjs');

const signUpPrepareAccountCase =
signUpForceRedirectUrl?.startsWith(`${dashboardUrl}prepare-account`) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('apps/claim')) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('token=')) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('framework=nextjs'));

const signUpHasRequiredParams = signUpRegularCase || signUpPrepareAccountCase;

return (
url.pathname === '/apps/claim/sign-in' &&
url.searchParams.get('sign_in_force_redirect_url')?.startsWith(urlToReturnTo) &&
signUpForceRedirectUrlCheck
);
return url.pathname === '/apps/claim/sign-in' && signInHasRequiredParams && signUpHasRequiredParams;
});
});

Expand Down
30 changes: 19 additions & 11 deletions integration/tests/tanstack-start/keyless.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,28 @@ test.describe('Keyless mode @tanstack-react-start', () => {
await newPage.waitForLoadState();

await newPage.waitForURL(url => {
const urlToReturnTo = `${dashboardUrl}apps/claim?token=`;

const signInForceRedirectUrl = url.searchParams.get('sign_in_force_redirect_url');
const signUpForceRedirectUrl = url.searchParams.get('sign_up_force_redirect_url');

const signUpForceRedirectUrlCheck =
signUpForceRedirectUrl?.startsWith(urlToReturnTo) ||
(signUpForceRedirectUrl?.startsWith(`${dashboardUrl}prepare-account`) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('apps/claim?token=')));
const signInHasRequiredParams =
signInForceRedirectUrl?.includes(`${dashboardUrl}apps/claim`) &&
signInForceRedirectUrl?.includes('token=') &&
signInForceRedirectUrl?.includes('framework=tanstack-react-start');

const signUpRegularCase =
signUpForceRedirectUrl?.includes(`${dashboardUrl}apps/claim`) &&
signUpForceRedirectUrl?.includes('token=') &&
signUpForceRedirectUrl?.includes('framework=tanstack-react-start');

const signUpPrepareAccountCase =
signUpForceRedirectUrl?.startsWith(`${dashboardUrl}prepare-account`) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('apps/claim')) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('token=')) &&
signUpForceRedirectUrl?.includes(encodeURIComponent('framework=tanstack-react-start'));

const signUpHasRequiredParams = signUpRegularCase || signUpPrepareAccountCase;

return (
url.pathname === '/apps/claim/sign-in' &&
url.searchParams.get('sign_in_force_redirect_url')?.startsWith(urlToReturnTo) &&
signUpForceRedirectUrlCheck
);
return url.pathname === '/apps/claim/sign-in' && signInHasRequiredParams && signUpHasRequiredParams;
});
});

Expand Down
Loading