wrap samlResponse in try/catch (#22984)

This commit is contained in:
Joe Au-Yeung
2025-08-08 16:06:18 +00:00
committed by GitHub
parent 02c86d0268
commit 4baa9b6bc1
+15 -11
View File
@@ -9,23 +9,27 @@ import type { SAMLResponsePayload } from "@calcom/features/ee/sso/lib/jackson";
import logger from "@calcom/lib/logger";
async function handler(req: NextRequest) {
const log = logger.getSubLogger({ prefix: ["[SAML callback]"] });
const uid = uuid();
const log = logger.getSubLogger({ prefix: ["[SAML callback]", `trace: ${uid}`] });
const { oauthController } = await jackson();
const requestData = (await parseRequestData(req)) as SAMLResponsePayload;
const { redirect_url, error } = await oauthController.samlResponse(requestData);
try {
const { redirect_url, error } = await oauthController.samlResponse(requestData);
if (redirect_url) {
return NextResponse.redirect(redirect_url, 302);
}
if (redirect_url) {
return NextResponse.redirect(redirect_url, 302);
}
if (error) {
const uid = uuid();
log.error(
`Error authenticating user with error ${error} for relayState ${requestData?.RelayState} trace:${uid}`
);
return NextResponse.json({ message: `Error authorizing user. trace: ${uid}` }, { status: 400 });
if (error) {
const uid = uuid();
log.error(`Error authenticating user with error ${error} for relayState ${requestData?.RelayState}`);
return NextResponse.json({ message: `Error authorizing user. trace: ${uid}` }, { status: 400 });
}
} catch (error) {
log.error(`Error processing SAML response`, error);
return NextResponse.json({ message: `Error processing SAML response. trace: ${uid}` }, { status: 500 });
}
return NextResponse.json({ message: "No redirect URL provided" }, { status: 400 });