+
+ {t("need_to_make_a_change")}
+ {/* Login button but redirect to here */}
+
+
+
+ {t("login")}
+
+
+
+
+
+ )}
+ {!requiresLoginToUpdate &&
+ (!needsConfirmation || !userIsOwner) &&
!isCancelled &&
(!isCancellationMode ? (
<>
@@ -540,28 +561,30 @@ export default function Success(props: SuccessProps) {
{t("need_to_make_a_change")}
- {!props.recurringBookings && (
-
-
-
- {t("reschedule")}
-
+ <>
+ {!props.recurringBookings && (
+
+
+
+ {t("reschedule")}
+
+
+ {t("or_lowercase")}
- {t("or_lowercase")}
-
- )}
-
-
+
+
+
) : (
@@ -1010,7 +1033,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
const session = await getServerSession(context);
let tz: string | null = null;
let userTimeFormat: number | null = null;
-
+ let requiresLoginToUpdate = false;
if (session) {
const user = await ssr.viewer.me.fetch();
tz = user.timeZone;
@@ -1022,9 +1045,10 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
if (!parsedQuery.success) return { notFound: true };
const { uid, eventTypeSlug, seatReferenceUid } = parsedQuery.data;
+ const { uid: maybeUid } = await maybeGetBookingUidFromSeat(prisma, uid);
const bookingInfoRaw = await prisma.booking.findFirst({
where: {
- uid: await maybeGetBookingUidFromSeat(prisma, uid),
+ uid: maybeUid,
},
select: {
title: true,
@@ -1088,6 +1112,10 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
};
}
+ if (eventTypeRaw.seatsPerTimeSlot && !seatReferenceUid && !session) {
+ requiresLoginToUpdate = true;
+ }
+
const bookingInfo = getBookingWithResponses(bookingInfoRaw);
// @NOTE: had to do this because Server side cant return [Object objects]
// probably fixable with json.stringify -> json.parse
@@ -1156,6 +1184,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
paymentStatus: payment,
...(tz && { tz }),
userTimeFormat,
+ requiresLoginToUpdate,
},
};
}
diff --git a/apps/web/pages/d/[link]/[slug].tsx b/apps/web/pages/d/[link]/[slug].tsx
index f70f0b6a34..0b715ca5b9 100644
--- a/apps/web/pages/d/[link]/[slug].tsx
+++ b/apps/web/pages/d/[link]/[slug].tsx
@@ -2,6 +2,7 @@ import type { GetServerSidePropsContext } from "next";
import { z } from "zod";
import { Booker } from "@calcom/atoms";
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
import { getBookingForReschedule, getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking";
@@ -27,6 +28,7 @@ export default function Type({
isTeamEvent,
entity,
duration,
+ hashedLink,
}: PageProps) {
return (
- 
+ {!otherTeam.parentId && (
+
+ )}
diff --git a/packages/lib/server/maybeGetBookingUidFromSeat.ts b/packages/lib/server/maybeGetBookingUidFromSeat.ts
index c211da5f4c..a6a4b8587c 100644
--- a/packages/lib/server/maybeGetBookingUidFromSeat.ts
+++ b/packages/lib/server/maybeGetBookingUidFromSeat.ts
@@ -15,6 +15,6 @@ export async function maybeGetBookingUidFromSeat(prisma: PrismaClient, uid: stri
},
},
});
- if (bookingSeat) return bookingSeat.booking.uid;
- return uid;
+ if (bookingSeat) return { uid: bookingSeat.booking.uid, seatReferenceUid: uid };
+ return { uid };
}
diff --git a/packages/ui/components/data-table/DataTableToolbar.tsx b/packages/ui/components/data-table/DataTableToolbar.tsx
index 9e8250b3ba..df3370bed8 100644
--- a/packages/ui/components/data-table/DataTableToolbar.tsx
+++ b/packages/ui/components/data-table/DataTableToolbar.tsx
@@ -36,10 +36,10 @@ export function DataTableToolbar
{ch.name}
@@ -185,9 +181,11 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio, isValidOrgDomain }
{
+ const session = await getServerSession(context);
const { slug: teamSlug, type: meetingSlug } = paramsSchema.parse(context.params);
const { rescheduleUid, duration: queryDuration } = context.query;
const { ssrInit } = await import("@server/lib/ssr");
@@ -92,7 +95,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
let booking: GetBookingType | null = null;
if (rescheduleUid) {
- booking = await getBookingForReschedule(`${rescheduleUid}`);
+ booking = await getBookingForReschedule(`${rescheduleUid}`, session?.user?.id);
}
const org = isValidOrgDomain ? currentOrgDomain : null;
diff --git a/apps/web/pages/video/[uid].tsx b/apps/web/pages/video/[uid].tsx
index f14fed2213..57ca82780c 100644
--- a/apps/web/pages/video/[uid].tsx
+++ b/apps/web/pages/video/[uid].tsx
@@ -46,7 +46,7 @@ export default function JoinCall(props: JoinCallPageProps) {
baseText: "#FFF",
border: "#292929",
mainAreaBg: "#111111",
- mainAreaBgAccent: "#111111",
+ mainAreaBgAccent: "#1A1A1A",
mainAreaText: "#FFF",
supportiveText: "#FFF",
},
diff --git a/apps/web/playwright/booking-seats.e2e.ts b/apps/web/playwright/booking-seats.e2e.ts
index c46e84d4d2..c291f2d111 100644
--- a/apps/web/playwright/booking-seats.e2e.ts
+++ b/apps/web/playwright/booking-seats.e2e.ts
@@ -2,6 +2,7 @@ import { expect } from "@playwright/test";
import { uuid } from "short-uuid";
import { v4 as uuidv4 } from "uuid";
+import { randomString } from "@calcom/lib/random";
import prisma from "@calcom/prisma";
import { BookingStatus } from "@calcom/prisma/enums";
@@ -96,7 +97,7 @@ test.describe("Booking with Seats", () => {
});
test(`Attendees can cancel a seated event time slot`, async ({ page, users, bookings }) => {
- const { booking } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
+ const { booking, user } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
{ name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
{ name: "Jane Second", email: "second+seats@cal.com", timeZone: "Europe/Berlin" },
{ name: "John Third", email: "third+seats@cal.com", timeZone: "Europe/Berlin" },
@@ -143,6 +144,19 @@ test.describe("Booking with Seats", () => {
expect(attendeeIds).not.toContain(bookingAttendees[0].id);
});
+ await test.step("Attendee #2 shouldn't be able to cancel booking using only booking/uid", async () => {
+ await page.goto(`/booking/${booking.uid}`);
+
+ await expect(page.locator("[text=Cancel]")).toHaveCount(0);
+ });
+
+ await test.step("Attendee #2 shouldn't be able to cancel booking using randomString for seatReferenceUId", async () => {
+ await page.goto(`/booking/${booking.uid}?seatReferenceUid=${randomString(10)}`);
+
+ // expect cancel button to don't be in the page
+ await expect(page.locator("[text=Cancel]")).toHaveCount(0);
+ });
+
await test.step("All attendees cancelling should delete the booking for the user", async () => {
// The remaining 2 attendees cancel
for (let i = 1; i < bookingSeats.length; i++) {
@@ -166,6 +180,47 @@ test.describe("Booking with Seats", () => {
expect(updatedBooking?.status).toBe(BookingStatus.CANCELLED);
});
});
+
+ test("Owner shouldn't be able to cancel booking without login in", async ({ page, bookings, users }) => {
+ const { booking, user } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
+ { name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
+ { name: "Jane Second", email: "second+seats@cal.com", timeZone: "Europe/Berlin" },
+ { name: "John Third", email: "third+seats@cal.com", timeZone: "Europe/Berlin" },
+ ]);
+ await page.goto(`/booking/${booking.uid}?cancel=true`);
+ await expect(page.locator("[text=Cancel]")).toHaveCount(0);
+
+ // expect login text to be in the page, not data-testid
+ await expect(page.locator("text=Login")).toHaveCount(1);
+
+ // click on login button text
+ await page.locator("text=Login").click();
+
+ // expect to be redirected to login page with query parameter callbackUrl
+ await expect(page).toHaveURL(/\/auth\/login\?callbackUrl=.*/);
+
+ await user.apiLogin();
+
+ // manual redirect to booking page
+ await page.goto(`/booking/${booking.uid}?cancel=true`);
+
+ // expect login button to don't be in the page
+ await expect(page.locator("text=Login")).toHaveCount(0);
+
+ // fill reason for cancellation
+ await page.fill('[data-testid="cancel_reason"]', "Double booked!");
+
+ // confirm cancellation
+ await page.locator('[data-testid="confirm_cancel"]').click();
+ await page.waitForLoadState("networkidle");
+
+ const updatedBooking = await prisma.booking.findFirst({
+ where: { id: booking.id },
+ });
+
+ expect(updatedBooking).not.toBeNull();
+ expect(updatedBooking?.status).toBe(BookingStatus.CANCELLED);
+ });
});
test.describe("Reschedule for booking with seats", () => {
@@ -543,4 +598,113 @@ test.describe("Reschedule for booking with seats", () => {
.first();
await expect(foundFirstAttendeeAgain).toHaveCount(1);
});
+
+ test("Owner shouldn't be able to reschedule booking without login in", async ({
+ page,
+ bookings,
+ users,
+ }) => {
+ const { booking, user } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
+ { name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
+ { name: "Jane Second", email: "second+seats@cal.com", timeZone: "Europe/Berlin" },
+ { name: "John Third", email: "third+seats@cal.com", timeZone: "Europe/Berlin" },
+ ]);
+ const getBooking = await booking.self();
+
+ await page.goto(`/booking/${booking.uid}`);
+ await expect(page.locator('[data-testid="reschedule"]')).toHaveCount(0);
+
+ // expect login text to be in the page, not data-testid
+ await expect(page.locator("text=Login")).toHaveCount(1);
+
+ // click on login button text
+ await page.locator("text=Login").click();
+
+ // expect to be redirected to login page with query parameter callbackUrl
+ await expect(page).toHaveURL(/\/auth\/login\?callbackUrl=.*/);
+
+ await user.apiLogin();
+
+ // manual redirect to booking page
+ await page.goto(`/booking/${booking.uid}`);
+
+ // expect login button to don't be in the page
+ await expect(page.locator("text=Login")).toHaveCount(0);
+
+ // reschedule-link click
+ await page.locator('[data-testid="reschedule-link"]').click();
+
+ await selectFirstAvailableTimeSlotNextMonth(page);
+
+ // data displayed in form should be user owner
+ const nameElement = await page.locator("input[name=name]");
+ const name = await nameElement.inputValue();
+ expect(name).toBe(user.username);
+
+ //same for email
+ const emailElement = await page.locator("input[name=email]");
+ const email = await emailElement.inputValue();
+ expect(email).toBe(user.email);
+
+ // reason to reschedule input should be visible textfield with name rescheduleReason
+ const reasonElement = await page.locator("textarea[name=rescheduleReason]");
+ await expect(reasonElement).toBeVisible();
+
+ // expect to be redirected to reschedule page
+ await page.locator('[data-testid="confirm-reschedule-button"]').click();
+
+ // should wait for URL but that path starts with booking/
+ await page.waitForURL(/\/booking\/.*/);
+
+ await expect(page).toHaveURL(/\/booking\/.*/);
+
+ await page.waitForLoadState("networkidle");
+
+ const updatedBooking = await prisma.booking.findFirst({
+ where: { id: booking.id },
+ });
+
+ expect(updatedBooking).not.toBeNull();
+ expect(getBooking?.startTime).not.toBe(updatedBooking?.startTime);
+ expect(getBooking?.endTime).not.toBe(updatedBooking?.endTime);
+ expect(updatedBooking?.status).toBe(BookingStatus.ACCEPTED);
+ });
+
+ test("Owner shouldn't be able to reschedule when going directly to booking/rescheduleUid", async ({
+ page,
+ bookings,
+ users,
+ }) => {
+ const { booking, user } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
+ { name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
+ { name: "Jane Second", email: "second+seats@cal.com", timeZone: "Europe/Berlin" },
+ { name: "John Third", email: "third+seats@cal.com", timeZone: "Europe/Berlin" },
+ ]);
+ const getBooking = await booking.self();
+
+ await page.goto(`/${user.username}/seats?rescheduleUid=${getBooking?.uid}&bookingUid=null`);
+
+ await selectFirstAvailableTimeSlotNextMonth(page);
+
+ // expect textarea with name notes to be visible
+ const notesElement = await page.locator("textarea[name=notes]");
+ await expect(notesElement).toBeVisible();
+
+ // expect button confirm instead of reschedule
+ await expect(page.locator('[data-testid="confirm-book-button"]')).toHaveCount(1);
+
+ // now login and try again
+ await user.apiLogin();
+
+ await page.goto(`/${user.username}/seats?rescheduleUid=${getBooking?.uid}&bookingUid=null`);
+
+ await selectFirstAvailableTimeSlotNextMonth(page);
+
+ await expect(page).toHaveTitle(/(?!.*reschedule).*/);
+
+ // expect button reschedule
+ await expect(page.locator('[data-testid="confirm-reschedule-button"]')).toHaveCount(1);
+ });
+
+ // @TODO: force 404 when rescheduleUid is not found
});
diff --git a/apps/web/public/map-pin.svg b/apps/web/public/map-pin-dark.svg
similarity index 100%
rename from apps/web/public/map-pin.svg
rename to apps/web/public/map-pin-dark.svg
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 2491c787c4..16b1cb13a4 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1535,6 +1535,7 @@
"problem_registering_domain": "There was a problem with registering the subdomain, please try again or contact an administrator",
"team_publish": "Publish team",
"number_text_notifications": "Phone number (Text notifications)",
+ "number_sms_notifications": "Phone number (SMS notifications)",
"attendee_email_variable": "Attendee email",
"attendee_email_info": "The person booking's email",
"kbar_search_placeholder": "Type a command or search...",
diff --git a/apps/web/public/static/locales/fr/common.json b/apps/web/public/static/locales/fr/common.json
index eb8964951e..2eb3b98328 100644
--- a/apps/web/public/static/locales/fr/common.json
+++ b/apps/web/public/static/locales/fr/common.json
@@ -1530,6 +1530,7 @@
"problem_registering_domain": "Un problème est survenu lors de l'enregistrement du sous-domaine, veuillez réessayer ou contacter un administrateur",
"team_publish": "Publier l'équipe",
"number_text_notifications": "Numéro de téléphone (notifications par SMS)",
+ "number_sms_notifications": "Numéro de téléphone (notifications par SMS)",
"attendee_email_variable": "Adresse e-mail du participant",
"attendee_email_info": "Adresse e-mail du participant",
"kbar_search_placeholder": "Saisissez une commande ou une recherche...",
diff --git a/apps/web/public/static/locales/pt/common.json b/apps/web/public/static/locales/pt/common.json
index 5379480f75..cfc18fa0c1 100644
--- a/apps/web/public/static/locales/pt/common.json
+++ b/apps/web/public/static/locales/pt/common.json
@@ -1530,6 +1530,7 @@
"problem_registering_domain": "Houve um problema ao registar o subdomínio. Tente novamente ou contacte um administrador",
"team_publish": "Publicar equipa",
"number_text_notifications": "Número de telefone (notificações de texto)",
+ "number_sms_notifications": "Número de telefone (notificações SMS)",
"attendee_email_variable": "E-mail do participante",
"attendee_email_info": "O e-mail do responsável pela reserva",
"kbar_search_placeholder": "Digite um comando ou pesquise...",
diff --git a/packages/app-store/cal-ai/api/_getAdd.ts b/packages/app-store/cal-ai/api/_getAdd.ts
index b263e28768..9928f1a72f 100644
--- a/packages/app-store/cal-ai/api/_getAdd.ts
+++ b/packages/app-store/cal-ai/api/_getAdd.ts
@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
import { defaultResponder } from "@calcom/lib/server";
import { createContext } from "@calcom/trpc/server/createContext";
-import { viewerRouter } from "@calcom/trpc/server/routers/viewer/_router";
+import { apiKeysRouter } from "@calcom/trpc/server/routers/viewer/apiKeys/_router";
import checkSession from "../../_utils/auth";
import getInstalledAppPath from "../../_utils/getInstalledAppPath";
@@ -15,9 +15,9 @@ export async function getHandler(req: NextApiRequest, res: NextApiResponse) {
const appType = appConfig.type;
const ctx = await createContext({ req, res });
- const caller = viewerRouter.createCaller(ctx);
+ const caller = apiKeysRouter.createCaller(ctx);
- const apiKey = await caller.apiKeys.create({
+ const apiKey = await caller.create({
note: "Cal.ai",
expiresAt: null,
appId: "cal-ai",
diff --git a/packages/app-store/googlecalendar/lib/CalendarService.ts b/packages/app-store/googlecalendar/lib/CalendarService.ts
index 12c5152396..fa7dec8e7a 100644
--- a/packages/app-store/googlecalendar/lib/CalendarService.ts
+++ b/packages/app-store/googlecalendar/lib/CalendarService.ts
@@ -284,9 +284,10 @@ export default class GoogleCalendarService implements Calendar {
const calendar = await this.authedCalendar();
- const selectedCalendar = externalCalendarId
- ? externalCalendarId
- : event.destinationCalendar?.find((cal) => cal.externalId === externalCalendarId)?.externalId;
+ const selectedCalendar =
+ (externalCalendarId
+ ? event.destinationCalendar?.find((cal) => cal.externalId === externalCalendarId)?.externalId
+ : undefined) || "primary";
try {
const evt = await calendar.events.update({
@@ -337,14 +338,15 @@ export default class GoogleCalendarService implements Calendar {
async deleteEvent(uid: string, event: CalendarEvent, externalCalendarId?: string | null): Promise {
const calendar = await this.authedCalendar();
- const defaultCalendarId = "primary";
- const calendarId = externalCalendarId
- ? externalCalendarId
- : event.destinationCalendar?.find((cal) => cal.externalId === externalCalendarId)?.externalId;
+
+ const selectedCalendar =
+ (externalCalendarId
+ ? event.destinationCalendar?.find((cal) => cal.externalId === externalCalendarId)?.externalId
+ : undefined) || "primary";
try {
const event = await calendar.events.delete({
- calendarId: calendarId ? calendarId : defaultCalendarId,
+ calendarId: selectedCalendar,
eventId: uid,
sendNotifications: false,
sendUpdates: "none",
diff --git a/packages/app-store/locations.ts b/packages/app-store/locations.ts
index 019a53507a..68358d839f 100644
--- a/packages/app-store/locations.ts
+++ b/packages/app-store/locations.ts
@@ -91,7 +91,7 @@ export const defaultLocations: DefaultEventLocationType[] = [
attendeeInputType: "attendeeAddress",
attendeeInputPlaceholder: "enter_address",
defaultValueVariable: "attendeeAddress",
- iconUrl: "/map-pin.svg",
+ iconUrl: "/map-pin-dark.svg",
category: "in person",
},
{
@@ -103,7 +103,7 @@ export const defaultLocations: DefaultEventLocationType[] = [
// HACK:
variable: "locationAddress",
defaultValueVariable: "address",
- iconUrl: "/map-pin.svg",
+ iconUrl: "/map-pin-dark.svg",
category: "in person",
},
{
diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx
index d8995856ff..622da4cf77 100644
--- a/packages/features/bookings/Booker/Booker.tsx
+++ b/packages/features/bookings/Booker/Booker.tsx
@@ -44,6 +44,7 @@ const BookerComponent = ({
isTeamEvent,
entity,
duration,
+ hashedLink,
}: BookerProps) => {
/**
* Prioritize dateSchedule load
@@ -285,6 +286,7 @@ const BookerComponent = ({
setSeatedEventData({ ...seatedEventData, bookingUid: undefined, attendees: undefined });
}
}}
+ hashedLink={hashedLink}
/>
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
index 7c12ff9478..eda9cb262c 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
@@ -41,11 +41,12 @@ import { FormSkeleton } from "./Skeleton";
type BookEventFormProps = {
onCancel?: () => void;
+ hashedLink?: string | null;
};
type DefaultValues = Record;
-export const BookEventForm = ({ onCancel }: BookEventFormProps) => {
+export const BookEventForm = ({ onCancel, hashedLink }: BookEventFormProps) => {
const [slotReservationId, setSlotReservationId] = useSlotReservationId();
const reserveSlotMutation = trpc.viewer.public.slots.reserveSlot.useMutation({
trpc: {
@@ -114,6 +115,7 @@ export const BookEventForm = ({ onCancel }: BookEventFormProps) => {
isRescheduling={isRescheduling}
eventQuery={eventQuery}
rescheduleUid={rescheduleUid}
+ hashedLink={hashedLink}
/>
);
};
@@ -124,11 +126,13 @@ export const BookEventFormChild = ({
isRescheduling,
eventQuery,
rescheduleUid,
+ hashedLink,
}: BookEventFormProps & {
initialValues: DefaultValues;
isRescheduling: boolean;
eventQuery: ReturnType;
rescheduleUid: string | null;
+ hashedLink?: string | null;
}) => {
const eventType = eventQuery.data;
const bookingFormSchema = z
@@ -332,6 +336,7 @@ export const BookEventFormChild = ({
}),
{}
),
+ hashedLink,
};
if (eventQuery.data?.recurringEvent?.freq && recurringEventCount) {
@@ -370,6 +375,7 @@ export const BookEventFormChild = ({
fields={eventType.bookingFields}
locations={eventType.locations}
rescheduleUid={rescheduleUid || undefined}
+ bookingData={bookingData}
/>
{(createBookingMutation.isError ||
createRecurringBookingMutation.isError ||
@@ -399,8 +405,8 @@ export const BookEventFormChild = ({
type="submit"
color="primary"
loading={createBookingMutation.isLoading || createRecurringBookingMutation.isLoading}
- data-testid={rescheduleUid ? "confirm-reschedule-button" : "confirm-book-button"}>
- {rescheduleUid
+ data-testid={rescheduleUid && bookingData ? "confirm-reschedule-button" : "confirm-book-button"}>
+ {rescheduleUid && bookingData
? t("reschedule")
: renderConfirmNotVerifyEmailButtonCond
? t("confirm")
@@ -492,12 +498,18 @@ function useInitialFormValues({
});
const defaultUserValues = {
- email: rescheduleUid
- ? bookingData?.attendees[0].email
- : parsedQuery["email"] || session.data?.user?.email || "",
- name: rescheduleUid
- ? bookingData?.attendees[0].name
- : parsedQuery["name"] || session.data?.user?.name || "",
+ email:
+ rescheduleUid && bookingData && bookingData.attendees.length > 0
+ ? bookingData?.attendees[0].email
+ : !!parsedQuery["email"]
+ ? parsedQuery["email"]
+ : session.data?.user?.email ?? "",
+ name:
+ rescheduleUid && bookingData && bookingData.attendees.length > 0
+ ? bookingData?.attendees[0].name
+ : !!parsedQuery["name"]
+ ? parsedQuery["name"]
+ : session.data?.user?.name ?? session.data?.user?.username ?? "",
};
if (!isRescheduling) {
@@ -521,14 +533,12 @@ function useInitialFormValues({
setDefaultValues(defaults);
}
- if ((!rescheduleUid && !bookingData) || !bookingData?.attendees.length) {
- return {};
- }
- const primaryAttendee = bookingData.attendees[0];
- if (!primaryAttendee) {
+ if (!rescheduleUid && !bookingData) {
return {};
}
+ // We should allow current session user as default values for booking form
+
const defaults = {
responses: {} as Partial>>,
};
@@ -536,7 +546,7 @@ function useInitialFormValues({
const responses = eventType.bookingFields.reduce((responses, field) => {
return {
...responses,
- [field.name]: bookingData.responses[field.name],
+ [field.name]: bookingData?.responses[field.name],
};
}, {});
defaults.responses = {
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
index d301891770..ab1505a787 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
@@ -1,6 +1,7 @@
import { useFormContext } from "react-hook-form";
import type { LocationObject } from "@calcom/app-store/locations";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
import getLocationOptionsForSelect from "@calcom/features/bookings/lib/getLocationOptionsForSelect";
import { FormBuilderField } from "@calcom/features/form-builder/FormBuilderField";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -13,10 +14,12 @@ export const BookingFields = ({
locations,
rescheduleUid,
isDynamicGroupBooking,
+ bookingData,
}: {
fields: NonNullable["bookingFields"];
locations: LocationObject[];
rescheduleUid?: string;
+ bookingData?: GetBookingType | null;
isDynamicGroupBooking: boolean;
}) => {
const { t } = useLocale();
@@ -32,7 +35,9 @@ export const BookingFields = ({
// During reschedule by default all system fields are readOnly. Make them editable on case by case basis.
// Allowing a system field to be edited might require sending emails to attendees, so we need to be careful
let readOnly =
- (field.editable === "system" || field.editable === "system-but-optional") && !!rescheduleUid;
+ (field.editable === "system" || field.editable === "system-but-optional") &&
+ !!rescheduleUid &&
+ bookingData !== null;
let hidden = !!field.hidden;
const fieldViews = field.views;
@@ -42,6 +47,9 @@ export const BookingFields = ({
}
if (field.name === SystemField.Enum.rescheduleReason) {
+ if (bookingData === null) {
+ return null;
+ }
// rescheduleReason is a reschedule specific field and thus should be editable during reschedule
readOnly = false;
}
@@ -64,8 +72,8 @@ export const BookingFields = ({
hidden = isDynamicGroupBooking ? true : !!field.hidden;
}
- // We don't show `notes` field during reschedule
- if (field.name === SystemField.Enum.notes && !!rescheduleUid) {
+ // We don't show `notes` field during reschedule but since it's a query param we better valid if rescheduleUid brought any bookingData
+ if (field.name === SystemField.Enum.notes && bookingData !== null) {
return null;
}
diff --git a/packages/features/bookings/Booker/types.ts b/packages/features/bookings/Booker/types.ts
index dbbf9ec5c4..badfe667c8 100644
--- a/packages/features/bookings/Booker/types.ts
+++ b/packages/features/bookings/Booker/types.ts
@@ -64,6 +64,10 @@ export interface BookerProps {
* otherwise, the default value is selected
*/
duration?: number | null;
+ /**
+ * Refers to the private link from event types page.
+ */
+ hashedLink?: string | null;
}
export type BookerState = "loading" | "selecting_date" | "selecting_time" | "booking";
diff --git a/packages/features/bookings/components/BookerSeo.tsx b/packages/features/bookings/components/BookerSeo.tsx
index b331b8fb9f..e11b872431 100644
--- a/packages/features/bookings/components/BookerSeo.tsx
+++ b/packages/features/bookings/components/BookerSeo.tsx
@@ -1,3 +1,4 @@
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { HeadSeo } from "@calcom/ui";
@@ -14,10 +15,20 @@ interface BookerSeoProps {
teamSlug?: string | null;
name?: string | null;
};
+ bookingData?: GetBookingType | null;
}
export const BookerSeo = (props: BookerSeoProps) => {
- const { eventSlug, username, rescheduleUid, hideBranding, isTeamEvent, entity, isSEOIndexable } = props;
+ const {
+ eventSlug,
+ username,
+ rescheduleUid,
+ hideBranding,
+ isTeamEvent,
+ entity,
+ isSEOIndexable,
+ bookingData,
+ } = props;
const { t } = useLocale();
const { data: event } = trpc.viewer.public.event.useQuery(
{ username, eventSlug, isTeamEvent, org: entity.orgSlug ?? null },
@@ -29,7 +40,7 @@ export const BookerSeo = (props: BookerSeoProps) => {
const title = event?.title ?? "";
return (
1 ? (
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index 1712666534..85d8f22d2c 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -61,7 +61,7 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
image: "logo" in profile && profile.logo ? `${profile.logo}` : undefined,
alt: profile.name || undefined,
href: profile.username
- ? `${CAL_URL}` + (pathname.indexOf("/team/") !== -1 ? "/team" : "") + `/${profile.username}`
+ ? `${CAL_URL}${pathname.indexOf("/team/") !== -1 ? "/team" : ""}/${profile.username}`
: undefined,
});
diff --git a/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx b/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
index f9ca1cf538..2abed19098 100644
--- a/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
+++ b/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
@@ -18,6 +18,7 @@ type BookingOptions = {
metadata?: Record;
bookingUid?: string;
seatReferenceUid?: string;
+ hashedLink?: string | null;
};
export const mapBookingToMutationInput = ({
@@ -32,6 +33,7 @@ export const mapBookingToMutationInput = ({
metadata,
bookingUid,
seatReferenceUid,
+ hashedLink,
}: BookingOptions): BookingCreateBody => {
return {
...values,
@@ -47,11 +49,10 @@ export const mapBookingToMutationInput = ({
language: language,
rescheduleUid,
metadata: metadata || {},
- hasHashedBookingLink: false,
+ hasHashedBookingLink: hashedLink ? true : false,
bookingUid,
seatReferenceUid,
- // hasHashedBookingLink,
- // hashedLink,
+ hashedLink,
};
};
diff --git a/packages/features/bookings/lib/get-booking.ts b/packages/features/bookings/lib/get-booking.ts
index 350e6cfca6..bd7bcc727b 100644
--- a/packages/features/bookings/lib/get-booking.ts
+++ b/packages/features/bookings/lib/get-booking.ts
@@ -109,7 +109,7 @@ export const getBookingWithResponses = <
export default getBooking;
-export const getBookingForReschedule = async (uid: string) => {
+export const getBookingForReschedule = async (uid: string, userId?: number) => {
let rescheduleUid: string | null = null;
const theBooking = await prisma.booking.findFirst({
where: {
@@ -117,8 +117,25 @@ export const getBookingForReschedule = async (uid: string) => {
},
select: {
id: true,
+ userId: true,
+ eventType: {
+ select: {
+ seatsPerTimeSlot: true,
+ hosts: {
+ select: {
+ userId: true,
+ },
+ },
+ owner: {
+ select: {
+ id: true,
+ },
+ },
+ },
+ },
},
});
+ let bookingSeatReferenceUid: number | null = null;
// If no booking is found via the uid, it's probably a booking seat
// that its being rescheduled, which we query next.
@@ -144,11 +161,26 @@ export const getBookingForReschedule = async (uid: string) => {
},
});
if (bookingSeat) {
+ bookingSeatReferenceUid = bookingSeat.id;
rescheduleUid = bookingSeat.booking.uid;
attendeeEmail = bookingSeat.attendee.email;
}
}
+ // If we have the booking and not bookingSeat, we need to make sure the booking belongs to the userLoggedIn
+ // Otherwise, we return null here.
+ let hasOwnershipOnBooking = false;
+ if (theBooking && theBooking?.eventType?.seatsPerTimeSlot && bookingSeatReferenceUid === null) {
+ const isOwnerOfBooking = theBooking.userId === userId;
+
+ const isHostOfEventType = theBooking?.eventType?.hosts.some((host) => host.userId === userId);
+
+ const isUserIdInBooking = theBooking.userId === userId;
+
+ if (!isOwnerOfBooking && !isHostOfEventType && !isUserIdInBooking) return null;
+ hasOwnershipOnBooking = true;
+ }
+
// If we don't have a booking and no rescheduleUid, the ID is invalid,
// and we return null here.
if (!theBooking && !rescheduleUid) return null;
@@ -161,6 +193,8 @@ export const getBookingForReschedule = async (uid: string) => {
...booking,
attendees: rescheduleUid
? booking.attendees.filter((attendee) => attendee.email === attendeeEmail)
+ : hasOwnershipOnBooking
+ ? []
: booking.attendees,
};
};
diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts
index 37758d3f34..924ae49436 100644
--- a/packages/features/bookings/lib/handleCancelBooking.ts
+++ b/packages/features/bookings/lib/handleCancelBooking.ts
@@ -136,6 +136,19 @@ async function handler(req: CustomRequest) {
throw new HttpError({ statusCode: 400, message: "User not found" });
}
+ // If the booking is a seated event and there is no seatReferenceUid we should validate that logged in user is host
+ if (bookingToDelete.eventType?.seatsPerTimeSlot && !seatReferenceUid) {
+ const userIsHost = bookingToDelete.eventType.hosts.find((host) => {
+ if (host.user.id === userId) return true;
+ });
+
+ const userIsOwnerOfEventType = bookingToDelete.eventType.owner?.id === userId;
+
+ if (!userIsHost && !userIsOwnerOfEventType) {
+ throw new HttpError({ statusCode: 401, message: "User not a host of this event" });
+ }
+ }
+
// get webhooks
const eventTrigger: WebhookTriggerEvents = "BOOKING_CANCELLED";
diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
index ed8a797d52..5475445fa2 100644
--- a/packages/features/bookings/lib/handleNewBooking.ts
+++ b/packages/features/bookings/lib/handleNewBooking.ts
@@ -996,7 +996,7 @@ async function handler(
if (isTeamEventType && locationBodyString === OrganizerDefaultConferencingAppType) {
const metadataParseResult = userMetadataSchema.safeParse(organizerUser.metadata);
const organizerMetadata = metadataParseResult.success ? metadataParseResult.data : undefined;
- if (organizerMetadata) {
+ if (organizerMetadata?.defaultConferencingApp?.appSlug) {
const app = getAppFromSlug(organizerMetadata?.defaultConferencingApp?.appSlug);
locationBodyString = app?.appData?.location?.type || locationBodyString;
organizerOrFirstDynamicGroupMemberDefaultLocationUrl =
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index 9ae0e26cc4..d9cd6ab6e2 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -176,30 +176,37 @@ const ProfileView = () => {
mutation.mutate({ id: team.id, ...variables });
}
}}>
-
+ {!team.parent && ( + <> +
+ + )}
- 
+ {!team.parentId && (
+
+ )}
@@ -517,11 +519,13 @@ const SettingsSidebarContainer = ({
-
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index 1712666534..85d8f22d2c 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -61,7 +61,7 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
image: "logo" in profile && profile.logo ? `${profile.logo}` : undefined,
alt: profile.name || undefined,
href: profile.username
- ? `${CAL_URL}` + (pathname.indexOf("/team/") !== -1 ? "/team" : "") + `/${profile.username}`
+ ? `${CAL_URL}${pathname.indexOf("/team/") !== -1 ? "/team" : ""}/${profile.username}`
: undefined,
});
diff --git a/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx b/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
index f9ca1cf538..2abed19098 100644
--- a/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
+++ b/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
@@ -18,6 +18,7 @@ type BookingOptions = {
metadata?: Record
- (
- <>
-
-
-
- {
- form.setValue("logo", newLogo);
- }}
- imageSrc={value}
- />
-
-
- )}
- />
- + {!team.parent && ( + <> +
+ (
+ <>
+
+
+ {
+ form.setValue("logo", newLogo);
+ }}
+ imageSrc={value}
+ />
+
+
+ )}
+ />
+ + + )}
{team.name}
{!team.accepted && ({otherTeam.name}
+
{searchKey && (
table.getColumn(searchKey)?.setFilterValue(event.target.value)}
diff --git a/packages/ui/components/data-table/index.tsx b/packages/ui/components/data-table/index.tsx
index 3cf83a7906..5a41ebcf4e 100644
--- a/packages/ui/components/data-table/index.tsx
+++ b/packages/ui/components/data-table/index.tsx
@@ -102,21 +102,9 @@ export function DataTable({
searchKey={searchKey}
tableCTA={tableCTA}
/>
-
+
-