Skip to content

Scheduling infrastructure for absolutely everyone.

Fix isEventTypeLoggingEnabled bug where empty string matches eventTypeId 0 (#24804)

Alex van Andel2efcfab715a9
diff --git a/packages/features/bookings/lib/isEventTypeLoggingEnabled.ts b/packages/features/bookings/lib/isEventTypeLoggingEnabled.ts
index 5f79a0bdb2c..80b8f1a97d5 100644
--- a/packages/features/bookings/lib/isEventTypeLoggingEnabled.ts
+++ b/packages/features/bookings/lib/isEventTypeLoggingEnabled.ts
@@ -9,11 +9,12 @@ export function isEventTypeLoggingEnabled({
usernameOrTeamName instanceof Array ? usernameOrTeamName : [usernameOrTeamName];
// eslint-disable-next-line turbo/no-undeclared-env-vars
const bookingLoggingEventIds = process.env.BOOKING_LOGGING_EVENT_IDS || "";
- const isEnabled = bookingLoggingEventIds.split(",").some((id) => {
- if (Number(id.trim()) === eventTypeId) {
- return true;
- }
- });
+ const validEventIds = bookingLoggingEventIds
+ .split(",")
+ .map((id) => Number(id.trim()))
+ .filter((id) => !isNaN(id) && id > 0);
+
+ const isEnabled = eventTypeId && validEventIds.includes(eventTypeId);
if (isEnabled) {
return true;
@@ -21,7 +22,12 @@ export function isEventTypeLoggingEnabled({
// eslint-disable-next-line turbo/no-undeclared-env-vars
const bookingLoggingUsername = process.env.BOOKING_LOGGING_USER_OR_TEAM_NAME || "";
- return bookingLoggingUsername.split(",").some((u) => {
- return usernameOrTeamnamesList.some((foundUsername) => foundUsername === u.trim());
+ const validUsernames = bookingLoggingUsername
+ .split(",")
+ .map((u) => u.trim())
+ .filter((u) => u.length > 0);
+
+ return validUsernames.some((username) => {
+ return usernameOrTeamnamesList.some((foundUsername) => foundUsername === username);
});
}