chore: booking verification token and booking rejection logic from email #16324

anikdhabal · 2024-08-22T17:48:12Z

What does this PR do?

Fixes #XXXX (GitHub issue number)
Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A-I have added a Docs issue here if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
N/A-I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my changes generate no new warnings

vercel · 2024-08-22T17:48:18Z

@anikdhabal is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

graphite-app · 2024-08-22T17:50:29Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (08/22/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add community label" took an action on this PR • (08/22/24)

1 label was added to this PR based on Keith Williams's automation.

…secret/migration.sql

zomars

Thank you for your contribution @anikdhabal

Leaving some feedback to address.

I think we can simplify this even further.

I think naming the field oneTimePassword instead of bookingSecret is more intentional. Also booking.bookingSecret sounds redundant. We're are already in the booking model.

Using the authenticator library is overkill IMO. The token is random and secret enough and should be used as a disposable password anyways.

Just got the idea of testing then possibility of including a text field directly in the email to provide the rejection reason. Will test locally and keep you posted.

packages/prisma/schema.prisma

packages/emails/src/templates/OrganizerRequestEmail.tsx

packages/features/bookings/lib/handleNewBooking.ts

packages/features/bookings/lib/handleNewBooking/createBooking.ts

packages/lib/test/builder.ts

packages/types/Calendar.d.ts

apps/web/pages/api/verify-booking-token.ts

anikdhabal · 2024-08-23T04:07:06Z

Thanks @zomars for the review, yes we can simply it. Fixed it

zomars · 2024-08-23T05:29:15Z

packages/emails/src/templates/OrganizerRequestEmail.tsx

+            <Separator />
+            <CallToAction
+              label={props.calEvent.organizer.language.translate("reject")}
+              // href={`${actionHref}&action=reject`}


If omitted it will be a submit button for the form.

zomars

Hey @anikdhabal made some changes. Can you verify if it's working properly?

anikdhabal · 2024-08-23T05:31:34Z

Hey @anikdhabal made some changes. Can you verify if it's working properly?

Okay let me check

…ing_otp/migration.sql

apps/web/pages/api/verify-booking-token.ts

anikdhabal · 2024-08-23T05:52:36Z

MailHog.and.16.more.pages.-.Personal.-.Microsoft.Edge.2024-08-23.11-19-34.mp4

@zomars the token value is currently undefined, that's why not working. Also, reason is not passed to the api and zoderror occured. Isn't using a redirect for the workflow better and more understandable than a direct submit?

github-actions · 2024-08-23T05:53:01Z

E2E results are ready!

Workflow #32455.1 latest results

anikdhabal · 2024-08-23T06:02:27Z

packages/features/bookings/lib/handleNewBooking.ts

@@ -901,6 +901,7 @@ async function handler(
    platformRescheduleUrl,
    platformCancelUrl,
    platformBookingUrl,
+    oneTimePassword: isConfirmedByDefault ? null : undefined,


We need to update the one-time password of calEvent after the booking, or we will get an undefined value in the email template. Currently, this is happening

anikdhabal · 2024-08-23T07:02:40Z

packages/emails/src/components/BookingConfirmationForm.tsx

+        <textarea
+          placeholder="Why are you rejecting?"
+          style={{


Need to set this field name to reason.

anikdhabal · 2024-08-23T07:14:37Z

@zomars is this ok, I think redirecting to our booking canceled page would be better, just like before. What do you think?

anikdhabal · 2024-09-06T02:16:29Z

@zomars take a look whenever got a chance

zomars

Blocking to put a feature flag before merging #16038

Signed-off-by: zomars <zomars@me.com> # Conflicts: # packages/emails/src/templates/OrganizerRequestEmail.tsx

Signed-off-by: zomars <zomars@me.com>

…l.tsx

zomars · 2024-09-21T00:01:22Z

packages/emails/src/templates/index.ts

@@ -15,6 +15,7 @@ export { OrganizerCancelledEmail } from "./OrganizerCancelledEmail";
 export { OrganizerLocationChangeEmail } from "./OrganizerLocationChangeEmail";
 export { OrganizerPaymentRefundFailedEmail } from "./OrganizerPaymentRefundFailedEmail";
 export { OrganizerRequestEmail } from "./OrganizerRequestEmail";
+export { OrganizerRequestEmailV2 } from "./OrganizerRequestEmailV2";


Moved to a new template so we can enable it on demand @anikdhabal

Great workaround @zomars 🚀

Signed-off-by: zomars <zomars@me.com>

zomars

Made new tests and it's working flawlessly. Now we can also enable this for specific users and teams so we can test on multiple email clients before enabling globally. cc @emrysal @keithwillcode

Grabacion.de.pantalla.2024-09-20.a.la.s.17.32.29.mov

booking otp

bca840b

anikdhabal requested a review from zomars August 22, 2024 17:48

github-actions bot added the ❗️ migrations contains migration files label Aug 22, 2024

keithwillcode added the community-interns The team responsible for reviewing, testing and shipping low/medium community PRs label Aug 22, 2024

graphite-app bot added the community Created by Linear-GitHub Sync label Aug 22, 2024

graphite-app bot requested a review from a team August 22, 2024 17:48

dosubot bot added bookings area: bookings, availability, timezones, double booking emails area: emails, cancellation email, reschedule email, inbox, spam folder, not getting email labels Aug 22, 2024

Merge branch 'main' into booking_otp

53e46b5

zomars added 2 commits August 22, 2024 19:45

Merge branch 'main' into booking_otp

beb1ff0

Discard changes to packages/prisma/migrations/20240822140839_booking_…

66b7019

…secret/migration.sql

zomars requested changes Aug 23, 2024

View reviewed changes

anikdhabal added 2 commits August 23, 2024 03:34

refactor and update

5b556b7

add 404 page

288fcd3

anikdhabal requested a review from zomars August 23, 2024 04:07

update

3f137c5

anikdhabal added the ready-for-e2e label Aug 23, 2024

zomars added 4 commits August 22, 2024 22:26

Discard changes to apps/web/pages/booking/[uid]/404.tsx

b1407d1

Discard changes to apps/web/public/static/locales/en/common.json

e17b40e

Uses otp and email form

cd3490d

Discard changes to apps/web/pages/api/email.ts

4c6dd22

zomars reviewed Aug 23, 2024

View reviewed changes

Discard changes to packages/prisma/migrations/20240823032309_add_book…

ff7128c

…ing_otp/migration.sql

anikdhabal commented Aug 23, 2024

View reviewed changes

apps/web/pages/api/verify-booking-token.ts Show resolved Hide resolved

anikdhabal commented Aug 23, 2024

View reviewed changes

fix error

bb1fc76

Merge branch 'main' into booking_otp

7bd99bc

anikdhabal requested a review from zomars August 23, 2024 19:58

anikdhabal added 3 commits August 25, 2024 22:34

Merge branch 'main' into booking_otp

3a4f992

Merge branch 'main' into booking_otp

f96e175

Merge branch 'main' into booking_otp

401c80c

keithwillcode added this to the v4.6 milestone Sep 15, 2024

zomars requested changes Sep 20, 2024

View reviewed changes

zomars added 3 commits September 20, 2024 12:57

Merge branch 'main' into booking_otp

c0c66ac

Signed-off-by: zomars <zomars@me.com> # Conflicts: # packages/emails/src/templates/OrganizerRequestEmail.tsx

Added feature flag for new confirmation email

60ace20

Signed-off-by: zomars <zomars@me.com>

Discard changes to packages/emails/src/templates/OrganizerRequestEmai…

5defa3f

…l.tsx

zomars reviewed Sep 21, 2024

View reviewed changes

zomars added 2 commits September 20, 2024 17:02

Update features.repository.ts

1cd5f93

More fixes

a116648

Signed-off-by: zomars <zomars@me.com>

zomars approved these changes Sep 21, 2024

View reviewed changes

zomars enabled auto-merge (squash) September 21, 2024 00:36

Merge branch 'main' into booking_otp

f38a7a4

zomars merged commit 1a60afa into calcom:main Sep 21, 2024
30 of 37 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: booking verification token and booking rejection logic from email #16324

chore: booking verification token and booking rejection logic from email #16324

anikdhabal commented Aug 22, 2024 •

edited

Loading

vercel bot commented Aug 22, 2024

graphite-app bot commented Aug 22, 2024

zomars left a comment

anikdhabal commented Aug 23, 2024

zomars Aug 23, 2024

zomars left a comment

anikdhabal commented Aug 23, 2024

anikdhabal commented Aug 23, 2024 •

edited

Loading

github-actions bot commented Aug 23, 2024 •

edited

Loading

anikdhabal Aug 23, 2024 •

edited

Loading

anikdhabal Aug 23, 2024 •

edited

Loading

anikdhabal commented Aug 23, 2024 •

edited

Loading

anikdhabal commented Sep 6, 2024

zomars left a comment

zomars Sep 21, 2024

anikdhabal Sep 21, 2024

zomars left a comment

chore: booking verification token and booking rejection logic from email #16324

chore: booking verification token and booking rejection logic from email #16324

Conversation

anikdhabal commented Aug 22, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Checklist

vercel bot commented Aug 22, 2024

graphite-app bot commented Aug 22, 2024

Graphite Automations

zomars left a comment

Choose a reason for hiding this comment

anikdhabal commented Aug 23, 2024

zomars Aug 23, 2024

Choose a reason for hiding this comment

zomars left a comment

Choose a reason for hiding this comment

anikdhabal commented Aug 23, 2024

anikdhabal commented Aug 23, 2024 • edited Loading

github-actions bot commented Aug 23, 2024 • edited Loading

E2E results are ready!

anikdhabal Aug 23, 2024 • edited Loading

Choose a reason for hiding this comment

anikdhabal Aug 23, 2024 • edited Loading

Choose a reason for hiding this comment

anikdhabal commented Aug 23, 2024 • edited Loading

anikdhabal commented Sep 6, 2024

zomars left a comment

Choose a reason for hiding this comment

zomars Sep 21, 2024

Choose a reason for hiding this comment

anikdhabal Sep 21, 2024

Choose a reason for hiding this comment

zomars left a comment

Choose a reason for hiding this comment

anikdhabal commented Aug 22, 2024 •

edited

Loading

anikdhabal commented Aug 23, 2024 •

edited

Loading

github-actions bot commented Aug 23, 2024 •

edited

Loading

anikdhabal Aug 23, 2024 •

edited

Loading

anikdhabal Aug 23, 2024 •

edited

Loading

anikdhabal commented Aug 23, 2024 •

edited

Loading