Skip to content

fix: preserve array query params in redirect URL serialization #28688

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

Draft
Akash504-ai wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

fix: preserve array query params in redirect URL serialization #28688

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d834972
fix: preserve array query params in redirect URL serialization
Akash504-ai Mar 31, 2026
069a5a8
Merge branch 'main' of https://github.com/Akash504-ai/cal.com into fi…
Akash504-ai Mar 31, 2026
6bc9cd6
chore: trigger CI
Akash504-ai Mar 31, 2026
7bc231c
chore: remove unused encode import
Akash504-ai Apr 1, 2026
b59ebfb
Merge branch 'main' into fix/query-params-serialization
Akash504-ai Apr 2, 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
25 changes: 22 additions & 3 deletions apps/web/server/lib/[user]/getServerSideProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { EmbedProps } from "app/WithEmbedSSR";
import type { GetServerSideProps } from "next";
import { encode } from "node:querystring";
import type { z } from "zod";

import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
Expand Down Expand Up @@ -109,7 +108,17 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont

// EXAMPLE - context.params: { orgSlug: 'acme', user: 'member0+owner1' }
// EXAMPLE - context.query: { redirect: 'undefined', orgRedirection: 'undefined', user: 'member0+owner1' }
const originalQueryString = new URLSearchParams(context.query as Record<string, string>).toString();
const params = new URLSearchParams();

Object.entries(context.query).forEach(([key, value]) => {
if (Array.isArray(value)) {
value.forEach((v) => params.append(key, v));
} else if (value !== undefined) {
params.append(key, value);
}
});

const originalQueryString = params.toString();
const destinationWithQuery = `${destinationUrl}?${originalQueryString}`;
log.debug(`Dynamic group detected, redirecting to ${destinationUrl}`);
return {
Expand Down Expand Up @@ -161,8 +170,18 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont
if (eventTypes.length === 1 && context.query.redirect !== "false") {
// Redirect but don't change the URL
const urlDestination = `/${user.profile.username}/${eventTypes[0].slug}`;
const params = new URLSearchParams();
const { query } = context;
const urlQuery = new URLSearchParams(encode(query));

Object.entries(query).forEach(([key, value]) => {
if (Array.isArray(value)) {
value.forEach((v) => params.append(key, v));
} else if (value !== undefined) {
params.append(key, value as string);
}
});

const urlQuery = params.toString();

return {
redirect: {
Expand Down
Loading