-
Notifications
You must be signed in to change notification settings - Fork 11.7k
fix: return 400 instead of 500 for invalid email in iCal generation #27217
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.
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
+97
−2
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
64446ce
fix: return 400 instead of 500 for invalid email in iCal generation
devin-ai-integration[bot] cd788bb
test: add unit tests for error handling in generateIcsString
devin-ai-integration[bot] 56b2655
Merge branch 'main' into devin/1769326283-fix-ics-validation-error-code
emrysal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,8 @@ import { RRule } from "rrule"; | |
| import { getRichDescription } from "@calcom/lib/CalEventParser"; | ||
| import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; | ||
| import { ORGANIZER_EMAIL_EXEMPT_DOMAINS } from "@calcom/lib/constants"; | ||
| import { ErrorCode } from "@calcom/lib/errorCodes"; | ||
| import { ErrorWithCode } from "@calcom/lib/errors"; | ||
| import type { CalendarEvent, Person } from "@calcom/types/Calendar"; | ||
|
|
||
| export enum BookingAction { | ||
|
|
@@ -55,7 +57,7 @@ const generateIcsString = ({ | |
| status: EventStatus; | ||
| partstat?: ParticipationStatus; | ||
| t?: TFunction; | ||
| }) => { | ||
| }): string | undefined => { | ||
| const location = getVideoCallUrlFromCalEvent(event) || event.location; | ||
|
|
||
| // Taking care of recurrence rule | ||
|
|
@@ -111,6 +113,11 @@ const generateIcsString = ({ | |
| busyStatus: "BUSY", | ||
| }); | ||
| if (icsEvent.error) { | ||
| // The ics library throws Yup ValidationError objects (not Error instances) for invalid data like invalid email formats. | ||
| // Convert these to ErrorWithCode.BadRequest so they return 400 instead of falling through to a generic 500. | ||
| if (icsEvent.error.name === "ValidationError") { | ||
| throw new ErrorWithCode(ErrorCode.BadRequest, icsEvent.error.message); | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this propagates all the way to |
||
| } | ||
| throw icsEvent.error; | ||
| } | ||
| return icsEvent.value; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I confirmed that
icslibrary throws a validation error in this format