Skip to content

[pull] main from calcom:main #1171

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
pull merged 2 commits into from
Mar 11, 2026
Merged

[pull] main from calcom:main #1171

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
a8e27c3
fix: allow hyphens, dots, and underscores in Dialpad meeting URL vali…
mmit-russ Mar 11, 2026
2509116
Fix Keycloak OIDC flow (#27716)
richardhj Mar 11, 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
12 changes: 5 additions & 7 deletions apps/web/app/api/auth/oidc/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@ import logger from "@calcom/lib/logger";
// This is the callback endpoint for the OIDC provider
// A team must set this endpoint in the OIDC provider's configuration
async function handler(req: NextRequest) {
const log = logger.getSubLogger({ prefix: ["[ODIC auth]"] });
const log = logger.getSubLogger({ prefix: ["[OIDC auth]"] });
const { searchParams } = req.nextUrl;
const code = searchParams.get("code");
const state = searchParams.get("state");
const tenant = searchParams.get("tenant");
const params = Object.fromEntries(searchParams.entries());

if (!code || !state) {
if (!params.code || !params.state) {
return NextResponse.json({ message: "Code and state are required" }, { status: 400 });
}

const { oauthController } = await jackson();

try {
const { redirect_url } = await oauthController.oidcAuthzResponse({ code, state });
const { redirect_url } = await oauthController.oidcAuthzResponse(params);

if (!redirect_url) {
throw new HttpError({
Expand All @@ -33,7 +31,7 @@ async function handler(req: NextRequest) {

return NextResponse.redirect(redirect_url, 302);
} catch (err) {
log.error(`Error authorizing tenant ${tenant}: ${err}`);
log.error(`Error authorizing tenant ${params.tenant}: ${err}`);
const { message, statusCode = 500 } = err as HttpError;

return NextResponse.json({ message }, { status: statusCode });
Expand Down
2 changes: 1 addition & 1 deletion packages/app-store/dialpad/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"label": "{TITLE}",
"linkType": "static",
"organizerInputPlaceholder": "https://meetings.dialpad.com/adb2002",
"urlRegExp": "^https:\\/\\/meetings\\.dialpad\\.com\\/[a-zA-Z0-9]+$"
"urlRegExp": "^https:\\/\\/meetings\\.dialpad\\.com\\/[a-zA-Z0-9._-]+$"
}
},
"description": "A new way to meet, with built-in Ai",
Expand Down
Loading