Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0922c5ee0 | ||
|
|
f8dc7a115a | ||
|
|
a60aa1bf6c | ||
|
|
bc203d7439 | ||
|
|
d82847035f | ||
|
|
6d133c26f8 | ||
|
|
3ae53a4b6e | ||
|
|
63339d8c01 | ||
|
|
44410c87f0 | ||
|
|
c016241004 | ||
|
|
019ef6de2a | ||
|
|
a2b064b269 | ||
|
|
abb4fd307f | ||
|
|
a9ebb0d160 | ||
|
|
1058c0e171 | ||
|
|
021e5f3833 | ||
|
|
5b5a42e72d | ||
|
|
2b43d9a716 | ||
|
|
3a5325f2a8 | ||
|
|
5ad73607f0 | ||
|
|
5067f0dd16 | ||
|
|
a53e697baa | ||
|
|
e7415fe6e2 | ||
|
|
562309d24b | ||
|
|
3900c55204 | ||
|
|
b3be9a93e0 | ||
|
|
d27ccd6f44 | ||
|
|
f86a5db843 | ||
|
|
4cbf9ec9ab | ||
|
|
aa3c91ebd6 | ||
|
|
071c899ea6 | ||
|
|
32b2e83564 | ||
|
|
7ff6d6559a | ||
|
|
2572a5cb93 | ||
|
|
45e0f87e45 | ||
|
|
6e875fccbe | ||
|
|
689e17bcf6 | ||
|
|
584f9c6e93 | ||
|
|
70348c6f64 | ||
|
|
747591fded | ||
|
|
9bfd933699 | ||
|
|
a775e42e85 | ||
|
|
e3e2bc804a | ||
|
|
b84099aec0 | ||
|
|
073d34f893 | ||
|
|
d72900d164 | ||
|
|
e3b478f5b1 | ||
|
|
a5191d1e5a | ||
|
|
ea21cd5826 | ||
|
|
e78c8738fb | ||
|
|
47314bae83 | ||
|
|
fd8afbc418 | ||
|
|
6e7012757f | ||
|
|
933eb0d057 | ||
|
|
fcb79888f3 | ||
|
|
111e2f30c6 | ||
|
|
f2b3e620b4 | ||
|
|
d9133cb395 | ||
|
|
1722edbd36 | ||
|
|
e68ab3b123 | ||
|
|
cf16cd3ed2 | ||
|
|
f4bc7d2ea4 | ||
|
|
f5f7242f02 | ||
|
|
8f5ac26bb1 | ||
|
|
b983adb16a | ||
|
|
8ce018995a | ||
|
|
f11086e9f8 | ||
|
|
91f5d49cd4 | ||
|
|
55e1e0fa3d | ||
|
|
4a59841b02 | ||
|
|
74a9f3c19e | ||
|
|
89250422ea | ||
|
|
2f2f4dba60 | ||
|
|
b292cafe7b | ||
|
|
82053e0c7c | ||
|
|
860d173f0a | ||
|
|
5bc0e1265d | ||
|
|
e362c37ff3 | ||
|
|
4d53f327d9 | ||
|
|
61f436be2a | ||
|
|
d1a0fc6604 | ||
|
|
976013512c | ||
|
|
d9777a3011 | ||
|
|
7725adedc8 | ||
|
|
7269b3ea60 | ||
|
|
c168df4df0 | ||
|
|
be9b0fb9a8 | ||
|
|
c056cabbbd | ||
|
|
97630e8add | ||
|
|
a5443ccfbe | ||
|
|
6f2986e42e | ||
|
|
db345de99e | ||
|
|
bde40dceb3 | ||
|
|
1a86e7c506 | ||
|
|
9ed1624111 | ||
|
|
5dff1c6df0 | ||
|
|
706d7dff42 | ||
|
|
71443ef23d | ||
|
|
17201334b6 | ||
|
|
bc82ff4d21 | ||
|
|
71ae3f157a | ||
|
|
8784be067f | ||
|
|
84a2e55125 | ||
|
|
21e23f32ac | ||
|
|
33aa9420af | ||
|
|
ef0ba48f49 | ||
|
|
6e54c459a4 | ||
|
|
f5c16f0d6b | ||
|
|
105e7d3e28 | ||
|
|
21ef1900e9 | ||
|
|
f07b73dc79 | ||
|
|
d4b0516235 | ||
|
|
7bfad11ff9 | ||
|
|
d2f7a427d0 | ||
|
|
a910eb96ad | ||
|
|
c080458faa | ||
|
|
5c75cfc17f | ||
|
|
4280f556cb | ||
|
|
21368bb130 | ||
|
|
e9076c8e3e | ||
|
|
2471ee801b | ||
|
+6 |
9fc9876b3f | ||
|
|
34ca3bd22d | ||
|
|
bebe1dd7b4 | ||
|
|
fced9a6355 | ||
|
|
6b57dd6794 | ||
|
|
eb4c58186b | ||
|
|
17e438ab9f | ||
|
|
458e6a3abf | ||
|
|
963d22648b | ||
|
|
fabcf2055b | ||
|
|
633697a812 | ||
|
|
2de33fe1bf | ||
|
|
36e79bf69c | ||
|
|
2e36cadce4 | ||
|
|
9ef532019f | ||
|
|
176dd1a7f3 | ||
|
|
e9c71abd6f | ||
|
|
eb472cba36 | ||
|
|
7d77554696 | ||
|
|
31bfa9e32e | ||
|
|
26be88fc56 | ||
|
|
86cf8feb55 | ||
|
|
1edd255846 | ||
|
|
f538877349 | ||
|
|
d759669c1e | ||
|
|
71ce87ca21 | ||
|
|
7eae004aa2 | ||
|
|
6cd427bc78 | ||
|
|
b8d67c5a41 | ||
|
|
42953548b6 | ||
|
|
28c631e108 | ||
|
|
263a96e660 | ||
|
|
d059b1399b | ||
|
|
12a9c74eb6 | ||
|
|
6bb60e36fd | ||
|
|
c1eb2512b6 | ||
|
|
55d75a9786 | ||
|
|
779eb19e7a | ||
|
|
5d8ed130de | ||
|
|
971d9ff0d8 | ||
|
|
b6bcc43655 | ||
|
|
b576fc8c26 | ||
|
|
821843bc6c | ||
|
|
d19e3e53f0 | ||
|
|
40fee7af51 | ||
|
|
f3462776e8 | ||
|
|
57e9ef7320 | ||
|
|
88f46a6b20 | ||
|
|
17f537774c | ||
|
|
3aa6878c27 | ||
|
|
ae55e5e264 | ||
|
|
36ecece181 | ||
|
|
1a0448910b | ||
|
|
ad5d645347 | ||
|
|
54f7c8328d | ||
|
|
36a1715ece | ||
|
|
edaa6b1de8 | ||
|
|
f47b2066c4 | ||
|
|
7337b3de1e | ||
|
|
933ffcbf69 | ||
|
|
cf50566a10 | ||
|
|
4424aa5b38 | ||
|
|
19634073e9 | ||
|
|
4284e86e51 | ||
|
|
f7c1d62bb8 | ||
|
|
795a228a44 | ||
|
|
0190ca6711 | ||
|
|
ee8cc81862 | ||
|
|
6b244fc5b5 | ||
|
|
356ecfe2fa | ||
|
|
bd410cf09f | ||
|
|
3c5ab5e8d2 | ||
|
|
d938e67e65 | ||
|
|
6a90518231 | ||
|
|
47e8907184 | ||
|
|
d6096f459b | ||
|
|
8839f08257 | ||
|
|
6104add6bd | ||
|
|
7aae55f417 | ||
|
|
ef1b5067c2 | ||
|
|
4caa095d52 | ||
|
|
c8e20b0c57 | ||
|
|
2fb4289798 | ||
|
|
6529b49c3c | ||
|
|
758423ecf9 | ||
|
|
ef11755488 | ||
|
|
03051a2bb1 | ||
|
|
7a57f57e99 | ||
|
|
b6d31129a3 | ||
|
|
34075ee303 | ||
|
|
89f711d929 | ||
|
|
623f0c7d93 | ||
|
|
c67877cc51 | ||
|
|
fd50728169 | ||
|
|
74567909b2 | ||
|
|
d84f08c998 | ||
|
|
685eadc30b | ||
|
|
c821f15a14 | ||
|
|
8a972a74c6 | ||
|
|
cf76cf7aae | ||
|
|
4dd762681c | ||
|
|
399a23a52f | ||
|
|
342f935aba | ||
|
|
27e4210693 | ||
|
|
66cb2bcc13 | ||
|
|
30c31d3585 | ||
|
|
e17303ea88 | ||
|
|
bebf1d80a7 | ||
|
|
5bcefb0b3e | ||
|
|
f52de7331f | ||
|
|
1690770d6a | ||
|
|
7759e6a029 | ||
|
|
0b719ac070 | ||
|
|
baa9045af7 | ||
|
|
b004587262 | ||
|
|
8a7beff339 | ||
|
|
9001eb7795 | ||
|
|
50c4578c2e | ||
|
|
4ff2ce90f9 | ||
|
|
86f8c6c5fa | ||
|
|
0611bbd50e | ||
|
|
b946abab02 | ||
|
|
a091c60618 | ||
|
|
bba7fc1a30 | ||
|
|
864c46736b | ||
|
|
4416709ff6 | ||
|
|
591d42fc8f | ||
|
|
d73b84157a | ||
|
|
680e748b7a | ||
|
|
99b7aaa62d | ||
|
|
3a01e6390f | ||
|
|
a6c25ab7d3 | ||
|
|
df98274a8f | ||
|
|
b540a2ec45 | ||
|
|
8e4459f2fe | ||
|
|
bc5a9f231f | ||
|
|
88984f6175 | ||
|
|
fc592a17ac | ||
|
|
a51524e673 | ||
|
|
cb6553c731 | ||
|
|
101fea2c1c | ||
|
|
aab9193e7b | ||
|
|
a6d2e46b3d | ||
|
|
25ae1493c3 | ||
|
|
56dcab2f6d | ||
|
|
8fbc76d59a | ||
|
|
894c0fc8a7 | ||
|
|
076550b384 | ||
|
|
08e1b0a9c8 | ||
|
|
ef4deb1657 | ||
|
|
f81074c4f5 | ||
|
|
5df14c344e | ||
|
|
cd311f076c | ||
|
|
d60f165223 | ||
|
|
8477128605 | ||
|
|
84606543ae | ||
|
|
a11242e93d | ||
|
|
5939a99aca | ||
|
|
050abd9fab | ||
|
|
1adf2ad5a8 | ||
|
|
3f2d83d89f | ||
|
|
528a4fbb97 | ||
|
|
95e2ad3007 | ||
|
|
c41e5ddc2c | ||
|
|
f206b3d135 | ||
|
|
0b03bcb90e | ||
|
|
b09b32b121 | ||
|
|
d5f7065fdb | ||
|
|
dc40cc664d | ||
|
|
3eaf84e961 | ||
|
|
c36249b5a7 | ||
|
|
3666c260ee | ||
|
|
77f3fd3b38 | ||
|
|
848bcbfb8f | ||
|
|
24936d8b7b | ||
|
|
ad62f9d2bd | ||
|
|
829dd937d6 | ||
|
|
dda4b17a7c | ||
|
|
4def31e98f | ||
|
|
6d3f5495cb | ||
|
|
008af08148 | ||
|
|
ac0930a11f | ||
|
|
0e62800af6 | ||
|
|
b6ab1ef80a | ||
|
|
13347edced | ||
|
|
d734841184 | ||
|
|
a2998b6c84 | ||
|
|
da5df7164a | ||
|
|
3e28160fa7 | ||
|
|
2b9bdb9c80 | ||
|
|
90ce124bbb | ||
|
|
fba3f46779 | ||
|
|
b9a1522abc | ||
|
|
f92a95dc2e | ||
|
|
46acac5dd8 | ||
|
|
8dbd96a2f9 | ||
|
|
3b186b19e6 | ||
|
|
53ec5daa1b | ||
|
|
96b58422fd | ||
|
|
25970e72de | ||
|
|
e5887ec0fa | ||
|
|
e075dcdeaa | ||
|
|
3ab735ba9c | ||
|
|
d429f0ee04 | ||
|
|
3d0a853c4b | ||
|
|
3a46375fed | ||
|
|
07de77ddc6 | ||
|
|
cf45443726 | ||
|
|
629b9391dd | ||
|
|
25da11c497 | ||
|
|
003e2630e7 | ||
|
|
4eef7138c1 | ||
|
|
253d0174be | ||
|
|
5ee5c117c4 | ||
|
|
0f268bbef7 | ||
|
|
d342e3f9e0 | ||
|
|
7f1e20fe19 | ||
|
|
3078423848 | ||
|
|
9953d73444 | ||
|
|
100136aae7 | ||
|
|
3c6e9aaa63 | ||
|
|
8fa39f2ae5 | ||
|
|
3aca72fb06 | ||
|
|
c46905e9a7 | ||
|
|
5ce96c7704 | ||
|
|
23eb77b8ac | ||
|
|
e63edc9d36 | ||
|
|
d33681eddd | ||
|
|
e7816cfb0c | ||
|
|
a268d8743d | ||
|
|
45db5c0d5e | ||
|
|
583661a15d | ||
|
|
461d5e0535 | ||
|
|
099d830e7e | ||
|
|
add59896f5 | ||
|
|
03b97fdb51 | ||
|
|
4c576fbd57 | ||
|
|
06ce1988f3 | ||
|
|
c059d79a51 | ||
|
|
b91c767d0c | ||
|
|
bb29edd30f | ||
|
|
b9a8b613bb | ||
|
|
76377d2d2c | ||
|
|
f4f09eaf9e |
No files matched your search
+28
-1
@@ -259,6 +259,8 @@ NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL=
|
|||||||
# This variable should only be set to 1 or true if you are in a non-prod environment and you want to
|
# This variable should only be set to 1 or true if you are in a non-prod environment and you want to
|
||||||
# use organizations
|
# use organizations
|
||||||
ORGANIZATIONS_ENABLED=
|
ORGANIZATIONS_ENABLED=
|
||||||
|
NEXT_PUBLIC_ORGANIZATIONS_MIN_SELF_SERVE_SEATS=30
|
||||||
|
NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE=3700 # $37.00 per seat
|
||||||
|
|
||||||
# This variable should only be set to 1 or true if you want to autolink external provider sing-ups with
|
# This variable should only be set to 1 or true if you want to autolink external provider sing-ups with
|
||||||
# existing organizations based on email domain address
|
# existing organizations based on email domain address
|
||||||
@@ -332,6 +334,8 @@ AB_TEST_BUCKET_PROBABILITY=50
|
|||||||
# whether we redirect to the future/event-types from event-types or not
|
# whether we redirect to the future/event-types from event-types or not
|
||||||
APP_ROUTER_EVENT_TYPES_ENABLED=0
|
APP_ROUTER_EVENT_TYPES_ENABLED=0
|
||||||
APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
|
APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
|
||||||
|
APP_ROUTER_SETTINGS_PLATFORM_ENABLED=0
|
||||||
|
APP_ROUTER_SETTINGS_ORG_ENABLED=0
|
||||||
APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
|
APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
|
||||||
APP_ROUTER_APPS_SLUG_ENABLED=0
|
APP_ROUTER_APPS_SLUG_ENABLED=0
|
||||||
APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
|
APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
|
||||||
@@ -339,13 +343,28 @@ APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
|
|||||||
APP_ROUTER_APPS_CATEGORIES_ENABLED=0
|
APP_ROUTER_APPS_CATEGORIES_ENABLED=0
|
||||||
# whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
|
# whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
|
||||||
APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
|
APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
|
||||||
|
APP_ROUTER_BOOKING_ENABLED=0
|
||||||
APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
|
APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
|
||||||
APP_ROUTER_WORKFLOWS_ENABLED=0
|
APP_ROUTER_WORKFLOWS_ENABLED=0
|
||||||
APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
|
APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
|
||||||
APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
|
APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
|
||||||
APP_ROUTER_APPS_ENABLED=0
|
APP_ROUTER_APPS_ENABLED=0
|
||||||
APP_ROUTER_VIDEO_ENABLED=0
|
APP_ROUTER_VIDEO_ENABLED=0
|
||||||
|
APP_ROUTER_TEAM_ENABLED=0
|
||||||
APP_ROUTER_TEAMS_ENABLED=0
|
APP_ROUTER_TEAMS_ENABLED=0
|
||||||
|
APP_ROUTER_AVAILABILITY_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_LOGIN_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_LOGOUT_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_NEW_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_SAML_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_ERROR_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_PLATFORM_ENABLED=0
|
||||||
|
APP_ROUTER_AUTH_OAUTH2_ENABLED=0
|
||||||
|
APP_ROUTER_MORE_ENABLED=0
|
||||||
|
APP_ROUTER_MAINTENANCE_ENABLED=0
|
||||||
|
APP_ROUTER_UPGRADE_ENABLED=0
|
||||||
|
APP_ROUTER_CONNECT_AND_JOIN_ENABLED=0
|
||||||
|
|
||||||
# disable setry server source maps
|
# disable setry server source maps
|
||||||
SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
|
SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
|
||||||
@@ -360,10 +379,18 @@ TASKER_ENABLE_EMAILS=0
|
|||||||
# Ratelimiting via unkey
|
# Ratelimiting via unkey
|
||||||
UNKEY_ROOT_KEY=
|
UNKEY_ROOT_KEY=
|
||||||
|
|
||||||
|
|
||||||
# Used for Cal.ai Enterprise Voice AI Agents
|
# Used for Cal.ai Enterprise Voice AI Agents
|
||||||
# https://retellai.com
|
# https://retellai.com
|
||||||
RETELL_AI_KEY=
|
RETELL_AI_KEY=
|
||||||
|
|
||||||
# Used to disallow emails as being added as guests on bookings
|
# Used to disallow emails as being added as guests on bookings
|
||||||
BLACKLISTED_GUEST_EMAILS=
|
BLACKLISTED_GUEST_EMAILS=
|
||||||
|
|
||||||
|
# Used to allow browser push notifications
|
||||||
|
# You can use: 'npx web-push generate-vapid-keys' to generate these keys
|
||||||
|
NEXT_PUBLIC_VAPID_PUBLIC_KEY=
|
||||||
|
VAPID_PRIVATE_KEY=
|
||||||
|
|
||||||
|
# Custom privacy policy / terms URLs (for self-hosters: change to your privacy policy / terms URLs)
|
||||||
|
NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=
|
||||||
|
NEXT_PUBLIC_WEBSITE_TERMS_URL=
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Report any issues with the platform
|
||||||
|
title: ""
|
||||||
|
labels: ["🐛 bug"]
|
||||||
|
assignees: ""
|
||||||
|
---
|
||||||
|
|
||||||
|
Found a bug? Please fill out the sections below. 👍
|
||||||
|
|
||||||
|
### Issue Summary
|
||||||
|
|
||||||
|
A summary of the issue. This needs to be a clear detailed-rich summary.
|
||||||
|
|
||||||
|
### Steps to Reproduce
|
||||||
|
|
||||||
|
1. (for example) Went to ...
|
||||||
|
2. Clicked on...
|
||||||
|
3. ...
|
||||||
|
|
||||||
|
Any other relevant information. For example, why do you consider this a bug and what did you expect to happen instead?
|
||||||
|
|
||||||
|
### Actual Results
|
||||||
|
|
||||||
|
- What's happening right now that is different from what is expected
|
||||||
|
|
||||||
|
### Expected Results
|
||||||
|
|
||||||
|
- This is an ideal result that the system should get after the tests are performed
|
||||||
|
|
||||||
|
### Technical details
|
||||||
|
|
||||||
|
- Browser version, screen recording, console logs, network requests: You can make a recording with [Bird Eats Bug](https://birdeatsbug.com/).
|
||||||
|
- Node.js version
|
||||||
|
- Anything else that you think could be an issue.
|
||||||
|
|
||||||
|
### Evidence
|
||||||
|
|
||||||
|
- How was this tested? This is quite mandatory in terms of bugs. Providing evidence of your testing with screenshots or/and videos is an amazing way to prove the bug and a troubleshooting chance to find the solution.
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
name: Bug report
|
|
||||||
description: "Please make sure you have checked for any duplicate issues."
|
|
||||||
title: "(bug)"
|
|
||||||
labels: ["🐛 bug"]
|
|
||||||
assignees: []
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: issue-summary
|
|
||||||
attributes:
|
|
||||||
label: Issue Summary
|
|
||||||
description: A summary of the issue. This needs to be a clear detailed-rich summary.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: steps-to-reproduce
|
|
||||||
attributes:
|
|
||||||
label: Steps to Reproduce
|
|
||||||
value: |
|
|
||||||
1. (for example) Went to ...
|
|
||||||
2. Clicked on...
|
|
||||||
3. ...
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: expected-behavior
|
|
||||||
attributes:
|
|
||||||
label: Expected behavior
|
|
||||||
description: A clear and concise description of what you expected to happen.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: other-information
|
|
||||||
attributes:
|
|
||||||
label: Other information
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
- type: textarea
|
|
||||||
id: screenshots
|
|
||||||
attributes:
|
|
||||||
label: Screenshots
|
|
||||||
description: If applicable, add screenshots to help explain your problem.
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
- type: checkboxes
|
|
||||||
id: environment
|
|
||||||
attributes:
|
|
||||||
label: Environment
|
|
||||||
options:
|
|
||||||
- label: app.cal.com
|
|
||||||
- label: Self-hosted Cal
|
|
||||||
- type: textarea
|
|
||||||
id: desktop-version
|
|
||||||
attributes:
|
|
||||||
label: Desktop (please complete the following information)
|
|
||||||
description: |
|
|
||||||
examples:
|
|
||||||
- **OS**: [e.g. iOS]
|
|
||||||
- **Browser**: [e.g. chrome, safari]
|
|
||||||
- **Version**: [e.g. 22]
|
|
||||||
value: |
|
|
||||||
- OS:
|
|
||||||
- Node:
|
|
||||||
- npm:
|
|
||||||
render: markdown
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: markdown
|
|
||||||
id: nodejs-version
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
#### Node.JS version
|
|
||||||
|
|
||||||
[e.g. v18.15.0]
|
|
||||||
- type: markdown
|
|
||||||
id: anything-else
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
#### Anything else?
|
|
||||||
|
|
||||||
- Screen recording, console logs, network requests: You can make a recording with [Loom](https://www.loom.com).
|
|
||||||
- Anything else that you think could be an issue?
|
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
## Mandatory Tasks (DO NOT REMOVE)
|
## Mandatory Tasks (DO NOT REMOVE)
|
||||||
|
|
||||||
- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
|
- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
|
||||||
- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com). If N/A, write N/A here and check the checkbox.
|
- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com/docs). If N/A, write N/A here and check the checkbox.
|
||||||
- [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
|
- [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
|
||||||
|
|
||||||
## How should this be tested?
|
## How should this be tested?
|
||||||
|
|||||||
@@ -37,8 +37,6 @@ runs:
|
|||||||
with:
|
with:
|
||||||
path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
|
path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
|
||||||
key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
|
key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
|
||||||
restore-keys: |
|
|
||||||
yarn-download-cache-
|
|
||||||
|
|
||||||
# Invalidated on yarn.lock changes
|
# Invalidated on yarn.lock changes
|
||||||
- name: Restore node_modules
|
- name: Restore node_modules
|
||||||
|
|||||||
@@ -3,6 +3,10 @@ description: "Install playwright, cache and restore if necessary"
|
|||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
steps:
|
steps:
|
||||||
|
- name: Get installed Playwright version
|
||||||
|
shell: bash
|
||||||
|
id: playwright-version
|
||||||
|
run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_ENV
|
||||||
- name: Cache playwright binaries
|
- name: Cache playwright binaries
|
||||||
id: playwright-cache
|
id: playwright-cache
|
||||||
uses: buildjet/cache@v4
|
uses: buildjet/cache@v4
|
||||||
@@ -11,9 +15,7 @@ runs:
|
|||||||
~/Library/Caches/ms-playwright
|
~/Library/Caches/ms-playwright
|
||||||
~/.cache/ms-playwright
|
~/.cache/ms-playwright
|
||||||
${{ github.workspace }}/node_modules/playwright
|
${{ github.workspace }}/node_modules/playwright
|
||||||
key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
|
key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
|
||||||
restore-keys: cache-playwright-
|
|
||||||
- name: Yarn playwright install
|
- name: Yarn playwright install
|
||||||
shell: bash
|
shell: bash
|
||||||
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
run: yarn playwright install --with-deps
|
||||||
run: yarn playwright install
|
|
||||||
@@ -34,6 +34,11 @@ jobs:
|
|||||||
uses: ./.github/workflows/api-v2-production-build.yml
|
uses: ./.github/workflows/api-v2-production-build.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
|
build-atoms:
|
||||||
|
name: Production builds
|
||||||
|
uses: ./.github/workflows/atoms-production-build.yml
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: Production builds
|
name: Production builds
|
||||||
uses: ./.github/workflows/production-build-without-database.yml
|
uses: ./.github/workflows/production-build-without-database.yml
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
name: Atoms production Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build atoms
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
runs-on: buildjet-4vcpu-ubuntu-2204
|
||||||
|
timeout-minutes: 30
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: ./.github/actions/dangerous-git-checkout
|
||||||
|
- uses: ./.github/actions/yarn-install
|
||||||
|
- name: Cache atoms production build
|
||||||
|
uses: buildjet/cache@v4
|
||||||
|
id: cache-atoms-build
|
||||||
|
env:
|
||||||
|
cache-name: atoms-build
|
||||||
|
key-1: ${{ hashFiles('yarn.lock') }}
|
||||||
|
key-2: ${{ hashFiles('packages/platform/atoms/**.[jt]s', 'packages/platform/atoms/**.[jt]sx', '!**/node_modules') }}
|
||||||
|
key-3: ${{ github.event.pull_request.number || github.ref }}
|
||||||
|
# Ensures production-build.yml will always be fresh
|
||||||
|
key-4: ${{ github.sha }}
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
**/dist/**
|
||||||
|
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}
|
||||||
|
- run: |
|
||||||
|
export NODE_OPTIONS="--max_old_space_size=8192"
|
||||||
|
if [ ${{ steps.cache-atoms-build.outputs.cache-hit }} == 'true' ]; then
|
||||||
|
echo "Cache hit for atoms build. Skipping build."
|
||||||
|
else
|
||||||
|
rm -rf packages/platform/atoms/node_modules
|
||||||
|
yarn install
|
||||||
|
yarn workspace @calcom/atoms run build
|
||||||
|
fi
|
||||||
|
shell: bash
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
name: Delete
|
||||||
|
|
||||||
|
on:
|
||||||
|
delete:
|
||||||
|
branches-ignore: [main, gh-pages]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
# ensures that currently running Playwright workflow of deleted branch gets cancelled
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.event.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
delete_reports:
|
||||||
|
name: Delete Reports
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
# Contains all reports for deleted branch
|
||||||
|
BRANCH_REPORTS_DIR: reports/${{ github.event.ref }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout GitHub Pages Branch
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
repository: calcom/test-results
|
||||||
|
ref: gh-pages
|
||||||
|
token: ${{ secrets.GH_ACCESS_TOKEN }}
|
||||||
|
- name: Set Git User
|
||||||
|
# see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
|
||||||
|
run: |
|
||||||
|
git config --global user.name "github-actions[bot]"
|
||||||
|
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
- name: Check for workflow reports
|
||||||
|
run: |
|
||||||
|
if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
|
||||||
|
echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
|
||||||
|
else
|
||||||
|
echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
|
- name: Delete reports from repo for branch
|
||||||
|
if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
|
||||||
|
timeout-minutes: 3
|
||||||
|
run: |
|
||||||
|
cd $BRANCH_REPORTS_DIR/..
|
||||||
|
|
||||||
|
rm -rf ${{ github.event.ref }}
|
||||||
|
git add .
|
||||||
|
git commit -m "workflow: remove all reports for branch ${{ github.event.ref }}"
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
git pull --rebase
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed to rebase. Please review manually."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
git push
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo "Successfully pushed HTML reports to repo."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
name: Crowdin Action
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
synchronize-with-crowdin:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_ACCESS_TOKEN }}
|
|
||||||
|
|
||||||
- name: crowdin action
|
|
||||||
uses: crowdin/github-action@v1.13.0
|
|
||||||
with:
|
|
||||||
# upload sources
|
|
||||||
upload_sources: true
|
|
||||||
|
|
||||||
# upload translations (& auto-approve 'em)
|
|
||||||
upload_translations_args: '--auto-approve-imported'
|
|
||||||
upload_translations: true
|
|
||||||
push_translations: true
|
|
||||||
|
|
||||||
# download translations
|
|
||||||
download_translations: true
|
|
||||||
|
|
||||||
# GH config
|
|
||||||
commit_message: "New Crowdin translations by Github Action"
|
|
||||||
localization_branch_name: main
|
|
||||||
create_pull_request: false
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
|
|
||||||
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
|
|
||||||
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
|
|
||||||
@@ -45,6 +45,9 @@ jobs:
|
|||||||
- 5432:5432
|
- 5432:5432
|
||||||
redis:
|
redis:
|
||||||
image: redis:latest
|
image: redis:latest
|
||||||
|
credentials:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
ports:
|
ports:
|
||||||
- 6379:6379
|
- 6379:6379
|
||||||
options: >-
|
options: >-
|
||||||
|
|||||||
@@ -98,5 +98,5 @@ jobs:
|
|||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: app-store-results
|
name: blob-report-app-store
|
||||||
path: test-results
|
path: blob-report
|
||||||
@@ -85,5 +85,5 @@ jobs:
|
|||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: embed-react-results
|
name: blob-report-embed-react
|
||||||
path: test-results
|
path: blob-report
|
||||||
@@ -91,5 +91,5 @@ jobs:
|
|||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: embed-core-results
|
name: blob-report-embed-core
|
||||||
path: test-results
|
path: blob-report
|
||||||
@@ -89,8 +89,9 @@ jobs:
|
|||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: yarn e2e --shard=${{ matrix.shard }}/${{ strategy.job-total }}
|
run: yarn e2e --shard=${{ matrix.shard }}/${{ strategy.job-total }}
|
||||||
- name: Upload Test Results
|
- name: Upload Test Results
|
||||||
if: ${{ always() }}
|
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
if: always()
|
||||||
with:
|
with:
|
||||||
name: test-results-${{ matrix.shard }}_${{ strategy.job-total }}
|
name: blob-report-${{ matrix.shard }}
|
||||||
path: test-results
|
path: blob-report
|
||||||
|
retention-days: 30
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
name: Run i18n AI automation
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-main
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
i18n:
|
||||||
|
name: Run i18n
|
||||||
|
runs-on: buildjet-2vcpu-ubuntu-2204
|
||||||
|
permissions:
|
||||||
|
actions: write
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: replexica/replexica@main
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
|
||||||
|
with:
|
||||||
|
api-key: ${{ secrets.CI_REPLEXICA_API_KEY }}
|
||||||
|
pull-request: true
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# https://playwright.dev/docs/test-sharding#merging-reports-from-multiple-shards
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
jobs:
|
||||||
|
merge-reports:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: ./.github/actions/dangerous-git-checkout
|
||||||
|
- uses: ./.github/actions/yarn-install
|
||||||
|
- uses: ./.github/actions/yarn-playwright-install
|
||||||
|
- name: Download blob reports from GitHub Actions Artifacts
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
path: all-blob-reports
|
||||||
|
pattern: blob-report-*
|
||||||
|
merge-multiple: true
|
||||||
|
- name: Merge into HTML Report
|
||||||
|
run: yarn playwright merge-reports --reporter html ./all-blob-reports
|
||||||
|
- name: Upload HTML report
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
|
||||||
|
path: playwright-report
|
||||||
|
retention-days: 14
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
name: PR Reviewed
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request_review:
|
|
||||||
types: [submitted]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
label-pr:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Label PR as ready for E2E
|
|
||||||
if: github.event.review.state == 'approved'
|
|
||||||
uses: actions-ecosystem/action-add-labels@v1
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
labels: 'ready-for-e2e'
|
|
||||||
@@ -91,44 +91,57 @@ jobs:
|
|||||||
console.log('Found the label?', labelFound);
|
console.log('Found the label?', labelFound);
|
||||||
core.setOutput('run-e2e', labelFound);
|
core.setOutput('run-e2e', labelFound);
|
||||||
|
|
||||||
|
deps:
|
||||||
|
name: Install dependencies
|
||||||
|
needs: [changes, check-label]
|
||||||
|
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
|
uses: ./.github/workflows/yarn-install.yml
|
||||||
|
|
||||||
type-check:
|
type-check:
|
||||||
name: Type check
|
name: Type check
|
||||||
needs: [changes, check-label]
|
needs: [changes, check-label, deps]
|
||||||
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
uses: ./.github/workflows/check-types.yml
|
uses: ./.github/workflows/check-types.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
name: Linters
|
name: Linters
|
||||||
needs: [changes, check-label]
|
needs: [changes, check-label, deps]
|
||||||
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
uses: ./.github/workflows/lint.yml
|
uses: ./.github/workflows/lint.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
unit-test:
|
unit-test:
|
||||||
name: Tests
|
name: Tests
|
||||||
needs: [changes, check-label]
|
needs: [changes, check-label, deps]
|
||||||
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
uses: ./.github/workflows/unit-tests.yml
|
uses: ./.github/workflows/unit-tests.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
build-api-v1:
|
build-api-v1:
|
||||||
name: Production builds
|
name: Production builds
|
||||||
needs: [changes, check-label]
|
needs: [changes, check-label, deps]
|
||||||
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
uses: ./.github/workflows/api-v1-production-build.yml
|
uses: ./.github/workflows/api-v1-production-build.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
build-api-v2:
|
build-api-v2:
|
||||||
name: Production builds
|
name: Production builds
|
||||||
needs: [changes, check-label]
|
needs: [changes, check-label, deps]
|
||||||
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
uses: ./.github/workflows/api-v2-production-build.yml
|
uses: ./.github/workflows/api-v2-production-build.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
|
build-atoms:
|
||||||
|
name: Production builds
|
||||||
|
needs: [changes, check-label, deps]
|
||||||
|
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
|
uses: ./.github/workflows/atoms-production-build.yml
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: Production builds
|
name: Production builds
|
||||||
needs: [changes, check-label]
|
needs: [changes, check-label, deps]
|
||||||
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
uses: ./.github/workflows/production-build-without-database.yml
|
uses: ./.github/workflows/production-build-without-database.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
@@ -181,8 +194,42 @@ jobs:
|
|||||||
uses: ./.github/workflows/nextjs-bundle-analysis.yml
|
uses: ./.github/workflows/nextjs-bundle-analysis.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
|
merge-reports:
|
||||||
|
name: Merge reports
|
||||||
|
if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
|
needs: [changes, check-label, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
|
||||||
|
uses: ./.github/workflows/merge-reports.yml
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
|
publish-report:
|
||||||
|
name: Publish HTML report
|
||||||
|
if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
needs: [changes, check-label, merge-reports]
|
||||||
|
uses: ./.github/workflows/publish-report.yml
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
required:
|
required:
|
||||||
needs: [changes, lint, type-check, unit-test, integration-test, check-label, build, build-api-v1, build-api-v2, e2e, e2e-api-v2, e2e-embed, e2e-embed-react, e2e-app-store]
|
needs:
|
||||||
|
[
|
||||||
|
changes,
|
||||||
|
lint,
|
||||||
|
type-check,
|
||||||
|
unit-test,
|
||||||
|
integration-test,
|
||||||
|
check-label,
|
||||||
|
build,
|
||||||
|
build-api-v1,
|
||||||
|
build-api-v2,
|
||||||
|
e2e,
|
||||||
|
e2e-api-v2,
|
||||||
|
e2e-embed,
|
||||||
|
e2e-embed-react,
|
||||||
|
e2e-app-store,
|
||||||
|
]
|
||||||
if: always()
|
if: always()
|
||||||
runs-on: buildjet-2vcpu-ubuntu-2204
|
runs-on: buildjet-2vcpu-ubuntu-2204
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
jobs:
|
||||||
|
publish-report:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
continue-on-error: true
|
||||||
|
env:
|
||||||
|
# Unique URL path for each workflow run attempt
|
||||||
|
HTML_REPORT_URL_PATH: reports/${{ github.head_ref }}/${{ github.run_id }}/${{ github.run_attempt }}
|
||||||
|
BRANCH_REPORTS_DIR: reports/${{ github.head_ref }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout GitHub Pages Branch
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
repository: calcom/test-results
|
||||||
|
ref: gh-pages
|
||||||
|
token: ${{ secrets.GH_ACCESS_TOKEN }}
|
||||||
|
- name: Set Git User
|
||||||
|
# see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
|
||||||
|
run: |
|
||||||
|
git config --global user.name "github-actions[bot]"
|
||||||
|
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
- name: Check for workflow reports
|
||||||
|
run: |
|
||||||
|
if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
|
||||||
|
echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
|
||||||
|
else
|
||||||
|
echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
|
- name: Cleanup old HTML reports
|
||||||
|
if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
|
||||||
|
timeout-minutes: 3
|
||||||
|
run: |
|
||||||
|
rm -rf $BRANCH_REPORTS_DIR
|
||||||
|
git add .
|
||||||
|
git commit -m "workflow: remove all reports for branch ${{ github.head_ref }}"
|
||||||
|
- name: Download zipped HTML report
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
|
||||||
|
path: ${{ env.HTML_REPORT_URL_PATH }}
|
||||||
|
- name: Push HTML Report
|
||||||
|
timeout-minutes: 3
|
||||||
|
# commit report, then try push-rebase-loop until it's able to merge the HTML report to the gh-pages branch
|
||||||
|
# this is necessary when this job running at least twice at the same time (e.g. through two pushes at the same time)
|
||||||
|
run: |
|
||||||
|
git add .
|
||||||
|
git commit -m "workflow: add HTML report for run-id ${{ github.run_id }} (attempt: ${{ github.run_attempt }})"
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
git pull --rebase
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed to rebase. Please review manually."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
git push
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo "Successfully pushed HTML report to repo."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
- name: Output Report URL as Workflow Annotation
|
||||||
|
id: url
|
||||||
|
run: |
|
||||||
|
FULL_HTML_REPORT_URL=https://calcom.github.io/test-results/$HTML_REPORT_URL_PATH
|
||||||
|
echo "::notice title=📋 Published Playwright Test Report::$FULL_HTML_REPORT_URL"
|
||||||
|
echo "link=$FULL_HTML_REPORT_URL" >> $GITHUB_OUTPUT
|
||||||
|
- name: Find Comment
|
||||||
|
uses: peter-evans/find-comment@v2
|
||||||
|
id: fc
|
||||||
|
with:
|
||||||
|
issue-number: ${{ github.event.pull_request.number }}
|
||||||
|
comment-author: "github-actions[bot]"
|
||||||
|
body-includes: <!-- GENERATED-E2E-RESULTS -->
|
||||||
|
- name: Create comment
|
||||||
|
if: steps.fc.outputs.comment-id == ''
|
||||||
|
uses: peter-evans/create-or-update-comment@v3
|
||||||
|
with:
|
||||||
|
issue-number: ${{ github.event.pull_request.number }}
|
||||||
|
body: |
|
||||||
|
<!-- GENERATED-E2E-RESULTS -->
|
||||||
|
## E2E results are ready!
|
||||||
|
- [Workflow #${{ github.run_number }}.${{ github.run_attempt }} latest results](${{ steps.url.outputs.link }})
|
||||||
|
- name: Update comment
|
||||||
|
if: steps.fc.outputs.comment-id != ''
|
||||||
|
uses: peter-evans/create-or-update-comment@v3
|
||||||
|
with:
|
||||||
|
comment-id: ${{ steps.fc.outputs.comment-id }}
|
||||||
|
edit-mode: replace
|
||||||
|
body: |
|
||||||
|
<!-- GENERATED-E2E-RESULTS -->
|
||||||
|
## E2E results are ready!
|
||||||
|
- [Workflow #${{ github.run_number }}.${{ github.run_attempt }} latest results](${{ steps.url.outputs.link }})
|
||||||
@@ -15,3 +15,4 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: ./.github/actions/dangerous-git-checkout
|
- uses: ./.github/actions/dangerous-git-checkout
|
||||||
- uses: ./.github/actions/yarn-install
|
- uses: ./.github/actions/yarn-install
|
||||||
|
- uses: ./.github/actions/yarn-playwright-install
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/runtime/binary.js b/runtime/binary.js
|
||||||
|
index c81267d752644043e97b35d26369a5ce266abfd0..034c11262143d1acbf9902745a441d3b0cdfc0fd 100644
|
||||||
|
--- a/runtime/binary.js
|
||||||
|
+++ b/runtime/binary.js
|
||||||
|
@@ -185,7 +185,7 @@ It should have this form: { url: "CONNECTION_STRING" }`);if(r&&typeof r=="object
|
||||||
|
It should have this form: { url: "CONNECTION_STRING" }`);if(typeof i!="string")throw new Me(`Invalid value ${JSON.stringify(i)} for datasource "${t}" provided to PrismaClient constructor.
|
||||||
|
It should have this form: { url: "CONNECTION_STRING" }`)}}}},adapter:(e,A)=>{if(e===null)return;if(e===void 0)throw new Me('"adapter" property must not be undefined, use null to conditionally disable driver adapters.');if(!cg(A).includes("driverAdapters"))throw new Me('"adapter" property can only be provided to PrismaClient constructor when "driverAdapters" preview feature is enabled.')},datasourceUrl:e=>{if(typeof e<"u"&&typeof e!="string")throw new Me(`Invalid value ${JSON.stringify(e)} for "datasourceUrl" provided to PrismaClient constructor.
|
||||||
|
Expected string or undefined.`)},errorFormat:e=>{if(e){if(typeof e!="string")throw new Me(`Invalid value ${JSON.stringify(e)} for "errorFormat" provided to PrismaClient constructor.`);if(!PR.includes(e)){let A=Ni(e,PR);throw new Me(`Invalid errorFormat ${e} provided to PrismaClient constructor.${A}`)}}},log:e=>{if(!e)return;if(!Array.isArray(e))throw new Me(`Invalid value ${JSON.stringify(e)} for "log" provided to PrismaClient constructor.`);function A(t){if(typeof t=="string"&&!GR.includes(t)){let r=Ni(t,GR);throw new Me(`Invalid log level "${t}" provided to PrismaClient constructor.${r}`)}}for(let t of e){A(t);let r={level:A,emit:n=>{let i=["stdout","event"];if(!i.includes(n)){let s=Ni(n,i);throw new Me(`Invalid value ${JSON.stringify(n)} for "emit" in logLevel provided to PrismaClient constructor.${s}`)}}};if(t&&typeof t=="object")for(let[n,i]of Object.entries(t))if(r[n])r[n](i);else throw new Me(`Invalid property ${n} for "log" provided to PrismaClient constructor`)}},__internal:e=>{if(!e)return;let A=["debug","hooks","engine","measurePerformance"];if(typeof e!="object")throw new Me(`Invalid value ${JSON.stringify(e)} for "__internal" to PrismaClient constructor`);for(let[t]of Object.entries(e))if(!A.includes(t)){let r=Ni(t,A);throw new Me(`Invalid property ${JSON.stringify(t)} for "__internal" provided to PrismaClient constructor.${r}`)}}};function YR(e,A){for(let[t,r]of Object.entries(e)){if(!vR.includes(t)){let n=Ni(t,vR);throw new Me(`Unknown property ${t} provided to PrismaClient constructor.${n}`)}VJ[t](r,A)}if(e.datasourceUrl&&e.datasources)throw new Me('Can not use "datasourceUrl" and "datasources" options at the same time. Pick one of them')}function Ni(e,A){if(A.length===0||typeof e!="string")return"";let t=qJ(e,A);return t?` Did you mean "${t}"?`:""}function qJ(e,A){if(A.length===0)return null;let t=A.map(n=>({value:n,distance:(0,JR.default)(e,n)}));t.sort((n,i)=>n.distance<i.distance?-1:1);let r=t[0];return r.distance<3?r.value:null}function VR(e){return e.length===0?Promise.resolve([]):new Promise((A,t)=>{let r=new Array(e.length),n=null,i=!1,s=0,o=()=>{i||(s++,s===e.length&&(i=!0,n?t(n):A(r)))},a=c=>{i||(i=!0,t(c))};for(let c=0;c<e.length;c++)e[c].then(g=>{r[c]=g,o()},g=>{if(!Cg(g)){a(g);return}g.batchRequestIdx===c?a(g):(n||(n=g),o())})})}var pr=ce("prisma:client");typeof globalThis=="object"&&(globalThis.NODE_CLIENT=!0);var OJ={requestArgsToMiddlewareArgs:e=>e,middlewareArgsToRequestArgs:e=>e},HJ=Symbol.for("prisma.client.transaction.id"),WJ={id:0,nextId(){return++this.id}};function _R(e){class A{constructor(r){this._middlewares=new dg;this._createPrismaPromise=ed();this.$extends=Xf;EI(e),r&&YR(r,e);let n=r?.adapter?cf(r.adapter):void 0,i=new HR.EventEmitter().on("error",()=>{});this._extensions=wa.empty(),this._previewFeatures=cg(e),this._clientVersion=e.clientVersion??TR,this._activeProvider=e.activeProvider,this._tracingHelper=DR(this._previewFeatures);let s={rootEnvPath:e.relativeEnvPaths.rootEnvPath&&Qo.default.resolve(e.dirname,e.relativeEnvPaths.rootEnvPath),schemaEnvPath:e.relativeEnvPaths.schemaEnvPath&&Qo.default.resolve(e.dirname,e.relativeEnvPaths.schemaEnvPath)},o=!n&&qi(s,{conflictCheck:"none"})||e.injectableEdgeEnv?.();try{let a=r??{},c=a.__internal??{},g=c.debug===!0;g&&ce.enable("prisma:client");let l=Qo.default.resolve(e.dirname,e.relativePath);WR.default.existsSync(l)||(l=e.dirname),pr("dirname",e.dirname),pr("relativePath",e.relativePath),pr("cwd",l);let u=c.engine||{};if(a.errorFormat?this._errorFormat=a.errorFormat:process.env.NODE_ENV==="production"?this._errorFormat="minimal":process.env.NO_COLOR?this._errorFormat="colorless":this._errorFormat="colorless",this._runtimeDataModel=e.runtimeDataModel,this._engineConfig={cwd:l,dirname:e.dirname,enableDebugLogs:g,allowTriggerPanic:u.allowTriggerPanic,datamodelPath:Qo.default.join(e.dirname,e.filename??"schema.prisma"),prismaPath:u.binaryPath??void 0,engineEndpoint:u.endpoint,generator:e.generator,showColors:this._errorFormat==="pretty",logLevel:a.log&&kR(a.log),logQueries:a.log&&!!(typeof a.log=="string"?a.log==="query":a.log.find(E=>typeof E=="string"?E==="query":E.level==="query")),env:o?.parsed??{},flags:[],clientVersion:e.clientVersion,engineVersion:e.engineVersion,previewFeatures:this._previewFeatures,activeProvider:e.activeProvider,inlineSchema:e.inlineSchema,overrideDatasources:hI(a,e.datasourceNames),inlineDatasources:e.inlineDatasources,inlineSchemaHash:e.inlineSchemaHash,tracingHelper:this._tracingHelper,logEmitter:i,isBundled:e.isBundled,adapter:n},pr("clientVersion",e.clientVersion),this._engine=tR(e,this._engineConfig),this._requestHandler=new Ig(this,i),a.log)for(let E of a.log){let h=typeof E=="string"?E:E.emit==="stdout"?E.level:null;h&&this.$on(h,d=>{Wi.log(`${Wi.tags[h]??""}`,d.message||d.query)})}this._metrics=new yn(this._engine)}catch(a){throw a.clientVersion=this._clientVersion,a}return this._appliedParent=is(this)}get[Symbol.toStringTag](){return"PrismaClient"}$use(r){this._middlewares.use(r)}$o
Line truncated
|
||||||
|
-`)),g?.kind==="batch"&&await g.lock,this._requestHandler.request({protocolQuery:d,modelName:a,action:o,clientMethod:n,dataPath:i,callsite:s,args:r,extensions:this._extensions,transaction:g,unpacker:l,otelParentCtx:u,otelChildCtx:this._tracingHelper.getActiveContext(),customDataProxyFetch:E})}catch(h){throw h.clientVersion=this._clientVersion,h}}get $metrics(){if(!this._hasPreviewFlag("metrics"))throw new AA("`metrics` preview feature must be enabled in order to access metrics API",{clientVersion:this._clientVersion});return this._metrics}_hasPreviewFlag(r){return!!this._engineConfig.previewFeatures?.includes(r)}}return A}function qR(e,A){return _J(e)?[new QA(e,A),mR]:[e,yR]}function _J(e){return Array.isArray(e)&&Array.isArray(e.raw)}var KJ=new Set(["toJSON","$$typeof","asymmetricMatch",Symbol.iterator,Symbol.toStringTag,Symbol.isConcatSpreadable,Symbol.toPrimitive]);function KR(e){return new Proxy(e,{get(A,t){if(t in A)return A[t];if(!KJ.has(t))throw new TypeError(`Invalid enum value: ${String(t)}`)}})}function jR(e){qi(e,{conflictCheck:"warn"})}0&&(module.exports={DMMF,DMMFClass,Debug,Decimal,Extensions,MetricsClient,NotFoundError,ObjectEnumValue,PrismaClientInitializationError,PrismaClientKnownRequestError,PrismaClientRustPanicError,PrismaClientUnknownRequestError,PrismaClientValidationError,Public,Sql,Types,defineDmmfProperty,empty,getPrismaClient,itxClientDenyList,join,makeStrictEnum,objectEnumNames,objectEnumValues,raw,sqltag,warnEnvConflicts,warnOnce});
|
||||||
|
+`)),g?.kind==="batch"&&await g.lock,this._requestHandler.request({protocolQuery:d,modelName:a,action:o,clientMethod:n,dataPath:i,callsite:s,args:r,extensions:this._extensions,transaction:g,unpacker:l,otelParentCtx:u,otelChildCtx:this._tracingHelper.getActiveContext(),customDataProxyFetch:E})}catch(h){throw h.clientVersion=this._clientVersion,h}}get $metrics(){if(!this._hasPreviewFlag("metrics"))throw new AA("`metrics` preview feature must be enabled in order to access metrics API",{clientVersion:this._clientVersion});return this._metrics}_hasPreviewFlag(r){return!!this._engineConfig.previewFeatures?.includes(r)}}return A}function qR(e,A){return _J(e)?[new QA(e,A),mR]:[e,yR]}function _J(e){return Array.isArray(e)&&Array.isArray(e.raw)}var KJ=new Set(["toJSON","$$typeof","asymmetricMatch",Symbol.iterator,Symbol.toStringTag,Symbol.isConcatSpreadable,Symbol.toPrimitive]);function KR(e){return new Proxy(e,{get(A,t){if(t in A)return A[t];if(!KJ.has(t))throw new TypeError(`Invalid enum value: ${String(t)}`)}})}function jR(e){qi(e,{conflictCheck:"none"})}0&&(module.exports={DMMF,DMMFClass,Debug,Decimal,Extensions,MetricsClient,NotFoundError,ObjectEnumValue,PrismaClientInitializationError,PrismaClientKnownRequestError,PrismaClientRustPanicError,PrismaClientUnknownRequestError,PrismaClientValidationError,Public,Sql,Types,defineDmmfProperty,empty,getPrismaClient,itxClientDenyList,join,makeStrictEnum,objectEnumNames,objectEnumValues,raw,sqltag,warnEnvConflicts,warnOnce});
|
||||||
|
/*! Bundled license information:
|
||||||
|
|
||||||
|
undici/lib/fetch/body.js:
|
||||||
|
diff --git a/runtime/library.js b/runtime/library.js
|
||||||
|
index 65b30894c697f97a54924dcf7acc4b7e45002f4d..b2d26124f34759bb222a08e76bcc0f6d52b3c573 100644
|
||||||
|
--- a/runtime/library.js
|
||||||
|
+++ b/runtime/library.js
|
||||||
|
@@ -126,7 +126,7 @@ It should have this form: { url: "CONNECTION_STRING" }`);if(n&&typeof n=="object
|
||||||
|
It should have this form: { url: "CONNECTION_STRING" }`);if(typeof o!="string")throw new q(`Invalid value ${JSON.stringify(o)} for datasource "${r}" provided to PrismaClient constructor.
|
||||||
|
It should have this form: { url: "CONNECTION_STRING" }`)}}}},adapter:(e,t)=>{if(e===null)return;if(e===void 0)throw new q('"adapter" property must not be undefined, use null to conditionally disable driver adapters.');if(!gn(t).includes("driverAdapters"))throw new q('"adapter" property can only be provided to PrismaClient constructor when "driverAdapters" preview feature is enabled.')},datasourceUrl:e=>{if(typeof e<"u"&&typeof e!="string")throw new q(`Invalid value ${JSON.stringify(e)} for "datasourceUrl" provided to PrismaClient constructor.
|
||||||
|
Expected string or undefined.`)},errorFormat:e=>{if(e){if(typeof e!="string")throw new q(`Invalid value ${JSON.stringify(e)} for "errorFormat" provided to PrismaClient constructor.`);if(!Cl.includes(e)){let t=Rt(e,Cl);throw new q(`Invalid errorFormat ${e} provided to PrismaClient constructor.${t}`)}}},log:e=>{if(!e)return;if(!Array.isArray(e))throw new q(`Invalid value ${JSON.stringify(e)} for "log" provided to PrismaClient constructor.`);function t(r){if(typeof r=="string"&&!Al.includes(r)){let n=Rt(r,Al);throw new q(`Invalid log level "${r}" provided to PrismaClient constructor.${n}`)}}for(let r of e){t(r);let n={level:t,emit:i=>{let o=["stdout","event"];if(!o.includes(i)){let s=Rt(i,o);throw new q(`Invalid value ${JSON.stringify(i)} for "emit" in logLevel provided to PrismaClient constructor.${s}`)}}};if(r&&typeof r=="object")for(let[i,o]of Object.entries(r))if(n[i])n[i](o);else throw new q(`Invalid property ${i} for "log" provided to PrismaClient constructor`)}},__internal:e=>{if(!e)return;let t=["debug","hooks","engine","measurePerformance"];if(typeof e!="object")throw new q(`Invalid value ${JSON.stringify(e)} for "__internal" to PrismaClient constructor`);for(let[r]of Object.entries(e))if(!t.includes(r)){let n=Rt(r,t);throw new q(`Invalid property ${JSON.stringify(r)} for "__internal" provided to PrismaClient constructor.${n}`)}}};function Ml(e,t){for(let[r,n]of Object.entries(e)){if(!Tl.includes(r)){let i=Rt(r,Tl);throw new q(`Unknown property ${r} provided to PrismaClient constructor.${i}`)}Xd[r](n,t)}if(e.datasourceUrl&&e.datasources)throw new q('Can not use "datasourceUrl" and "datasources" options at the same time. Pick one of them')}function Rt(e,t){if(t.length===0||typeof e!="string")return"";let r=em(e,t);return r?` Did you mean "${r}"?`:""}function em(e,t){if(t.length===0)return null;let r=t.map(i=>({value:i,distance:(0,Rl.default)(e,i)}));r.sort((i,o)=>i.distance<o.distance?-1:1);let n=r[0];return n.distance<3?n.value:null}function Sl(e){return e.length===0?Promise.resolve([]):new Promise((t,r)=>{let n=new Array(e.length),i=null,o=!1,s=0,a=()=>{o||(s++,s===e.length&&(o=!0,i?r(i):t(n)))},l=u=>{o||(o=!0,r(u))};for(let u=0;u<e.length;u++)e[u].then(c=>{n[u]=c,a()},c=>{if(!Pn(c)){l(c);return}c.batchRequestIdx===u?l(c):(i||(i=c),a())})})}var Ue=D("prisma:client");typeof globalThis=="object"&&(globalThis.NODE_CLIENT=!0);var tm={requestArgsToMiddlewareArgs:e=>e,middlewareArgsToRequestArgs:e=>e},rm=Symbol.for("prisma.client.transaction.id"),nm={id:0,nextId(){return++this.id}};function Dl(e){class t{constructor(n){this._middlewares=new wn;this._createPrismaPromise=Hi();this.$extends=ra;xa(e),n&&Ml(n,e);let i=n?.adapter?fs(n.adapter):void 0,o=new Fl.EventEmitter().on("error",()=>{});this._extensions=ln.empty(),this._previewFeatures=gn(e),this._clientVersion=e.clientVersion??wl,this._activeProvider=e.activeProvider,this._tracingHelper=ml(this._previewFeatures);let s={rootEnvPath:e.relativeEnvPaths.rootEnvPath&&yr.default.resolve(e.dirname,e.relativeEnvPaths.rootEnvPath),schemaEnvPath:e.relativeEnvPaths.schemaEnvPath&&yr.default.resolve(e.dirname,e.relativeEnvPaths.schemaEnvPath)},a=!i&&_t(s,{conflictCheck:"none"})||e.injectableEdgeEnv?.();try{let l=n??{},u=l.__internal??{},c=u.debug===!0;c&&D.enable("prisma:client");let p=yr.default.resolve(e.dirname,e.relativePath);Ol.default.existsSync(p)||(p=e.dirname),Ue("dirname",e.dirname),Ue("relativePath",e.relativePath),Ue("cwd",p);let d=u.engine||{};if(l.errorFormat?this._errorFormat=l.errorFormat:process.env.NODE_ENV==="production"?this._errorFormat="minimal":process.env.NO_COLOR?this._errorFormat="colorless":this._errorFormat="colorless",this._runtimeDataModel=e.runtimeDataModel,this._engineConfig={cwd:p,dirname:e.dirname,enableDebugLogs:c,allowTriggerPanic:d.allowTriggerPanic,datamodelPath:yr.default.join(e.dirname,e.filename??"schema.prisma"),prismaPath:d.binaryPath??void 0,engineEndpoint:d.endpoint,generator:e.generator,showColors:this._errorFormat==="pretty",logLevel:l.log&&gl(l.log),logQueries:l.log&&!!(typeof l.log=="string"?l.log==="query":l.log.find(f=>typeof f=="string"?f==="query":f.level==="query")),env:a?.parsed??{},flags:[],clientVersion:e.clientVersion,engineVersion:e.engineVersion,previewFeatures:this._previewFeatures,activeProvider:e.activeProvider,inlineSchema:e.inlineSchema,overrideDatasources:ba(l,e.datasourceNames),inlineDatasources:e.inlineDatasources,inlineSchemaHash:e.inlineSchemaHash,tracingHelper:this._tracingHelper,logEmitter:o,isBundled:e.isBundled,adapter:i},Ue("clientVersion",e.clientVersion),this._engine=Ua(e,this._engineConfig),this._requestHandler=new Cn(this,o),l.log)for(let f of l.log){let y=typeof f=="string"?f:f.emit==="stdout"?f.level:null;y&&this.$on(y,g=>{$t.log(`${$t.tags[y]??""}`,g.message||g.query)})}this._metrics=new dt(this._engine)}catch(l){throw l.clientVersion=this._clientVersion,l}return this._appliedParent=zt(this)}get[Symbol.toStringTag](){return"PrismaClient"}$use(n){this._middlewares.use(n)}$on(n,i){n==="
Line truncated
|
||||||
|
-`)),c?.kind==="batch"&&await c.lock,this._requestHandler.request({protocolQuery:g,modelName:l,action:a,clientMethod:i,dataPath:o,callsite:s,args:n,extensions:this._extensions,transaction:c,unpacker:p,otelParentCtx:d,otelChildCtx:this._tracingHelper.getActiveContext(),customDataProxyFetch:f})}catch(y){throw y.clientVersion=this._clientVersion,y}}get $metrics(){if(!this._hasPreviewFlag("metrics"))throw new X("`metrics` preview feature must be enabled in order to access metrics API",{clientVersion:this._clientVersion});return this._metrics}_hasPreviewFlag(n){return!!this._engineConfig.previewFeatures?.includes(n)}}return t}function Il(e,t){return im(e)?[new oe(e,t),ul]:[e,cl]}function im(e){return Array.isArray(e)&&Array.isArray(e.raw)}var om=new Set(["toJSON","$$typeof","asymmetricMatch",Symbol.iterator,Symbol.toStringTag,Symbol.isConcatSpreadable,Symbol.toPrimitive]);function _l(e){return new Proxy(e,{get(t,r){if(r in t)return t[r];if(!om.has(r))throw new TypeError(`Invalid enum value: ${String(r)}`)}})}function Nl(e){_t(e,{conflictCheck:"warn"})}0&&(module.exports={DMMF,DMMFClass,Debug,Decimal,Extensions,MetricsClient,NotFoundError,ObjectEnumValue,PrismaClientInitializationError,PrismaClientKnownRequestError,PrismaClientRustPanicError,PrismaClientUnknownRequestError,PrismaClientValidationError,Public,Sql,Types,defineDmmfProperty,empty,getPrismaClient,itxClientDenyList,join,makeStrictEnum,objectEnumNames,objectEnumValues,raw,sqltag,warnEnvConflicts,warnOnce});
|
||||||
|
+`)),c?.kind==="batch"&&await c.lock,this._requestHandler.request({protocolQuery:g,modelName:l,action:a,clientMethod:i,dataPath:o,callsite:s,args:n,extensions:this._extensions,transaction:c,unpacker:p,otelParentCtx:d,otelChildCtx:this._tracingHelper.getActiveContext(),customDataProxyFetch:f})}catch(y){throw y.clientVersion=this._clientVersion,y}}get $metrics(){if(!this._hasPreviewFlag("metrics"))throw new X("`metrics` preview feature must be enabled in order to access metrics API",{clientVersion:this._clientVersion});return this._metrics}_hasPreviewFlag(n){return!!this._engineConfig.previewFeatures?.includes(n)}}return t}function Il(e,t){return im(e)?[new oe(e,t),ul]:[e,cl]}function im(e){return Array.isArray(e)&&Array.isArray(e.raw)}var om=new Set(["toJSON","$$typeof","asymmetricMatch",Symbol.iterator,Symbol.toStringTag,Symbol.isConcatSpreadable,Symbol.toPrimitive]);function _l(e){return new Proxy(e,{get(t,r){if(r in t)return t[r];if(!om.has(r))throw new TypeError(`Invalid enum value: ${String(r)}`)}})}function Nl(e){_t(e,{conflictCheck:"none"})}0&&(module.exports={DMMF,DMMFClass,Debug,Decimal,Extensions,MetricsClient,NotFoundError,ObjectEnumValue,PrismaClientInitializationError,PrismaClientKnownRequestError,PrismaClientRustPanicError,PrismaClientUnknownRequestError,PrismaClientValidationError,Public,Sql,Types,defineDmmfProperty,empty,getPrismaClient,itxClientDenyList,join,makeStrictEnum,objectEnumNames,objectEnumValues,raw,sqltag,warnEnvConflicts,warnOnce});
|
||||||
|
/*! Bundled license information:
|
||||||
|
|
||||||
|
decimal.js/decimal.mjs:
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<a href="https://cal.com"><strong>Learn more »</strong></a>
|
<a href="https://cal.com"><strong>Learn more »</strong></a>
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<br />
|
||||||
<a href="https://go.cal.com/discord">Discord</a>
|
<a href="https://github.com/calcom/cal.com/discussions">Discussions</a>
|
||||||
·
|
·
|
||||||
<a href="https://cal.com">Website</a>
|
<a href="https://cal.com">Website</a>
|
||||||
·
|
·
|
||||||
@@ -23,7 +23,6 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://go.cal.com/discord"><img src="https://img.shields.io/badge/Discord-go.cal.com%2Fdiscord-%234A154B" alt="Join Cal.com Discord"></a>
|
|
||||||
<a href="https://www.producthunt.com/products/cal-com"><img src="https://img.shields.io/badge/Product%20Hunt-%231%20Product%20of%20the%20Month-%23DA552E" alt="Product Hunt"></a>
|
<a href="https://www.producthunt.com/products/cal-com"><img src="https://img.shields.io/badge/Product%20Hunt-%231%20Product%20of%20the%20Month-%23DA552E" alt="Product Hunt"></a>
|
||||||
<a href="https://status.cal.com"><img height="20px" src="https://betteruptime.com/status-badges/v1/monitor/a9kf.svg" alt="Uptime"></a>
|
<a href="https://status.cal.com"><img height="20px" src="https://betteruptime.com/status-badges/v1/monitor/a9kf.svg" alt="Uptime"></a>
|
||||||
<a href="https://github.com/calcom/cal.com/stargazers"><img src="https://img.shields.io/github/stars/calcom/cal.com" alt="Github Stars"></a>
|
<a href="https://github.com/calcom/cal.com/stargazers"><img src="https://img.shields.io/github/stars/calcom/cal.com" alt="Github Stars"></a>
|
||||||
@@ -37,7 +36,6 @@
|
|||||||
<a href="https://twitch.tv/calcomtv"><img src="https://img.shields.io/twitch/status/calcomtv?style=flat"></a>
|
<a href="https://twitch.tv/calcomtv"><img src="https://img.shields.io/twitch/status/calcomtv?style=flat"></a>
|
||||||
<a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+label:%22%F0%9F%99%8B%F0%9F%8F%BB%E2%80%8D%E2%99%82%EF%B8%8Fhelp+wanted%22"><img src="https://img.shields.io/badge/Help%20Wanted-Contribute-blue"></a>
|
<a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+label:%22%F0%9F%99%8B%F0%9F%8F%BB%E2%80%8D%E2%99%82%EF%B8%8Fhelp+wanted%22"><img src="https://img.shields.io/badge/Help%20Wanted-Contribute-blue"></a>
|
||||||
<a href="https://cal.com/figma"><img src="https://img.shields.io/badge/Figma-Design%20System-blueviolet"></a>
|
<a href="https://cal.com/figma"><img src="https://img.shields.io/badge/Figma-Design%20System-blueviolet"></a>
|
||||||
<a href="https://discord.com/channels/1125390093386010654/1125398231585661040"><img src="https://img.shields.io/badge/translations-contribute-brightgreen" /></a>
|
|
||||||
<a href="https://contributor-covenant.org/version/1/4/code-of-conduct/ "><img src="https://img.shields.io/badge/Contributor%20Covenant-1.4-purple" /></a>
|
<a href="https://contributor-covenant.org/version/1/4/code-of-conduct/ "><img src="https://img.shields.io/badge/Contributor%20Covenant-1.4-purple" /></a>
|
||||||
<a href="https://console.algora.io/org/cal/bounties?status=open"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Fcal%2Fbounties%3Fstatus%3Dopen" /></a>
|
<a href="https://console.algora.io/org/cal/bounties?status=open"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Fcal%2Fbounties%3Fstatus%3Dopen" /></a>
|
||||||
</p>
|
</p>
|
||||||
@@ -382,7 +380,7 @@ Currently Vercel Pro Plan is required to be able to Deploy this application with
|
|||||||
|
|
||||||
### Elestio
|
### Elestio
|
||||||
|
|
||||||
[](https://elest.io/open-source/cal.com)
|
[](https://elest.io/open-source/cal.com)
|
||||||
|
|
||||||
<!-- ROADMAP -->
|
<!-- ROADMAP -->
|
||||||
|
|
||||||
@@ -461,7 +459,7 @@ We have a list of [help wanted](https://github.com/calcom/cal.com/issues?q=is:is
|
|||||||
|
|
||||||
### Translations
|
### Translations
|
||||||
|
|
||||||
Don't code but still want to contribute? Join our [discord](https://go.cal.com/discord) and join the [#Translate channel](https://discord.com/channels/1125390093386010654/1125398231585661040) and let us know what language you want to translate.
|
Don't code but still want to contribute? Join our [Discussions](https://github.com/calcom/cal.com/discussions) and join the [#Translate channel](https://github.com/calcom/cal.com/discussions/categories/translations) and let us know what language you want to translate.
|
||||||
|
|
||||||
                                            !
|
|
||||||
|
|
||||||
This app lets you chat with your calendar via email:
|
|
||||||
|
|
||||||
- Turn informal emails into bookings eg. forward "wanna meet tmrw at 2pm?"
|
|
||||||
- List and rearrange your bookings eg. "clear my afternoon"
|
|
||||||
- Answer basic questions about your busiest times eg. "how does my Tuesday look?"
|
|
||||||
|
|
||||||
The core logic is contained in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts). Here, a [LangChain Agent Executor](https://docs.langchain.com/docs/components/agents/agent-executor) is tasked with following your instructions. Given your last-known timezone, working hours, and busy times, it attempts to CRUD your bookings.
|
|
||||||
|
|
||||||
_The AI agent can only choose from a set of tools, without ever seeing your API key._
|
|
||||||
|
|
||||||
Emails are cleaned and routed in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts) using [MailParser](https://nodemailer.com/extras/mailparser/).
|
|
||||||
|
|
||||||
Incoming emails are routed by email address. Addresses are verified by [DKIM record](https://support.google.com/a/answer/174124?hl=en), making them hard to spoof.
|
|
||||||
|
|
||||||
## Recognition
|
|
||||||
|
|
||||||
<a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-cal-ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=419860&theme=light&period=daily" alt="Cal.ai - World's first open source AI scheduling assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cal-ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=419860&theme=light" alt="Cal.ai - World's first open source AI scheduling assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
|
|
||||||
|
|
||||||
## Getting Started
|
|
||||||
|
|
||||||
### Development
|
|
||||||
|
|
||||||
If you haven't yet, please run the [root setup](/README.md) steps.
|
|
||||||
|
|
||||||
Before running the app, please see [env.mjs](./src/env.mjs) for all required environment variables. Run `cp .env.example .env` in this folder to get started. You'll need:
|
|
||||||
|
|
||||||
- An [OpenAI API key](https://platform.openai.com/account/api-keys) with access to GPT-4
|
|
||||||
- A [SendGrid API key](https://app.sendgrid.com/settings/api_keys)
|
|
||||||
- A default sender email (for example, `me@dev.example.com`)
|
|
||||||
- The Cal.ai app's ID and URL (see [add.ts](/packages/app-store/cal-ai/api/index.ts))
|
|
||||||
- A unique value for `PARSE_KEY` with `openssl rand -hex 32`
|
|
||||||
|
|
||||||
To stand up the API and AI apps simultaneously, simply run `yarn dev:ai`.
|
|
||||||
|
|
||||||
### Agent Architecture
|
|
||||||
|
|
||||||
The scheduling agent in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts) calls an LLM (in this case, GPT-4) in a loop to accomplish a multi-step task. We use an [OpenAI Functions agent](https://js.langchain.com/docs/modules/agents/agent_types/openai_functions_agent), which is fine-tuned to output text suited for passing to tools.
|
|
||||||
|
|
||||||
Tools (eg. [`createBooking`](/apps/ai/src/tools/createBooking.ts)) are simply JavaScript methods wrapped by Zod schemas, telling the agent what format to output.
|
|
||||||
|
|
||||||
Here is the full architecture:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### Email Router
|
|
||||||
|
|
||||||
To expose the AI app, you can use either [Tunnelmole](https://github.com/robbie-cahill/tunnelmole-client), an open source tunnelling tool; or [nGrok](https://ngrok.com/), a popular closed source tunnelling tool.
|
|
||||||
|
|
||||||
For Tunnelmole, run `tmole 3005` (or the AI app's port number) in a new terminal. Please replace `3005` with the port number if it is different. In the output, you'll see two URLs, one http and a https (we recommend using the https url for privacy and security). To install Tunnelmole, use `curl -O https://install.tunnelmole.com/8dPBw/install && sudo bash install`. (On Windows, download [tmole.exe](https://tunnelmole.com/downloads/tmole.exe))
|
|
||||||
|
|
||||||
For nGrok, run `ngrok http 3005` (or the AI app's port number) in a new terminal. You may need to install nGrok first.
|
|
||||||
|
|
||||||
To forward incoming emails to the serverless function at `/agent`, we use [SendGrid's Inbound Parse](https://docs.sendgrid.com/for-developers/parsing-email/setting-up-the-inbound-parse-webhook).
|
|
||||||
|
|
||||||
1. Ensure you have a [SendGrid account](https://signup.sendgrid.com/)
|
|
||||||
2. Ensure you have an authenticated domain. Go to Settings > Sender Authentication > Authenticate. For DNS host, select `I'm not sure`. Click Next and add your domain, eg. `example.com`. Choose Manual Setup. You'll be given three CNAME records to add to your DNS settings, eg. in [Vercel Domains](https://vercel.com/dashboard/domains). After adding those records, click Verify. To troubleshoot, see the [full instructions](https://docs.sendgrid.com/ui/account-and-settings/how-to-set-up-domain-authentication).
|
|
||||||
3. Authorize your domain for email with MX records: one with name `[your domain].com` and value `mx.sendgrid.net.`, and another with name `bounces.[your domain].com` and value `feedback-smtp.us-east-1.amazonses.com`. Set the priority to `10` if prompted.
|
|
||||||
4. Go to Settings > [Inbound Parse](https://app.sendgrid.com/settings/parse) > Add Host & URL. Choose your authenticated domain.
|
|
||||||
5. In the Destination URL field, use the Tunnelmole or ngrok URL from above along with the path, `/api/receive`, and one param, `parseKey`, which lives in [this app's .env](/apps/ai/.env.example) under `PARSE_KEY`. The full URL should look like `https://abc.tunnelmole.net/api/receive?parseKey=ABC-123` or `https://abc.ngrok.io/api/receive?parseKey=ABC-123`.
|
|
||||||
6. Activate "POST the raw, full MIME message".
|
|
||||||
7. Send an email to `[anyUsername]@example.com`. You should see a ping on the Tunnelmole or ngrok listener and server.
|
|
||||||
8. Adjust the logic in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts), save to hot-reload, and send another email to test the behaviour.
|
|
||||||
|
|
||||||
Please feel free to improve any part of this architecture!
|
|
||||||
Vendored
-5
@@ -1,5 +0,0 @@
|
|||||||
/// <reference types="next" />
|
|
||||||
/// <reference types="next/image-types/global" />
|
|
||||||
|
|
||||||
// NOTE: This file should not be edited
|
|
||||||
// see https://nextjs.org/docs/basic-features/typescript for more information.
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
const withBundleAnalyzer = require("@next/bundle-analyzer");
|
|
||||||
|
|
||||||
const plugins = [];
|
|
||||||
plugins.push(withBundleAnalyzer({ enabled: process.env.ANALYZE === "true" }));
|
|
||||||
|
|
||||||
/** @type {import("next").NextConfig} */
|
|
||||||
const nextConfig = {
|
|
||||||
async redirects() {
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
source: "/",
|
|
||||||
destination: "https://cal.com/ai",
|
|
||||||
permanent: true,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
},
|
|
||||||
i18n: {
|
|
||||||
defaultLocale: "en",
|
|
||||||
locales: ["en"],
|
|
||||||
},
|
|
||||||
reactStrictMode: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "@calcom/ai",
|
|
||||||
"version": "1.2.1",
|
|
||||||
"private": true,
|
|
||||||
"author": "Cal.com Inc.",
|
|
||||||
"dependencies": {
|
|
||||||
"@calcom/prisma": "*",
|
|
||||||
"@langchain/core": "^0.1.26",
|
|
||||||
"@langchain/openai": "^0.0.14",
|
|
||||||
"@t3-oss/env-nextjs": "^0.6.1",
|
|
||||||
"langchain": "^0.1.17",
|
|
||||||
"mailparser": "^3.6.5",
|
|
||||||
"next": "^13.5.4",
|
|
||||||
"supports-color": "8.1.1",
|
|
||||||
"zod": "^3.22.4"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@types/mailparser": "^3.4.0"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"build": "next build",
|
|
||||||
"dev": "next dev -p 3005",
|
|
||||||
"format": "npx prettier . --write",
|
|
||||||
"lint": "eslint . --ext .ts,.js,.tsx,.jsx",
|
|
||||||
"lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
|
|
||||||
"start": "next start"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
import type { NextRequest } from "next/server";
|
|
||||||
import { NextResponse } from "next/server";
|
|
||||||
|
|
||||||
import agent from "../../../utils/agent";
|
|
||||||
import sendEmail from "../../../utils/sendEmail";
|
|
||||||
import { verifyParseKey } from "../../../utils/verifyParseKey";
|
|
||||||
|
|
||||||
// Allow agent loop to run for up to 5 minutes
|
|
||||||
export const maxDuration = 300;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Launches a LangChain agent to process an incoming email,
|
|
||||||
* then sends the response to the user.
|
|
||||||
*/
|
|
||||||
export const POST = async (request: NextRequest) => {
|
|
||||||
const verified = verifyParseKey(request.url);
|
|
||||||
|
|
||||||
if (!verified) {
|
|
||||||
return new NextResponse("Unauthorized", { status: 401 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const json = await request.json();
|
|
||||||
|
|
||||||
const { apiKey, userId, message, subject, user, users, replyTo: agentEmail } = json;
|
|
||||||
|
|
||||||
if ((!message && !subject) || !user) {
|
|
||||||
return new NextResponse("Missing fields", { status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const response = await agent(`${subject}\n\n${message}`, { ...user }, users, apiKey, userId, agentEmail);
|
|
||||||
|
|
||||||
// Send response to user
|
|
||||||
await sendEmail({
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: response.replace(/(?:\r\n|\r|\n)/g, "\n"),
|
|
||||||
to: user.email,
|
|
||||||
from: agentEmail,
|
|
||||||
});
|
|
||||||
|
|
||||||
return new NextResponse("ok");
|
|
||||||
} catch (error) {
|
|
||||||
await sendEmail({
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: "Thanks for using Cal.ai! We're experiencing high demand and can't currently process your request. Please try again later.",
|
|
||||||
to: user.email,
|
|
||||||
from: agentEmail,
|
|
||||||
});
|
|
||||||
|
|
||||||
return new NextResponse(
|
|
||||||
(error as Error).message || "Something went wrong. Please try again or reach out for help.",
|
|
||||||
{ status: 500 }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
import type { NextRequest } from "next/server";
|
|
||||||
|
|
||||||
import prisma from "@calcom/prisma";
|
|
||||||
|
|
||||||
import { env } from "../../../env.mjs";
|
|
||||||
import sendEmail from "../../../utils/sendEmail";
|
|
||||||
|
|
||||||
export const POST = async (request: NextRequest) => {
|
|
||||||
const { userId } = await request.json();
|
|
||||||
|
|
||||||
const user = await prisma.user.findUnique({
|
|
||||||
select: {
|
|
||||||
email: true,
|
|
||||||
name: true,
|
|
||||||
username: true,
|
|
||||||
},
|
|
||||||
where: {
|
|
||||||
id: userId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!user) {
|
|
||||||
return new Response("User not found", { status: 404 });
|
|
||||||
}
|
|
||||||
|
|
||||||
await sendEmail({
|
|
||||||
subject: "Welcome to Cal AI",
|
|
||||||
to: user.email,
|
|
||||||
from: `${user.username}@${env.SENDER_DOMAIN}`,
|
|
||||||
text: `Hi ${
|
|
||||||
user.name || `@${user.username}`
|
|
||||||
},\n\nI'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.\n\nHere are some things you can ask me:\n\n- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)\n- "What meetings do I have today?" (I'll show you your schedule)\n- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)\n\nI'm still learning, so if you have any feedback, please tweet it to @calcom!\n\nRemember, you can always reach me here, at ${
|
|
||||||
user.username
|
|
||||||
}@${
|
|
||||||
env.SENDER_DOMAIN
|
|
||||||
}.\n\nLooking forward to working together (:\n\n- Cal AI, Your personal booking assistant`,
|
|
||||||
html: `Hi ${
|
|
||||||
user.name || `@${user.username}`
|
|
||||||
},<br><br>I'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.<br><br>Here are some things you can ask me:<br><br>- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)<br>- "What meetings do I have today?" (I'll show you your schedule)<br>- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)<br><br>I'm still learning, so if you have any feedback, please send it to <a href="https://twitter.com/calcom">@calcom</a> on X!<br><br>Remember, you can always reach me here, at ${
|
|
||||||
user.username
|
|
||||||
}@${env.SENDER_DOMAIN}.<br><br>Looking forward to working together (:<br><br>- Cal AI`,
|
|
||||||
});
|
|
||||||
return new Response("OK", { status: 200 });
|
|
||||||
};
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
import type { ParsedMail, Source } from "mailparser";
|
|
||||||
import { simpleParser } from "mailparser";
|
|
||||||
import type { NextRequest } from "next/server";
|
|
||||||
import { NextResponse } from "next/server";
|
|
||||||
|
|
||||||
import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
|
|
||||||
import prisma from "@calcom/prisma";
|
|
||||||
|
|
||||||
import { env } from "../../../env.mjs";
|
|
||||||
import { fetchAvailability } from "../../../tools/getAvailability";
|
|
||||||
import { fetchEventTypes } from "../../../tools/getEventTypes";
|
|
||||||
import { extractUsers } from "../../../utils/extractUsers";
|
|
||||||
import getHostFromHeaders from "../../../utils/host";
|
|
||||||
import now from "../../../utils/now";
|
|
||||||
import sendEmail from "../../../utils/sendEmail";
|
|
||||||
import { verifyParseKey } from "../../../utils/verifyParseKey";
|
|
||||||
|
|
||||||
// Allow receive loop to run for up to 30 seconds
|
|
||||||
// Why so long? the rate determining API call (getAvailability, getEventTypes) can take up to 15 seconds at peak times so we give it a little extra time to complete.
|
|
||||||
export const maxDuration = 30;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Verifies email signature and app authorization,
|
|
||||||
* then hands off to booking agent.
|
|
||||||
*/
|
|
||||||
export const POST = async (request: NextRequest) => {
|
|
||||||
const verified = verifyParseKey(request.url);
|
|
||||||
|
|
||||||
if (!verified) {
|
|
||||||
return new NextResponse("Unauthorized", { status: 401 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const formData = await request.formData();
|
|
||||||
const body = Object.fromEntries(formData);
|
|
||||||
const envelope = JSON.parse(body.envelope as string);
|
|
||||||
|
|
||||||
const aiEmail = envelope.to[0];
|
|
||||||
const subject = body.subject || "";
|
|
||||||
|
|
||||||
try {
|
|
||||||
await checkRateLimitAndThrowError({
|
|
||||||
identifier: `ai:email:${envelope.from}`,
|
|
||||||
rateLimitingType: "ai",
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
await sendEmail({
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: "Thanks for using Cal.ai! You've reached your daily limit. Please try again tomorrow.",
|
|
||||||
to: envelope.from,
|
|
||||||
from: aiEmail,
|
|
||||||
});
|
|
||||||
|
|
||||||
return new NextResponse("Exceeded rate limit", { status: 200 }); // Don't return 429 to avoid triggering retry logic in SendGrid
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse email from mixed MIME type
|
|
||||||
const parsed: ParsedMail = await simpleParser(body.email as Source);
|
|
||||||
|
|
||||||
if (!parsed.text && !parsed.subject) {
|
|
||||||
await sendEmail({
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: "Thanks for using Cal.ai! It looks like you forgot to include a message. Please try again.",
|
|
||||||
to: envelope.from,
|
|
||||||
from: aiEmail,
|
|
||||||
});
|
|
||||||
return new NextResponse("Email missing text and subject", { status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const user = await prisma.user.findUnique({
|
|
||||||
select: {
|
|
||||||
email: true,
|
|
||||||
id: true,
|
|
||||||
username: true,
|
|
||||||
timeZone: true,
|
|
||||||
credentials: {
|
|
||||||
select: {
|
|
||||||
appId: true,
|
|
||||||
key: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
where: { email: envelope.from },
|
|
||||||
});
|
|
||||||
|
|
||||||
// body.dkim looks like {@domain-com.22222222.gappssmtp.com : pass}
|
|
||||||
const signature = (body.dkim as string).includes(" : pass");
|
|
||||||
|
|
||||||
// User is not a cal.com user or is using an unverified email.
|
|
||||||
if (!signature || !user) {
|
|
||||||
await sendEmail({
|
|
||||||
html: `Thanks for your interest in Cal.ai! To get started, Make sure you have a <a href="https://cal.com/signup" target="_blank">cal.com</a> account with this email address and then install Cal.ai here: <a href="https://go.cal.com/ai" target="_blank">go.cal.com/ai</a>.`,
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: `Thanks for your interest in Cal.ai! To get started, Make sure you have a cal.com account with this email address. You can sign up for an account at: https://cal.com/signup`,
|
|
||||||
to: envelope.from,
|
|
||||||
from: aiEmail,
|
|
||||||
});
|
|
||||||
|
|
||||||
return new NextResponse("ok");
|
|
||||||
}
|
|
||||||
|
|
||||||
const credential = user.credentials.find((c) => c.appId === env.APP_ID)?.key;
|
|
||||||
|
|
||||||
// User has not installed the app from the app store. Direct them to install it.
|
|
||||||
if (!(credential as { apiKey: string })?.apiKey) {
|
|
||||||
const url = env.APP_URL;
|
|
||||||
|
|
||||||
await sendEmail({
|
|
||||||
html: `Thanks for using Cal.ai! To get started, the app must be installed. <a href=${url} target="_blank">Click this link</a> to install it.`,
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: `Thanks for using Cal.ai! To get started, the app must be installed. Click this link to install the Cal.ai app: ${url}`,
|
|
||||||
to: envelope.from,
|
|
||||||
from: aiEmail,
|
|
||||||
});
|
|
||||||
|
|
||||||
return new NextResponse("ok");
|
|
||||||
}
|
|
||||||
|
|
||||||
const { apiKey } = credential as { apiKey: string };
|
|
||||||
|
|
||||||
// Pre-fetch data relevant to most bookings.
|
|
||||||
const [eventTypes, availability, users] = await Promise.all([
|
|
||||||
fetchEventTypes({
|
|
||||||
apiKey,
|
|
||||||
}),
|
|
||||||
fetchAvailability({
|
|
||||||
apiKey,
|
|
||||||
userId: user.id,
|
|
||||||
dateFrom: now(user.timeZone),
|
|
||||||
dateTo: now(user.timeZone),
|
|
||||||
}),
|
|
||||||
extractUsers(`${parsed.text} ${parsed.subject}`),
|
|
||||||
]);
|
|
||||||
|
|
||||||
if ("error" in availability) {
|
|
||||||
await sendEmail({
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: "Sorry, there was an error fetching your availability. Please try again.",
|
|
||||||
to: user.email,
|
|
||||||
from: aiEmail,
|
|
||||||
});
|
|
||||||
console.error(availability.error);
|
|
||||||
return new NextResponse("Error fetching availability. Please try again.", { status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
if ("error" in eventTypes) {
|
|
||||||
await sendEmail({
|
|
||||||
subject: `Re: ${subject}`,
|
|
||||||
text: "Sorry, there was an error fetching your event types. Please try again.",
|
|
||||||
to: user.email,
|
|
||||||
from: aiEmail,
|
|
||||||
});
|
|
||||||
console.error(eventTypes.error);
|
|
||||||
return new NextResponse("Error fetching event types. Please try again.", { status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const { workingHours } = availability;
|
|
||||||
|
|
||||||
const appHost = getHostFromHeaders(request.headers);
|
|
||||||
|
|
||||||
// Hand off to long-running agent endpoint to handle the email. (don't await)
|
|
||||||
fetch(`${appHost}/api/agent?parseKey=${env.PARSE_KEY}`, {
|
|
||||||
body: JSON.stringify({
|
|
||||||
apiKey,
|
|
||||||
userId: user.id,
|
|
||||||
message: parsed.text || "",
|
|
||||||
subject: parsed.subject || "",
|
|
||||||
replyTo: aiEmail,
|
|
||||||
user: {
|
|
||||||
email: user.email,
|
|
||||||
eventTypes,
|
|
||||||
username: user.username,
|
|
||||||
timeZone: user.timeZone,
|
|
||||||
workingHours,
|
|
||||||
},
|
|
||||||
users,
|
|
||||||
}),
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
method: "POST",
|
|
||||||
});
|
|
||||||
|
|
||||||
await new Promise((r) => setTimeout(r, 1000));
|
|
||||||
|
|
||||||
return new NextResponse("ok");
|
|
||||||
};
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
import { createEnv } from "@t3-oss/env-nextjs";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
export const env = createEnv({
|
|
||||||
/**
|
|
||||||
* Specify your client-side environment variables schema here. This way you can ensure the app
|
|
||||||
* isn't built with invalid env vars. To expose them to the client, prefix them with
|
|
||||||
* `NEXT_PUBLIC_`.
|
|
||||||
*/
|
|
||||||
client: {
|
|
||||||
// NEXT_PUBLIC_CLIENTVAR: z.string().min(1),
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* You can't destruct `process.env` as a regular object in the Next.js edge runtimes (e.g.
|
|
||||||
* middlewares) or client-side so we need to destruct manually.
|
|
||||||
*/
|
|
||||||
runtimeEnv: {
|
|
||||||
BACKEND_URL: process.env.BACKEND_URL,
|
|
||||||
FRONTEND_URL: process.env.FRONTEND_URL,
|
|
||||||
APP_ID: process.env.APP_ID,
|
|
||||||
APP_URL: process.env.APP_URL,
|
|
||||||
SENDER_DOMAIN: process.env.SENDER_DOMAIN,
|
|
||||||
PARSE_KEY: process.env.PARSE_KEY,
|
|
||||||
NODE_ENV: process.env.NODE_ENV,
|
|
||||||
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
|
|
||||||
SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
|
|
||||||
DATABASE_URL: process.env.DATABASE_URL,
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Specify your server-side environment variables schema here. This way you can ensure the app
|
|
||||||
* isn't built with invalid env vars.
|
|
||||||
*/
|
|
||||||
server: {
|
|
||||||
BACKEND_URL: z.string().url(),
|
|
||||||
FRONTEND_URL: z.string().url(),
|
|
||||||
APP_ID: z.string().min(1),
|
|
||||||
APP_URL: z.string().url(),
|
|
||||||
SENDER_DOMAIN: z.string().min(1),
|
|
||||||
PARSE_KEY: z.string().min(1),
|
|
||||||
NODE_ENV: z.enum(["development", "test", "production"]),
|
|
||||||
OPENAI_API_KEY: z.string().min(1),
|
|
||||||
SENDGRID_API_KEY: z.string().min(1),
|
|
||||||
DATABASE_URL: z.string().url(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 125 KiB |
@@ -1,121 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import type { UserList } from "~/src/types/user";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a booking for a user by event type, times, and timezone.
|
|
||||||
*/
|
|
||||||
const createBooking = async ({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
users,
|
|
||||||
eventTypeId,
|
|
||||||
start,
|
|
||||||
end,
|
|
||||||
timeZone,
|
|
||||||
language,
|
|
||||||
invite,
|
|
||||||
}: {
|
|
||||||
apiKey: string;
|
|
||||||
userId: number;
|
|
||||||
users: UserList;
|
|
||||||
eventTypeId: number;
|
|
||||||
start: string;
|
|
||||||
end: string;
|
|
||||||
timeZone: string;
|
|
||||||
language: string;
|
|
||||||
invite: number;
|
|
||||||
title?: string;
|
|
||||||
status?: string;
|
|
||||||
}): Promise<string | Error | { error: string }> => {
|
|
||||||
const params = {
|
|
||||||
apiKey,
|
|
||||||
userId: userId.toString(),
|
|
||||||
};
|
|
||||||
|
|
||||||
const urlParams = new URLSearchParams(params);
|
|
||||||
|
|
||||||
const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
|
|
||||||
|
|
||||||
const user = users.find((u) => u.id === invite);
|
|
||||||
|
|
||||||
if (!user) {
|
|
||||||
return { error: `User with id ${invite} not found to invite` };
|
|
||||||
}
|
|
||||||
|
|
||||||
const responses = {
|
|
||||||
id: invite.toString(),
|
|
||||||
name: user.username,
|
|
||||||
email: user.email,
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = await fetch(url, {
|
|
||||||
body: JSON.stringify({
|
|
||||||
end,
|
|
||||||
eventTypeId,
|
|
||||||
language,
|
|
||||||
metadata: {},
|
|
||||||
responses,
|
|
||||||
start,
|
|
||||||
timeZone,
|
|
||||||
}),
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
method: "POST",
|
|
||||||
});
|
|
||||||
|
|
||||||
// Let GPT handle this. This will happen when wrong event type id is used.
|
|
||||||
// if (response.status === 401) throw new Error("Unauthorized");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
return {
|
|
||||||
error: data.message,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Booking created";
|
|
||||||
};
|
|
||||||
|
|
||||||
const createBookingTool = (apiKey: string, userId: number, users: UserList) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description: "Creates a booking on the primary user's calendar.",
|
|
||||||
func: async ({ eventTypeId, start, end, timeZone, language, invite, title, status }) => {
|
|
||||||
return JSON.stringify(
|
|
||||||
await createBooking({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
users,
|
|
||||||
end,
|
|
||||||
eventTypeId,
|
|
||||||
language,
|
|
||||||
invite,
|
|
||||||
start,
|
|
||||||
status,
|
|
||||||
timeZone,
|
|
||||||
title,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
},
|
|
||||||
name: "createBooking",
|
|
||||||
schema: z.object({
|
|
||||||
end: z
|
|
||||||
.string()
|
|
||||||
.describe("This should correspond to the event type's length, unless otherwise specified."),
|
|
||||||
eventTypeId: z.number(),
|
|
||||||
language: z.string(),
|
|
||||||
invite: z.number().describe("External user id to invite."),
|
|
||||||
start: z.string(),
|
|
||||||
status: z.string().optional().describe("ACCEPTED, PENDING, CANCELLED or REJECTED"),
|
|
||||||
timeZone: z.string(),
|
|
||||||
title: z.string().optional(),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default createBookingTool;
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancels a booking for a user by ID with reason.
|
|
||||||
*/
|
|
||||||
const cancelBooking = async ({
|
|
||||||
apiKey,
|
|
||||||
id,
|
|
||||||
reason,
|
|
||||||
}: {
|
|
||||||
apiKey: string;
|
|
||||||
id: string;
|
|
||||||
reason: string;
|
|
||||||
}): Promise<string | { error: string }> => {
|
|
||||||
const params = {
|
|
||||||
apiKey,
|
|
||||||
};
|
|
||||||
|
|
||||||
const urlParams = new URLSearchParams(params);
|
|
||||||
|
|
||||||
const url = `${env.BACKEND_URL}/bookings/${id}/cancel?${urlParams.toString()}`;
|
|
||||||
|
|
||||||
const response = await fetch(url, {
|
|
||||||
body: JSON.stringify({ reason }),
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
method: "DELETE",
|
|
||||||
});
|
|
||||||
|
|
||||||
// Let GPT handle this. This will happen when wrong booking id is used.
|
|
||||||
// if (response.status === 401) throw new Error("Unauthorized");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
return { error: data.message };
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Booking cancelled";
|
|
||||||
};
|
|
||||||
|
|
||||||
const cancelBookingTool = (apiKey: string) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description: "Cancel a booking",
|
|
||||||
func: async ({ id, reason }) => {
|
|
||||||
return JSON.stringify(
|
|
||||||
await cancelBooking({
|
|
||||||
apiKey,
|
|
||||||
id,
|
|
||||||
reason,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
},
|
|
||||||
name: "cancelBooking",
|
|
||||||
schema: z.object({
|
|
||||||
id: z.string(),
|
|
||||||
reason: z.string(),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default cancelBookingTool;
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
import type { Availability } from "../types/availability";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches availability for a user by date range and event type.
|
|
||||||
*/
|
|
||||||
export const fetchAvailability = async ({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
dateFrom,
|
|
||||||
dateTo,
|
|
||||||
}: {
|
|
||||||
apiKey: string;
|
|
||||||
userId: number;
|
|
||||||
dateFrom: string;
|
|
||||||
dateTo: string;
|
|
||||||
}): Promise<Partial<Availability> | { error: string }> => {
|
|
||||||
const params: { [k: string]: string } = {
|
|
||||||
apiKey,
|
|
||||||
userId: userId.toString(),
|
|
||||||
dateFrom,
|
|
||||||
dateTo,
|
|
||||||
};
|
|
||||||
|
|
||||||
const urlParams = new URLSearchParams(params);
|
|
||||||
|
|
||||||
const url = `${env.BACKEND_URL}/availability?${urlParams.toString()}`;
|
|
||||||
|
|
||||||
const response = await fetch(url);
|
|
||||||
|
|
||||||
if (response.status === 401) throw new Error("Unauthorized");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
return { error: data.message };
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
busy: data.busy,
|
|
||||||
dateRanges: data.dateRanges,
|
|
||||||
timeZone: data.timeZone,
|
|
||||||
workingHours: data.workingHours,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const getAvailabilityTool = (apiKey: string) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description: "Get availability of users within range.",
|
|
||||||
func: async ({ userIds, dateFrom, dateTo }) => {
|
|
||||||
return JSON.stringify(
|
|
||||||
await Promise.all(
|
|
||||||
userIds.map(
|
|
||||||
async (userId) =>
|
|
||||||
await fetchAvailability({
|
|
||||||
userId: userId,
|
|
||||||
apiKey,
|
|
||||||
dateFrom,
|
|
||||||
dateTo,
|
|
||||||
})
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
},
|
|
||||||
name: "getAvailability",
|
|
||||||
schema: z.object({
|
|
||||||
userIds: z.array(z.number()).describe("The users to fetch availability for."),
|
|
||||||
dateFrom: z.string(),
|
|
||||||
dateTo: z.string(),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default getAvailabilityTool;
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
import type { Booking } from "../types/booking";
|
|
||||||
import { BOOKING_STATUS } from "../types/booking";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches bookings for a user by date range.
|
|
||||||
*/
|
|
||||||
const fetchBookings = async ({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
from,
|
|
||||||
to,
|
|
||||||
}: {
|
|
||||||
apiKey: string;
|
|
||||||
userId: number;
|
|
||||||
from: string;
|
|
||||||
to: string;
|
|
||||||
}): Promise<Booking[] | { error: string }> => {
|
|
||||||
const params = {
|
|
||||||
apiKey,
|
|
||||||
userId: userId.toString(),
|
|
||||||
dateFrom: from,
|
|
||||||
dateTo: to,
|
|
||||||
};
|
|
||||||
|
|
||||||
const urlParams = new URLSearchParams(params);
|
|
||||||
|
|
||||||
const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
|
|
||||||
|
|
||||||
const response = await fetch(url);
|
|
||||||
|
|
||||||
if (response.status === 401) throw new Error("Unauthorized");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
return { error: data.message };
|
|
||||||
}
|
|
||||||
|
|
||||||
const bookings: Booking[] = data.bookings
|
|
||||||
.filter((booking: Booking) => {
|
|
||||||
const notCancelled = booking.status !== BOOKING_STATUS.CANCELLED;
|
|
||||||
|
|
||||||
return notCancelled;
|
|
||||||
})
|
|
||||||
.map(({ endTime, eventTypeId, id, startTime, status, title }: Booking) => ({
|
|
||||||
endTime,
|
|
||||||
eventTypeId,
|
|
||||||
id,
|
|
||||||
startTime,
|
|
||||||
status,
|
|
||||||
title,
|
|
||||||
}));
|
|
||||||
|
|
||||||
return bookings;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getBookingsTool = (apiKey: string, userId: number) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description: "Get bookings for the primary user between two dates.",
|
|
||||||
func: async ({ from, to }) => {
|
|
||||||
return JSON.stringify(await fetchBookings({ apiKey, userId, from, to }));
|
|
||||||
},
|
|
||||||
name: "getBookings",
|
|
||||||
schema: z.object({
|
|
||||||
from: z.string().describe("ISO 8601 datetime string"),
|
|
||||||
to: z.string().describe("ISO 8601 datetime string"),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default getBookingsTool;
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
import type { EventType } from "../types/eventType";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches event types by user ID.
|
|
||||||
*/
|
|
||||||
export const fetchEventTypes = async ({ apiKey, userId }: { apiKey: string; userId?: number }) => {
|
|
||||||
const params: Record<string, string> = {
|
|
||||||
apiKey,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (userId) {
|
|
||||||
params["userId"] = userId.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
const urlParams = new URLSearchParams(params);
|
|
||||||
|
|
||||||
const url = `${env.BACKEND_URL}/event-types?${urlParams.toString()}`;
|
|
||||||
|
|
||||||
const response = await fetch(url);
|
|
||||||
|
|
||||||
if (response.status === 401) throw new Error("Unauthorized");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
return { error: data.message };
|
|
||||||
}
|
|
||||||
|
|
||||||
return data.event_types.map((eventType: EventType) => ({
|
|
||||||
id: eventType.id,
|
|
||||||
slug: eventType.slug,
|
|
||||||
length: eventType.length,
|
|
||||||
title: eventType.title,
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
|
|
||||||
const getEventTypesTool = (apiKey: string) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description: "Get a user's event type IDs. Usually necessary to book a meeting.",
|
|
||||||
func: async ({ userId }) => {
|
|
||||||
return JSON.stringify(
|
|
||||||
await fetchEventTypes({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
},
|
|
||||||
name: "getEventTypes",
|
|
||||||
schema: z.object({
|
|
||||||
userId: z.number().optional().describe("The user ID. Defaults to the primary user's ID."),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default getEventTypesTool;
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import { env } from "~/src/env.mjs";
|
|
||||||
import type { User, UserList } from "~/src/types/user";
|
|
||||||
import sendEmail from "~/src/utils/sendEmail";
|
|
||||||
|
|
||||||
export const sendBookingEmail = async ({
|
|
||||||
user,
|
|
||||||
agentEmail,
|
|
||||||
subject,
|
|
||||||
to,
|
|
||||||
message,
|
|
||||||
eventTypeSlug,
|
|
||||||
slots,
|
|
||||||
date,
|
|
||||||
}: {
|
|
||||||
apiKey: string;
|
|
||||||
user: User;
|
|
||||||
users: UserList;
|
|
||||||
agentEmail: string;
|
|
||||||
subject: string;
|
|
||||||
to: string;
|
|
||||||
message: string;
|
|
||||||
eventTypeSlug: string;
|
|
||||||
slots?: {
|
|
||||||
time: string;
|
|
||||||
text: string;
|
|
||||||
}[];
|
|
||||||
date: {
|
|
||||||
date: string;
|
|
||||||
text: string;
|
|
||||||
};
|
|
||||||
}) => {
|
|
||||||
// const url = `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date}`;
|
|
||||||
const timeUrls = slots?.map(({ time, text }) => {
|
|
||||||
return {
|
|
||||||
url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?slot=${time}`,
|
|
||||||
text,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
const dateUrl = {
|
|
||||||
url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date.date}`,
|
|
||||||
text: date.text,
|
|
||||||
};
|
|
||||||
|
|
||||||
await sendEmail({
|
|
||||||
subject,
|
|
||||||
to,
|
|
||||||
cc: user.email,
|
|
||||||
from: agentEmail,
|
|
||||||
text: message
|
|
||||||
.split("[[[Slots]]]")
|
|
||||||
.join(timeUrls?.map(({ url, text }) => `${text}: ${url}`).join("\n"))
|
|
||||||
.split("[[[Link]]]")
|
|
||||||
.join(`${dateUrl.text}: ${dateUrl.url}`),
|
|
||||||
html: message
|
|
||||||
.split("\n")
|
|
||||||
.join("<br>")
|
|
||||||
.split("[[[Slots]]]")
|
|
||||||
.join(timeUrls?.map(({ url, text }) => `<a href="${url}">${text}</a>`).join("<br>"))
|
|
||||||
.split("[[[Link]]]")
|
|
||||||
.join(`<a href="${dateUrl.url}">${dateUrl.text}</a>`),
|
|
||||||
});
|
|
||||||
|
|
||||||
return "Booking link sent";
|
|
||||||
};
|
|
||||||
|
|
||||||
const sendBookingEmailTool = (apiKey: string, user: User, users: UserList, agentEmail: string) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description:
|
|
||||||
"Send a booking link via email. Useful for scheduling with non cal users. Be confident, suggesting a good date/time with a fallback to a link to select a date/time.",
|
|
||||||
func: async ({ message, subject, to, eventTypeSlug, slots, date }) => {
|
|
||||||
return JSON.stringify(
|
|
||||||
await sendBookingEmail({
|
|
||||||
apiKey,
|
|
||||||
user,
|
|
||||||
users,
|
|
||||||
agentEmail,
|
|
||||||
subject,
|
|
||||||
to,
|
|
||||||
message,
|
|
||||||
eventTypeSlug,
|
|
||||||
slots,
|
|
||||||
date,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
},
|
|
||||||
name: "sendBookingEmail",
|
|
||||||
|
|
||||||
schema: z.object({
|
|
||||||
message: z
|
|
||||||
.string()
|
|
||||||
.describe(
|
|
||||||
"A polite and professional email with an intro and signature at the end. Specify you are the AI booking assistant of the primary user. Use [[[Slots]]] and a fallback [[[Link]]] to inject good times and 'see all times' into messages"
|
|
||||||
),
|
|
||||||
subject: z.string(),
|
|
||||||
to: z
|
|
||||||
.string()
|
|
||||||
.describe("email address to send the booking link to. Primary user is automatically CC'd"),
|
|
||||||
eventTypeSlug: z.string().describe("the slug of the event type to book"),
|
|
||||||
slots: z
|
|
||||||
.array(
|
|
||||||
z.object({
|
|
||||||
time: z.string().describe("YYYY-MM-DDTHH:mm in UTC"),
|
|
||||||
text: z.string().describe("minimum readable label. Ex. 4pm."),
|
|
||||||
})
|
|
||||||
)
|
|
||||||
.optional()
|
|
||||||
.describe("Time slots the external user can click"),
|
|
||||||
date: z
|
|
||||||
.object({
|
|
||||||
date: z.string().describe("YYYY-MM-DD"),
|
|
||||||
text: z.string().describe('"See all times" or similar'),
|
|
||||||
})
|
|
||||||
.describe(
|
|
||||||
"A booking link that allows the external user to select a date / time. Should be a fallback to time slots"
|
|
||||||
),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default sendBookingEmailTool;
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
||||||
import { z } from "zod";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Edits a booking for a user by booking ID with new times, title, description, or status.
|
|
||||||
*/
|
|
||||||
const editBooking = async ({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
id,
|
|
||||||
startTime, // In the docs it says start, but it's startTime: https://cal.com/docs/enterprise-features/api/api-reference/bookings#edit-an-existing-booking.
|
|
||||||
endTime, // Same here: it says end but it's endTime.
|
|
||||||
title,
|
|
||||||
description,
|
|
||||||
status,
|
|
||||||
}: {
|
|
||||||
apiKey: string;
|
|
||||||
userId: number;
|
|
||||||
id: string;
|
|
||||||
startTime?: string;
|
|
||||||
endTime?: string;
|
|
||||||
title?: string;
|
|
||||||
description?: string;
|
|
||||||
status?: string;
|
|
||||||
}): Promise<string | { error: string }> => {
|
|
||||||
const params = {
|
|
||||||
apiKey,
|
|
||||||
userId: userId.toString(),
|
|
||||||
};
|
|
||||||
const urlParams = new URLSearchParams(params);
|
|
||||||
|
|
||||||
const url = `${env.BACKEND_URL}/bookings/${id}?${urlParams.toString()}`;
|
|
||||||
|
|
||||||
const response = await fetch(url, {
|
|
||||||
body: JSON.stringify({ description, endTime, startTime, status, title }),
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
method: "PATCH",
|
|
||||||
});
|
|
||||||
|
|
||||||
// Let GPT handle this. This will happen when wrong booking id is used.
|
|
||||||
// if (response.status === 401) throw new Error("Unauthorized");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
return { error: data.message };
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Booking edited";
|
|
||||||
};
|
|
||||||
|
|
||||||
const editBookingTool = (apiKey: string, userId: number) => {
|
|
||||||
return new DynamicStructuredTool({
|
|
||||||
description: "Edit a booking",
|
|
||||||
func: async ({ description, endTime, id, startTime, status, title }) => {
|
|
||||||
return JSON.stringify(
|
|
||||||
await editBooking({
|
|
||||||
apiKey,
|
|
||||||
userId,
|
|
||||||
description,
|
|
||||||
endTime,
|
|
||||||
id,
|
|
||||||
startTime,
|
|
||||||
status,
|
|
||||||
title,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
},
|
|
||||||
name: "editBooking",
|
|
||||||
schema: z.object({
|
|
||||||
description: z.string().optional(),
|
|
||||||
endTime: z.string().optional(),
|
|
||||||
id: z.string(),
|
|
||||||
startTime: z.string().optional(),
|
|
||||||
status: z.string().optional(),
|
|
||||||
title: z.string().optional(),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default editBookingTool;
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
export type Availability = {
|
|
||||||
busy: {
|
|
||||||
start: string;
|
|
||||||
end: string;
|
|
||||||
title?: string;
|
|
||||||
}[];
|
|
||||||
timeZone: string;
|
|
||||||
dateRanges: {
|
|
||||||
start: string;
|
|
||||||
end: string;
|
|
||||||
}[];
|
|
||||||
workingHours: {
|
|
||||||
days: number[];
|
|
||||||
startTime: number;
|
|
||||||
endTime: number;
|
|
||||||
userId: number;
|
|
||||||
}[];
|
|
||||||
dateOverrides: {
|
|
||||||
date: string;
|
|
||||||
startTime: number;
|
|
||||||
endTime: number;
|
|
||||||
userId: number;
|
|
||||||
};
|
|
||||||
currentSeats: number;
|
|
||||||
};
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
export enum BOOKING_STATUS {
|
|
||||||
ACCEPTED = "ACCEPTED",
|
|
||||||
PENDING = "PENDING",
|
|
||||||
CANCELLED = "CANCELLED",
|
|
||||||
REJECTED = "REJECTED",
|
|
||||||
}
|
|
||||||
|
|
||||||
export type Booking = {
|
|
||||||
id: number;
|
|
||||||
userId: number;
|
|
||||||
description: string | null;
|
|
||||||
eventTypeId: number;
|
|
||||||
uid: string;
|
|
||||||
title: string;
|
|
||||||
startTime: string;
|
|
||||||
endTime: string;
|
|
||||||
attendees: { email: string; name: string; timeZone: string; locale: string }[] | null;
|
|
||||||
user: { email: string; name: string; timeZone: string; locale: string }[] | null;
|
|
||||||
payment: { id: number; success: boolean; paymentOption: string }[];
|
|
||||||
metadata: object | null;
|
|
||||||
status: BOOKING_STATUS;
|
|
||||||
responses: { email: string; name: string; location: string } | null;
|
|
||||||
};
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
export type EventType = {
|
|
||||||
id: number;
|
|
||||||
title: string;
|
|
||||||
length: number;
|
|
||||||
metadata: object;
|
|
||||||
slug: string;
|
|
||||||
hosts: {
|
|
||||||
userId: number;
|
|
||||||
isFixed: boolean;
|
|
||||||
}[];
|
|
||||||
hidden: boolean;
|
|
||||||
// ...
|
|
||||||
};
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import type { EventType } from "./eventType";
|
|
||||||
import type { WorkingHours } from "./workingHours";
|
|
||||||
|
|
||||||
export type User = {
|
|
||||||
id: number;
|
|
||||||
email: string;
|
|
||||||
username: string;
|
|
||||||
timeZone: string;
|
|
||||||
eventTypes: EventType[];
|
|
||||||
workingHours: WorkingHours[];
|
|
||||||
};
|
|
||||||
|
|
||||||
export type UserList = {
|
|
||||||
id?: number;
|
|
||||||
email?: string;
|
|
||||||
username?: string;
|
|
||||||
type: "fromUsername" | "fromEmail";
|
|
||||||
}[];
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export type WorkingHours = {
|
|
||||||
days: number[];
|
|
||||||
startTime: number;
|
|
||||||
endTime: number;
|
|
||||||
};
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
import { ChatPromptTemplate } from "@langchain/core/prompts";
|
|
||||||
import { ChatOpenAI } from "@langchain/openai";
|
|
||||||
import { AgentExecutor, createOpenAIFunctionsAgent } from "langchain/agents";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
import createBookingIfAvailable from "../tools/createBooking";
|
|
||||||
import deleteBooking from "../tools/deleteBooking";
|
|
||||||
import getAvailability from "../tools/getAvailability";
|
|
||||||
import getBookings from "../tools/getBookings";
|
|
||||||
import sendBookingEmail from "../tools/sendBookingEmail";
|
|
||||||
import updateBooking from "../tools/updateBooking";
|
|
||||||
import type { EventType } from "../types/eventType";
|
|
||||||
import type { User, UserList } from "../types/user";
|
|
||||||
import type { WorkingHours } from "../types/workingHours";
|
|
||||||
import now from "./now";
|
|
||||||
|
|
||||||
const gptModel = "gpt-4-0125-preview";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Core of the Cal.ai booking agent: a LangChain Agent Executor.
|
|
||||||
* Uses a toolchain to book meetings, list available slots, etc.
|
|
||||||
* Uses OpenAI functions to better enforce JSON-parsable output from the LLM.
|
|
||||||
*/
|
|
||||||
const agent = async (
|
|
||||||
input: string,
|
|
||||||
user: User,
|
|
||||||
users: UserList,
|
|
||||||
apiKey: string,
|
|
||||||
userId: number,
|
|
||||||
agentEmail: string
|
|
||||||
) => {
|
|
||||||
const tools = [
|
|
||||||
// getEventTypes(apiKey),
|
|
||||||
getAvailability(apiKey),
|
|
||||||
getBookings(apiKey, userId),
|
|
||||||
createBookingIfAvailable(apiKey, userId, users),
|
|
||||||
updateBooking(apiKey, userId),
|
|
||||||
deleteBooking(apiKey),
|
|
||||||
sendBookingEmail(apiKey, user, users, agentEmail),
|
|
||||||
];
|
|
||||||
|
|
||||||
const model = new ChatOpenAI({
|
|
||||||
modelName: gptModel,
|
|
||||||
openAIApiKey: env.OPENAI_API_KEY,
|
|
||||||
temperature: 0,
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize the agent executor with arguments.
|
|
||||||
*/
|
|
||||||
const prompt =
|
|
||||||
ChatPromptTemplate.fromTemplate(`You are Cal.ai - a bleeding edge scheduling assistant that interfaces via email.
|
|
||||||
Make sure your final answers are definitive, complete and well formatted.
|
|
||||||
Sometimes, tools return errors. In this case, try to handle the error intelligently or ask the user for more information.
|
|
||||||
Tools will always handle times in UTC, but times sent to users should be formatted per that user's timezone.
|
|
||||||
In responses to users, always summarize necessary context and open the door to follow ups. For example "I have booked your chat with @username for 3pm on Wednesday, December 20th, 2023 EST. Please let me know if you need to reschedule."
|
|
||||||
If you can't find a referenced user, ask the user for their email or @username. Make sure to specify that usernames require the @username format. Users don't know other users' userIds.
|
|
||||||
|
|
||||||
The primary user's id is: ${userId}
|
|
||||||
The primary user's username is: ${user.username}
|
|
||||||
The current time in the primary user's timezone is: ${now(user.timeZone, {
|
|
||||||
weekday: "long",
|
|
||||||
year: "numeric",
|
|
||||||
month: "long",
|
|
||||||
day: "numeric",
|
|
||||||
hour: "numeric",
|
|
||||||
minute: "numeric",
|
|
||||||
})}
|
|
||||||
The primary user's time zone is: ${user.timeZone}
|
|
||||||
The primary user's event types are: ${user.eventTypes
|
|
||||||
.map((e: EventType) => `ID: ${e.id}, Slug: ${e.slug}, Title: ${e.title}, Length: ${e.length};`)
|
|
||||||
.join("\n")}
|
|
||||||
The primary user's working hours are: ${user.workingHours
|
|
||||||
.map(
|
|
||||||
(w: WorkingHours) =>
|
|
||||||
`Days: ${w.days.join(", ")}, Start Time (minutes in UTC): ${
|
|
||||||
w.startTime
|
|
||||||
}, End Time (minutes in UTC): ${w.endTime};`
|
|
||||||
)
|
|
||||||
.join("\n")}
|
|
||||||
${
|
|
||||||
users.length
|
|
||||||
? `The email references the following @usernames and emails: ${users
|
|
||||||
.map(
|
|
||||||
(u) =>
|
|
||||||
`${
|
|
||||||
(u.id ? `, id: ${u.id}` : "id: (non user)") +
|
|
||||||
(u.username
|
|
||||||
? u.type === "fromUsername"
|
|
||||||
? `, username: @${u.username}`
|
|
||||||
: ", username: REDACTED"
|
|
||||||
: ", (no username)") +
|
|
||||||
(u.email
|
|
||||||
? u.type === "fromEmail"
|
|
||||||
? `, email: ${u.email}`
|
|
||||||
: ", email: REDACTED"
|
|
||||||
: ", (no email)")
|
|
||||||
};`
|
|
||||||
)
|
|
||||||
.join("\n")}`
|
|
||||||
: ""
|
|
||||||
}`);
|
|
||||||
const agent = await createOpenAIFunctionsAgent({
|
|
||||||
llm: model,
|
|
||||||
prompt,
|
|
||||||
tools,
|
|
||||||
});
|
|
||||||
|
|
||||||
const executor = new AgentExecutor({
|
|
||||||
agent,
|
|
||||||
tools,
|
|
||||||
returnIntermediateSteps: env.NODE_ENV === "development",
|
|
||||||
verbose: env.NODE_ENV === "development",
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await executor.invoke({ input });
|
|
||||||
const { output } = result;
|
|
||||||
|
|
||||||
return output;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default agent;
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export const context = { apiKey: "", userId: "" };
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
import prisma from "@calcom/prisma";
|
|
||||||
|
|
||||||
import type { UserList } from "../types/user";
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Extracts usernames (@Example) and emails (hi@example.com) from a string
|
|
||||||
*/
|
|
||||||
export const extractUsers = async (text: string) => {
|
|
||||||
const usernames = text
|
|
||||||
.match(/(?<![a-zA-Z0-9_.])@[a-zA-Z0-9_]+/g)
|
|
||||||
?.map((username) => username.slice(1).toLowerCase());
|
|
||||||
const emails = text
|
|
||||||
.match(/[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+/g)
|
|
||||||
?.map((email) => email.toLowerCase());
|
|
||||||
|
|
||||||
const dbUsersFromUsernames = usernames
|
|
||||||
? await prisma.user.findMany({
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
username: true,
|
|
||||||
email: true,
|
|
||||||
},
|
|
||||||
where: {
|
|
||||||
username: {
|
|
||||||
in: usernames,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const usersFromUsernames = usernames
|
|
||||||
? usernames.map((username) => {
|
|
||||||
const user = dbUsersFromUsernames.find((u) => u.username === username);
|
|
||||||
return user
|
|
||||||
? {
|
|
||||||
username,
|
|
||||||
id: user.id,
|
|
||||||
email: user.email,
|
|
||||||
type: "fromUsername",
|
|
||||||
}
|
|
||||||
: {
|
|
||||||
username,
|
|
||||||
id: null,
|
|
||||||
email: null,
|
|
||||||
type: "fromUsername",
|
|
||||||
};
|
|
||||||
})
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const dbUsersFromEmails = emails
|
|
||||||
? await prisma.user.findMany({
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
email: true,
|
|
||||||
username: true,
|
|
||||||
},
|
|
||||||
where: {
|
|
||||||
email: {
|
|
||||||
in: emails,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const usersFromEmails = emails
|
|
||||||
? emails.map((email) => {
|
|
||||||
const user = dbUsersFromEmails.find((u) => u.email === email);
|
|
||||||
return user
|
|
||||||
? {
|
|
||||||
email,
|
|
||||||
id: user.id,
|
|
||||||
username: user.username,
|
|
||||||
type: "fromEmail",
|
|
||||||
}
|
|
||||||
: {
|
|
||||||
email,
|
|
||||||
id: null,
|
|
||||||
username: null,
|
|
||||||
type: "fromEmail",
|
|
||||||
};
|
|
||||||
})
|
|
||||||
: [];
|
|
||||||
|
|
||||||
return [...usersFromUsernames, ...usersFromEmails] as UserList;
|
|
||||||
};
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
import type { NextRequest } from "next/server";
|
|
||||||
|
|
||||||
const getHostFromHeaders = (headers: NextRequest["headers"]): string => {
|
|
||||||
return `https://${headers.get("host")}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default getHostFromHeaders;
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
export default function now(timeZone: string, options: Intl.DateTimeFormatOptions = {}) {
|
|
||||||
return new Date().toLocaleString("en-US", {
|
|
||||||
timeZone,
|
|
||||||
...options,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
import mail from "@sendgrid/mail";
|
|
||||||
|
|
||||||
const sendgridAPIKey = process.env.SENDGRID_API_KEY as string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simply send an email by address, subject, and body.
|
|
||||||
*/
|
|
||||||
const send = async ({
|
|
||||||
subject,
|
|
||||||
to,
|
|
||||||
cc,
|
|
||||||
from,
|
|
||||||
text,
|
|
||||||
html,
|
|
||||||
}: {
|
|
||||||
subject: string;
|
|
||||||
to: string | string[];
|
|
||||||
cc?: string | string[];
|
|
||||||
from: string;
|
|
||||||
text: string;
|
|
||||||
html?: string;
|
|
||||||
}): Promise<boolean> => {
|
|
||||||
mail.setApiKey(sendgridAPIKey);
|
|
||||||
|
|
||||||
const msg = {
|
|
||||||
to,
|
|
||||||
cc,
|
|
||||||
from: {
|
|
||||||
email: from,
|
|
||||||
name: "Cal.ai",
|
|
||||||
},
|
|
||||||
text,
|
|
||||||
html,
|
|
||||||
subject,
|
|
||||||
};
|
|
||||||
|
|
||||||
const res = await mail.send(msg);
|
|
||||||
const success = !!res;
|
|
||||||
|
|
||||||
return success;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default send;
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import type { NextRequest } from "next/server";
|
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Verifies that the request contains the correct parse key.
|
|
||||||
* env.PARSE_KEY must be configured as a query param in the sendgrid inbound parse settings.
|
|
||||||
*/
|
|
||||||
export const verifyParseKey = (url: NextRequest["url"]) => {
|
|
||||||
const verified = new URL(url).searchParams.get("parseKey") === env.PARSE_KEY;
|
|
||||||
|
|
||||||
return verified;
|
|
||||||
};
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "@calcom/tsconfig/nextjs.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"strict": true,
|
|
||||||
"jsx": "preserve",
|
|
||||||
"baseUrl": ".",
|
|
||||||
"paths": {
|
|
||||||
"~/*": ["*"]
|
|
||||||
},
|
|
||||||
"plugins": [
|
|
||||||
{
|
|
||||||
"name": "next"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"include": [
|
|
||||||
"next-env.d.ts",
|
|
||||||
"**/*.ts",
|
|
||||||
"**/*.tsx",
|
|
||||||
".next/types/**/*.ts",
|
|
||||||
"../../packages/types/window.d.ts"
|
|
||||||
],
|
|
||||||
"exclude": ["node_modules"]
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { NextMiddleware } from "next-api-middleware";
|
import type { NextMiddleware } from "next-api-middleware";
|
||||||
|
|
||||||
import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
|
import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
|
||||||
import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
|
import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
|
||||||
import { IS_PRODUCTION } from "@calcom/lib/constants";
|
import { IS_PRODUCTION } from "@calcom/lib/constants";
|
||||||
import prisma from "@calcom/prisma";
|
import prisma from "@calcom/prisma";
|
||||||
@@ -18,7 +18,7 @@ export const dateNotInPast = function (date: Date) {
|
|||||||
|
|
||||||
// This verifies the apiKey and sets the user if it is valid.
|
// This verifies the apiKey and sets the user if it is valid.
|
||||||
export const verifyApiKey: NextMiddleware = async (req, res, next) => {
|
export const verifyApiKey: NextMiddleware = async (req, res, next) => {
|
||||||
const licenseKeyService = await LicenseKeyService.create();
|
const licenseKeyService = await LicenseKeySingleton.getInstance();
|
||||||
const hasValidLicense = await licenseKeyService.checkLicense();
|
const hasValidLicense = await licenseKeyService.checkLicense();
|
||||||
|
|
||||||
if (!hasValidLicense && IS_PRODUCTION) {
|
if (!hasValidLicense && IS_PRODUCTION) {
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ export const isAdminGuard = async (req: NextApiRequest) => {
|
|||||||
accepted: true,
|
accepted: true,
|
||||||
team: {
|
team: {
|
||||||
isOrganization: true,
|
isOrganization: true,
|
||||||
|
organizationSettings: {
|
||||||
|
isAdminAPIEnabled: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
OR: [{ role: MembershipRole.OWNER }, { role: MembershipRole.ADMIN }],
|
OR: [{ role: MembershipRole.OWNER }, { role: MembershipRole.ADMIN }],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
import { _BookingModel as Booking, _AttendeeModel, _UserModel, _PaymentModel } from "@calcom/prisma/zod";
|
import { _AttendeeModel, _BookingModel as Booking, _PaymentModel, _UserModel } from "@calcom/prisma/zod";
|
||||||
import { extendedBookingCreateBody, iso8601 } from "@calcom/prisma/zod-utils";
|
import { extendedBookingCreateBody, iso8601 } from "@calcom/prisma/zod-utils";
|
||||||
|
|
||||||
import { schemaQueryUserId } from "./shared/queryUserId";
|
import { schemaQueryUserId } from "./shared/queryUserId";
|
||||||
@@ -14,6 +14,8 @@ const schemaBookingBaseBodyParams = Booking.pick({
|
|||||||
startTime: true,
|
startTime: true,
|
||||||
endTime: true,
|
endTime: true,
|
||||||
status: true,
|
status: true,
|
||||||
|
rescheduledBy: true,
|
||||||
|
cancelledBy: true,
|
||||||
}).partial();
|
}).partial();
|
||||||
|
|
||||||
export const schemaBookingCreateBodyParams = extendedBookingCreateBody.merge(schemaQueryUserId.partial());
|
export const schemaBookingCreateBodyParams = extendedBookingCreateBody.merge(schemaQueryUserId.partial());
|
||||||
@@ -23,13 +25,18 @@ export const schemaBookingGetParams = z.object({
|
|||||||
dateTo: iso8601.optional(),
|
dateTo: iso8601.optional(),
|
||||||
order: z.enum(["asc", "desc"]).default("asc"),
|
order: z.enum(["asc", "desc"]).default("asc"),
|
||||||
sortBy: z.enum(["createdAt", "updatedAt"]).optional(),
|
sortBy: z.enum(["createdAt", "updatedAt"]).optional(),
|
||||||
|
status: z.enum(["upcoming"]).optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export type Status = z.infer<typeof schemaBookingGetParams>["status"];
|
||||||
|
|
||||||
const schemaBookingEditParams = z
|
const schemaBookingEditParams = z
|
||||||
.object({
|
.object({
|
||||||
title: z.string().optional(),
|
title: z.string().optional(),
|
||||||
startTime: iso8601.optional(),
|
startTime: iso8601.optional(),
|
||||||
endTime: iso8601.optional(),
|
endTime: iso8601.optional(),
|
||||||
|
cancelledBy: z.string().email({ message: "Invalid Email" }).optional(),
|
||||||
|
rescheduledBy: z.string().email({ message: "Invalid Email" }).optional(),
|
||||||
// Not supporting responses in edit as that might require re-triggering emails
|
// Not supporting responses in edit as that might require re-triggering emails
|
||||||
// responses
|
// responses
|
||||||
})
|
})
|
||||||
@@ -85,4 +92,6 @@ export const schemaBookingReadPublic = Booking.extend({
|
|||||||
status: true,
|
status: true,
|
||||||
responses: true,
|
responses: true,
|
||||||
fromReschedule: true,
|
fromReschedule: true,
|
||||||
|
cancelledBy: true,
|
||||||
|
rescheduledBy: true,
|
||||||
});
|
});
|
||||||
@@ -168,6 +168,7 @@ export const schemaEventTypeReadPublic = EventType.pick({
|
|||||||
metadata: jsonSchema.nullable(),
|
metadata: jsonSchema.nullable(),
|
||||||
customInputs: customInputSchema.array().optional(),
|
customInputs: customInputSchema.array().optional(),
|
||||||
link: z.string().optional(),
|
link: z.string().optional(),
|
||||||
|
hashedLink: z.object({ link: z.string() }).optional().nullable(),
|
||||||
bookingFields: eventTypeBookingFields.optional().nullable(),
|
bookingFields: eventTypeBookingFields.optional().nullable(),
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
@@ -1,5 +1,12 @@
|
|||||||
import { _PaymentModel as Payment } from "@calcom/prisma/zod";
|
import { _PaymentModel as Payment } from "@calcom/prisma/zod";
|
||||||
|
|
||||||
// FIXME: Payment seems a delicate endpoint, do we need to remove anything here?
|
export const schemaPaymentPublic = Payment.pick({
|
||||||
export const schemaPaymentBodyParams = Payment.omit({ id: true });
|
id: true,
|
||||||
export const schemaPaymentPublic = Payment.omit({ externalId: true });
|
amount: true,
|
||||||
|
success: true,
|
||||||
|
refunded: true,
|
||||||
|
fee: true,
|
||||||
|
paymentOption: true,
|
||||||
|
currency: true,
|
||||||
|
bookingId: true,
|
||||||
|
});
|
||||||
@@ -9,6 +9,7 @@ export const schemaTeamBaseBodyParams = Team.omit({ id: true, createdAt: true })
|
|||||||
isOrganization: true,
|
isOrganization: true,
|
||||||
isPlatform: true,
|
isPlatform: true,
|
||||||
smsLockState: true,
|
smsLockState: true,
|
||||||
|
smsLockReviewedByAdmin: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
const schemaTeamRequiredParams = z.object({
|
const schemaTeamRequiredParams = z.object({
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ enum locales {
|
|||||||
RO = "ro",
|
RO = "ro",
|
||||||
NL = "nl",
|
NL = "nl",
|
||||||
PT_BR = "pt-BR",
|
PT_BR = "pt-BR",
|
||||||
// ES_419 = "es-419", // Disabled until Crowdin reaches at least 80% completion
|
ES_419 = "es-419",
|
||||||
KO = "ko",
|
KO = "ko",
|
||||||
JA = "ja",
|
JA = "ja",
|
||||||
PL = "pl",
|
PL = "pl",
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
|
|||||||
* tags:
|
* tags:
|
||||||
* - availabilities
|
* - availabilities
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/availability
|
* url: https://docs.cal.com/docs/core-features/availability
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, availability removed successfully
|
* description: OK, availability removed successfully
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
|
|||||||
* tags:
|
* tags:
|
||||||
* - availabilities
|
* - availabilities
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/availability
|
* url: https://docs.cal.com/docs/core-features/availability
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
* 200:
|
||||||
* description: OK
|
* description: OK
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
|
|||||||
* tags:
|
* tags:
|
||||||
* - availabilities
|
* - availabilities
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/availability
|
* url: https://docs.cal.com/docs/core-features/availability
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, availability edited successfully
|
* description: OK, availability edited successfully
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ import {
|
|||||||
* tags:
|
* tags:
|
||||||
* - availabilities
|
* - availabilities
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/availability
|
* url: https://docs.cal.com/docs/core-features/availability
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, availability created
|
* description: OK, availability created
|
||||||
|
|||||||
@@ -30,40 +30,59 @@ async function authMiddleware(req: NextApiRequest) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const userWithBookingsAndTeamIds = await prisma.user.findUnique({
|
const user = await prisma.user.findUnique({
|
||||||
where: { id: userId },
|
where: { id: userId },
|
||||||
include: {
|
select: {
|
||||||
|
email: true,
|
||||||
bookings: true,
|
bookings: true,
|
||||||
teams: {
|
},
|
||||||
select: {
|
});
|
||||||
teamId: true,
|
|
||||||
|
if (!user) throw new HttpError({ statusCode: 404, message: "User not found" });
|
||||||
|
|
||||||
|
const filteredBookings = user?.bookings?.filter((booking) => booking.id === id);
|
||||||
|
const userIsHost = !!filteredBookings?.length;
|
||||||
|
|
||||||
|
const bookingsAsAttendee = prisma.booking.findMany({
|
||||||
|
where: {
|
||||||
|
id,
|
||||||
|
attendees: { some: { email: user.email } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const bookingsAsEventTypeOwner = prisma.booking.findMany({
|
||||||
|
where: {
|
||||||
|
id,
|
||||||
|
eventType: {
|
||||||
|
owner: { id: userId },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const bookingsAsTeamOwnerOrAdmin = prisma.booking.findMany({
|
||||||
|
where: {
|
||||||
|
id,
|
||||||
|
eventType: {
|
||||||
|
team: {
|
||||||
|
members: {
|
||||||
|
some: { userId, role: { in: ["ADMIN", "OWNER"] }, accepted: true },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!userWithBookingsAndTeamIds) throw new HttpError({ statusCode: 404, message: "User not found" });
|
const [resultOne, resultTwo, resultThree] = await Promise.all([
|
||||||
|
bookingsAsAttendee,
|
||||||
|
bookingsAsEventTypeOwner,
|
||||||
|
bookingsAsTeamOwnerOrAdmin,
|
||||||
|
]);
|
||||||
|
|
||||||
const userBookingIds = userWithBookingsAndTeamIds.bookings.map((booking) => booking.id);
|
const teamBookingsAsOwnerOrAdmin = [...resultOne, ...resultTwo, ...resultThree];
|
||||||
|
const userHasTeamBookings = !!teamBookingsAsOwnerOrAdmin.length;
|
||||||
|
|
||||||
if (!userBookingIds.includes(id)) {
|
if (!userIsHost && !userHasTeamBookings)
|
||||||
const teamBookings = await prisma.booking.findUnique({
|
throw new HttpError({ statusCode: 403, message: "You are not authorized" });
|
||||||
where: {
|
|
||||||
id: id,
|
|
||||||
eventType: {
|
|
||||||
team: {
|
|
||||||
id: {
|
|
||||||
in: userWithBookingsAndTeamIds.teams.map((team) => team.teamId),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!teamBookings) {
|
|
||||||
throw new HttpError({ statusCode: 403, message: "You are not authorized" });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default authMiddleware;
|
export default authMiddleware;
|
||||||
@@ -63,6 +63,25 @@ import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/que
|
|||||||
* schema:
|
* schema:
|
||||||
* type: string
|
* type: string
|
||||||
* enum: [createdAt, updatedAt]
|
* enum: [createdAt, updatedAt]
|
||||||
|
* - in: query
|
||||||
|
* name: status
|
||||||
|
* required: false
|
||||||
|
* schema:
|
||||||
|
* type: string
|
||||||
|
* enum: [upcoming]
|
||||||
|
* description: Filter bookings by status, it will overwrite dateFrom and dateTo filters
|
||||||
|
* - in: query
|
||||||
|
* name: dateFrom
|
||||||
|
* required: false
|
||||||
|
* schema:
|
||||||
|
* type: string
|
||||||
|
* description: ISO 8601 date string to filter bookings by start time
|
||||||
|
* - in: query
|
||||||
|
* name: dateTo
|
||||||
|
* required: false
|
||||||
|
* schema:
|
||||||
|
* type: string
|
||||||
|
* description: ISO 8601 date string to filter bookings by end time
|
||||||
* operationId: listBookings
|
* operationId: listBookings
|
||||||
* tags:
|
* tags:
|
||||||
* - bookings
|
* - bookings
|
||||||
@@ -130,6 +149,7 @@ type GetAdminArgsType = {
|
|||||||
requestedUserIds: number[];
|
requestedUserIds: number[];
|
||||||
userId: number;
|
userId: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs the WHERE clause for Prisma booking findMany operation.
|
* Constructs the WHERE clause for Prisma booking findMany operation.
|
||||||
*
|
*
|
||||||
@@ -148,7 +168,9 @@ function buildWhereClause(
|
|||||||
) {
|
) {
|
||||||
const filterByAttendeeEmails = attendeeEmails.length > 0;
|
const filterByAttendeeEmails = attendeeEmails.length > 0;
|
||||||
const userFilter = userIds.length > 0 ? { userId: { in: userIds } } : !!userId ? { userId } : {};
|
const userFilter = userIds.length > 0 ? { userId: { in: userIds } } : !!userId ? { userId } : {};
|
||||||
|
|
||||||
let whereClause = {};
|
let whereClause = {};
|
||||||
|
|
||||||
if (filterByAttendeeEmails) {
|
if (filterByAttendeeEmails) {
|
||||||
whereClause = {
|
whereClause = {
|
||||||
AND: [
|
AND: [
|
||||||
@@ -177,9 +199,7 @@ function buildWhereClause(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return whereClause;
|
||||||
...whereClause,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function handler(req: NextApiRequest) {
|
export async function handler(req: NextApiRequest) {
|
||||||
@@ -189,7 +209,7 @@ export async function handler(req: NextApiRequest) {
|
|||||||
isOrganizationOwnerOrAdmin,
|
isOrganizationOwnerOrAdmin,
|
||||||
pagination: { take, skip },
|
pagination: { take, skip },
|
||||||
} = req;
|
} = req;
|
||||||
const { dateFrom, dateTo, order, sortBy } = schemaBookingGetParams.parse(req.query);
|
const { dateFrom, dateTo, order, sortBy, status } = schemaBookingGetParams.parse(req.query);
|
||||||
|
|
||||||
const args: Prisma.BookingFindManyArgs = {};
|
const args: Prisma.BookingFindManyArgs = {};
|
||||||
if (req.query.take && req.query.page) {
|
if (req.query.take && req.query.page) {
|
||||||
@@ -275,6 +295,19 @@ export async function handler(req: NextApiRequest) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (status) {
|
||||||
|
switch (status) {
|
||||||
|
case "upcoming":
|
||||||
|
args.where = {
|
||||||
|
...args.where,
|
||||||
|
startTime: { gte: new Date().toISOString() },
|
||||||
|
};
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new HttpError({ message: "Invalid status", statusCode: 400 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const data = await prisma.booking.findMany(args);
|
const data = await prisma.booking.findMany(args);
|
||||||
return { bookings: data.map((booking) => schemaBookingReadPublic.parse(booking)) };
|
return { bookings: data.map((booking) => schemaBookingReadPublic.parse(booking)) };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ const swaggerHandler = withSwagger({
|
|||||||
{ url: "https://api.cal.com/v1" },
|
{ url: "https://api.cal.com/v1" },
|
||||||
],
|
],
|
||||||
externalDocs: {
|
externalDocs: {
|
||||||
url: "https://docs.cal.com",
|
url: "https://docs.cal.com/docs",
|
||||||
description: "Find more info at our main docs: https://docs.cal.com/",
|
description: "Find more info at our main docs: https://docs.cal.com/docs/",
|
||||||
},
|
},
|
||||||
info: {
|
info: {
|
||||||
title: `${pjson.name}: ${pjson.description}`,
|
title: `${pjson.name}: ${pjson.description}`,
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import prisma from "@calcom/prisma";
|
|||||||
|
|
||||||
import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
|
import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
|
||||||
|
|
||||||
|
import checkParentEventOwnership from "../_utils/checkParentEventOwnership";
|
||||||
|
import checkTeamEventEditPermission from "../_utils/checkTeamEventEditPermission";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @swagger
|
* @swagger
|
||||||
* /event-types/{id}:
|
* /event-types/{id}:
|
||||||
@@ -28,7 +31,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
|
|||||||
* tags:
|
* tags:
|
||||||
* - event-types
|
* - event-types
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/event-types
|
* url: https://docs.cal.com/docs/core-features/event-types
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, eventType removed successfully
|
* description: OK, eventType removed successfully
|
||||||
@@ -49,9 +52,18 @@ async function checkPermissions(req: NextApiRequest) {
|
|||||||
const { userId, isSystemWideAdmin } = req;
|
const { userId, isSystemWideAdmin } = req;
|
||||||
const { id } = schemaQueryIdParseInt.parse(req.query);
|
const { id } = schemaQueryIdParseInt.parse(req.query);
|
||||||
if (isSystemWideAdmin) return;
|
if (isSystemWideAdmin) return;
|
||||||
/** Only event type owners can delete it */
|
|
||||||
const eventType = await prisma.eventType.findFirst({ where: { id, userId } });
|
const eventType = await prisma.eventType.findFirst({ where: { id } });
|
||||||
|
|
||||||
if (!eventType) throw new HttpError({ statusCode: 403, message: "Forbidden" });
|
if (!eventType) throw new HttpError({ statusCode: 403, message: "Forbidden" });
|
||||||
|
|
||||||
|
/** Only event type owners or team owners for team events can delete it */
|
||||||
|
if (eventType.teamId) return await checkTeamEventEditPermission(req, { teamId: eventType.teamId });
|
||||||
|
|
||||||
|
if (eventType.parentId) return await checkParentEventOwnership(req);
|
||||||
|
|
||||||
|
if (eventType.userId && eventType.userId !== userId)
|
||||||
|
throw new HttpError({ statusCode: 403, message: "Forbidden" });
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defaultResponder(deleteHandler);
|
export default defaultResponder(deleteHandler);
|
||||||
@@ -34,7 +34,7 @@ import getCalLink from "../_utils/getCalLink";
|
|||||||
* tags:
|
* tags:
|
||||||
* - event-types
|
* - event-types
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/event-types
|
* url: https://docs.cal.com/docs/core-features/event-types
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
* 200:
|
||||||
* description: OK
|
* description: OK
|
||||||
@@ -51,6 +51,7 @@ export async function getHandler(req: NextApiRequest) {
|
|||||||
where: { id },
|
where: { id },
|
||||||
include: {
|
include: {
|
||||||
customInputs: true,
|
customInputs: true,
|
||||||
|
hashedLink: { select: { link: true } },
|
||||||
team: { select: { slug: true } },
|
team: { select: { slug: true } },
|
||||||
hosts: { select: { userId: true, isFixed: true } },
|
hosts: { select: { userId: true, isFixed: true } },
|
||||||
owner: { select: { username: true, id: true } },
|
owner: { select: { username: true, id: true } },
|
||||||
|
|||||||
@@ -194,7 +194,7 @@ import checkTeamEventEditPermission from "../_utils/checkTeamEventEditPermission
|
|||||||
* tags:
|
* tags:
|
||||||
* - event-types
|
* - event-types
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/event-types
|
* url: https://docs.cal.com/docs/core-features/event-types
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, eventType edited successfully
|
* description: OK, eventType edited successfully
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ import getCalLink from "./_utils/getCalLink";
|
|||||||
* tags:
|
* tags:
|
||||||
* - event-types
|
* - event-types
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/event-types
|
* url: https://docs.cal.com/docs/core-features/event-types
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
* 200:
|
||||||
* description: OK
|
* description: OK
|
||||||
@@ -56,6 +56,7 @@ async function getHandler(req: NextApiRequest) {
|
|||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
customInputs: true,
|
customInputs: true,
|
||||||
|
hashedLink: { select: { link: true } },
|
||||||
team: { select: { slug: true } },
|
team: { select: { slug: true } },
|
||||||
hosts: { select: { userId: true, isFixed: true } },
|
hosts: { select: { userId: true, isFixed: true } },
|
||||||
owner: { select: { username: true, id: true } },
|
owner: { select: { username: true, id: true } },
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ import ensureOnlyMembersAsHosts from "./_utils/ensureOnlyMembersAsHosts";
|
|||||||
* tags:
|
* tags:
|
||||||
* - event-types
|
* - event-types
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/event-types
|
* url: https://docs.cal.com/docs/core-features/event-types
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, event type created
|
* description: OK, event type created
|
||||||
@@ -278,8 +278,8 @@ async function postHandler(req: NextApiRequest) {
|
|||||||
|
|
||||||
let data: Prisma.EventTypeCreateArgs["data"] = {
|
let data: Prisma.EventTypeCreateArgs["data"] = {
|
||||||
...parsedBody,
|
...parsedBody,
|
||||||
userId,
|
userId: !!parsedBody.teamId ? null : userId,
|
||||||
users: { connect: { id: userId } },
|
users: !!parsedBody.teamId ? undefined : { connect: { id: userId } },
|
||||||
bookingLimits: bookingLimits === null ? Prisma.DbNull : bookingLimits,
|
bookingLimits: bookingLimits === null ? Prisma.DbNull : bookingLimits,
|
||||||
durationLimits: durationLimits === null ? Prisma.DbNull : durationLimits,
|
durationLimits: durationLimits === null ? Prisma.DbNull : durationLimits,
|
||||||
};
|
};
|
||||||
@@ -291,7 +291,7 @@ async function postHandler(req: NextApiRequest) {
|
|||||||
await checkUserMembership(req);
|
await checkUserMembership(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSystemWideAdmin && parsedBody.userId) {
|
if (isSystemWideAdmin && parsedBody.userId && !parsedBody.teamId) {
|
||||||
data = { ...parsedBody, users: { connect: { id: parsedBody.userId } } };
|
data = { ...parsedBody, users: { connect: { id: parsedBody.userId } } };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,12 +18,8 @@ export default async function checkParentEventOwnership(req: NextApiRequest) {
|
|||||||
/** These are already parsed upstream, we can assume they're good here. */
|
/** These are already parsed upstream, we can assume they're good here. */
|
||||||
const parentId = Number(body.parentId);
|
const parentId = Number(body.parentId);
|
||||||
const parentEventType = await prisma.eventType.findUnique({
|
const parentEventType = await prisma.eventType.findUnique({
|
||||||
where: {
|
where: { id: parentId },
|
||||||
id: parentId,
|
select: { teamId: true },
|
||||||
},
|
|
||||||
select: {
|
|
||||||
teamId: true,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!parentEventType) {
|
if (!parentEventType) {
|
||||||
@@ -44,7 +40,8 @@ export default async function checkParentEventOwnership(req: NextApiRequest) {
|
|||||||
where: {
|
where: {
|
||||||
teamId: parentEventType.teamId,
|
teamId: parentEventType.teamId,
|
||||||
userId: userId,
|
userId: userId,
|
||||||
OR: [{ role: "OWNER" }, { role: "ADMIN" }],
|
role: { in: ["ADMIN", "OWNER"] },
|
||||||
|
accepted: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -10,21 +10,17 @@ export default async function checkTeamEventEditPermission(
|
|||||||
req: NextApiRequest,
|
req: NextApiRequest,
|
||||||
body: Pick<z.infer<typeof schemaEventTypeCreateBodyParams>, "teamId" | "userId">
|
body: Pick<z.infer<typeof schemaEventTypeCreateBodyParams>, "teamId" | "userId">
|
||||||
) {
|
) {
|
||||||
const { isSystemWideAdmin } = req;
|
|
||||||
let userId = req.userId;
|
|
||||||
if (isSystemWideAdmin && body.userId) {
|
|
||||||
userId = body.userId;
|
|
||||||
}
|
|
||||||
if (body.teamId) {
|
if (body.teamId) {
|
||||||
const membership = await prisma.membership.findFirst({
|
const membership = await prisma.membership.findFirst({
|
||||||
where: {
|
where: {
|
||||||
userId,
|
userId: req.userId,
|
||||||
teamId: body.teamId,
|
teamId: body.teamId,
|
||||||
accepted: true,
|
accepted: true,
|
||||||
|
role: { in: ["ADMIN", "OWNER"] },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!membership?.role || !["ADMIN", "OWNER"].includes(membership.role)) {
|
if (!membership) {
|
||||||
throw new HttpError({
|
throw new HttpError({
|
||||||
statusCode: 403,
|
statusCode: 403,
|
||||||
message: "No permission to operate on event-type for this team",
|
message: "No permission to operate on event-type for this team",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import utc from "dayjs/plugin/utc";
|
|||||||
import type { NextApiRequest, NextApiResponse } from "next";
|
import type { NextApiRequest, NextApiResponse } from "next";
|
||||||
|
|
||||||
import dayjs from "@calcom/dayjs";
|
import dayjs from "@calcom/dayjs";
|
||||||
|
import { IS_PRODUCTION } from "@calcom/lib/constants";
|
||||||
import { isSupportedTimeZone } from "@calcom/lib/date-fns";
|
import { isSupportedTimeZone } from "@calcom/lib/date-fns";
|
||||||
import { HttpError } from "@calcom/lib/http-error";
|
import { HttpError } from "@calcom/lib/http-error";
|
||||||
import { defaultResponder } from "@calcom/lib/server";
|
import { defaultResponder } from "@calcom/lib/server";
|
||||||
@@ -17,14 +18,22 @@ import { getHTTPStatusCodeFromError } from "@trpc/server/http";
|
|||||||
dayjs.extend(utc);
|
dayjs.extend(utc);
|
||||||
dayjs.extend(timezone);
|
dayjs.extend(timezone);
|
||||||
|
|
||||||
|
let isColdStart = true;
|
||||||
|
|
||||||
async function handler(req: NextApiRequest, res: NextApiResponse) {
|
async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||||
try {
|
try {
|
||||||
const { usernameList, ...rest } = req.query;
|
if (isColdStart && IS_PRODUCTION) {
|
||||||
|
console.log("Cold start of /v1/slots detected");
|
||||||
|
isColdStart = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { usernameList, isTeamEvent, ...rest } = req.query;
|
||||||
|
const parsedIsTeamEvent = String(isTeamEvent).toLowerCase() === "true";
|
||||||
let slugs = usernameList;
|
let slugs = usernameList;
|
||||||
if (!Array.isArray(usernameList)) {
|
if (!Array.isArray(usernameList)) {
|
||||||
slugs = usernameList ? [usernameList] : undefined;
|
slugs = usernameList ? [usernameList] : undefined;
|
||||||
}
|
}
|
||||||
const input = getScheduleSchema.parse({ usernameList: slugs, ...rest });
|
const input = getScheduleSchema.parse({ usernameList: slugs, isTeamEvent: parsedIsTeamEvent, ...rest });
|
||||||
const timeZoneSupported = input.timeZone ? isSupportedTimeZone(input.timeZone) : false;
|
const timeZoneSupported = input.timeZone ? isSupportedTimeZone(input.timeZone) : false;
|
||||||
const availableSlots = await getAvailableSlots({ ctx: await createContext({ req, res }), input });
|
const availableSlots = await getAvailableSlots({ ctx: await createContext({ req, res }), input });
|
||||||
const slotsInProvidedTimeZone = timeZoneSupported
|
const slotsInProvidedTimeZone = timeZoneSupported
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export async function canUserAccessTeamWithRole(
|
|||||||
/** If not ADMIN then we check if the actual user belongs to team and matches the required role */
|
/** If not ADMIN then we check if the actual user belongs to team and matches the required role */
|
||||||
if (!isSystemWideAdmin) args.where = { ...args.where, members: { some: { userId, role } } };
|
if (!isSystemWideAdmin) args.where = { ...args.where, members: { some: { userId, role } } };
|
||||||
const team = await prisma.team.findFirst(args);
|
const team = await prisma.team.findFirst(args);
|
||||||
if (!team) throw new HttpError({ statusCode: 401, message: `Unauthorized: ${role.toString()} required` });
|
if (!team) throw new HttpError({ statusCode: 401, message: `Unauthorized: OWNER or ADMIN role required` });
|
||||||
return team;
|
return team;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ export async function patchHandler(req: NextApiRequest) {
|
|||||||
metadata: NonNullable<typeof data.metadata> | undefined;
|
metadata: NonNullable<typeof data.metadata> | undefined;
|
||||||
} = {
|
} = {
|
||||||
...data,
|
...data,
|
||||||
|
smsLockReviewedByAdmin: false,
|
||||||
metadata: data.metadata === null ? {} : data.metadata || undefined,
|
metadata: data.metadata === null ? {} : data.metadata || undefined,
|
||||||
};
|
};
|
||||||
const team = await prisma.team.update({ where: { id: teamId }, data: cloneData });
|
const team = await prisma.team.update({ where: { id: teamId }, data: cloneData });
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ const querySchema = z.object({
|
|||||||
* tags:
|
* tags:
|
||||||
* - event-types
|
* - event-types
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/event-types
|
* url: https://docs.cal.com/docs/core-features/event-types
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
* 200:
|
||||||
* description: OK
|
* description: OK
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ async function postHandler(req: NextApiRequest) {
|
|||||||
metadata: NonNullable<typeof data.metadata> | undefined;
|
metadata: NonNullable<typeof data.metadata> | undefined;
|
||||||
} = {
|
} = {
|
||||||
...data,
|
...data,
|
||||||
|
smsLockReviewedByAdmin: false,
|
||||||
metadata: data.metadata === null ? {} : data.metadata || undefined,
|
metadata: data.metadata === null ? {} : data.metadata || undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -214,6 +215,7 @@ const generateTeamCheckoutSession = async ({
|
|||||||
metadata: {
|
metadata: {
|
||||||
pendingPaymentTeamId,
|
pendingPaymentTeamId,
|
||||||
ownerId,
|
ownerId,
|
||||||
|
dubCustomerId: ownerId, // pass the userId during checkout creation for sales conversion tracking: https://d.to/conversions/stripe
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import { schemaQueryIdAsString } from "~/lib/validations/shared/queryIdString";
|
|||||||
* tags:
|
* tags:
|
||||||
* - webhooks
|
* - webhooks
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/webhooks
|
* url: https://docs.cal.com/docs/core-features/webhooks
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, hook removed successfully
|
* description: OK, hook removed successfully
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import { schemaWebhookReadPublic } from "~/lib/validations/webhook";
|
|||||||
* tags:
|
* tags:
|
||||||
* - webhooks
|
* - webhooks
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/webhooks
|
* url: https://docs.cal.com/docs/core-features/webhooks
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
* 200:
|
||||||
* description: OK
|
* description: OK
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ import { schemaWebhookEditBodyParams, schemaWebhookReadPublic } from "~/lib/vali
|
|||||||
* tags:
|
* tags:
|
||||||
* - webhooks
|
* - webhooks
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/webhooks
|
* url: https://docs.cal.com/docs/core-features/webhooks
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, webhook edited successfully
|
* description: OK, webhook edited successfully
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import { schemaWebhookReadPublic } from "~/lib/validations/webhook";
|
|||||||
* tags:
|
* tags:
|
||||||
* - webhooks
|
* - webhooks
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/webhooks
|
* url: https://docs.cal.com/docs/core-features/webhooks
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
* 200:
|
||||||
* description: OK
|
* description: OK
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ import { schemaWebhookCreateBodyParams, schemaWebhookReadPublic } from "~/lib/va
|
|||||||
* tags:
|
* tags:
|
||||||
* - webhooks
|
* - webhooks
|
||||||
* externalDocs:
|
* externalDocs:
|
||||||
* url: https://docs.cal.com/core-features/webhooks
|
* url: https://docs.cal.com/docs/core-features/webhooks
|
||||||
* responses:
|
* responses:
|
||||||
* 201:
|
* 201:
|
||||||
* description: OK, webhook created
|
* description: OK, webhook created
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
# Set the version of docker compose to use
|
|
||||||
version: "3.9"
|
|
||||||
|
|
||||||
# The containers that compose the project
|
# The containers that compose the project
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
|
|||||||
@@ -1,90 +1,332 @@
|
|||||||
|
import prismock from "../../../../../../tests/libs/__mocks__/prisma";
|
||||||
|
|
||||||
import type { Request, Response } from "express";
|
import type { Request, Response } from "express";
|
||||||
import type { NextApiRequest, NextApiResponse } from "next";
|
import type { NextApiRequest, NextApiResponse } from "next";
|
||||||
import { createMocks } from "node-mocks-http";
|
import { createMocks } from "node-mocks-http";
|
||||||
import { describe, it, expect } from "vitest";
|
import { describe, it, expect, test } from "vitest";
|
||||||
|
|
||||||
import type { HttpError } from "@calcom/lib/http-error";
|
import { MembershipRole } from "@calcom/prisma/enums";
|
||||||
import prisma from "@calcom/prisma";
|
|
||||||
|
|
||||||
import authMiddleware from "../../../pages/api/bookings/[id]/_auth-middleware";
|
import authMiddleware from "../../../pages/api/bookings/[id]/_auth-middleware";
|
||||||
|
|
||||||
type CustomNextApiRequest = NextApiRequest & Request;
|
type CustomNextApiRequest = NextApiRequest & Request;
|
||||||
type CustomNextApiResponse = NextApiResponse & Response;
|
type CustomNextApiResponse = NextApiResponse & Response;
|
||||||
|
|
||||||
describe("Bookings auth middleware", () => {
|
describe("Booking ownership and access in Middleware", () => {
|
||||||
it("Returns 403 when user has no permission to the booking", async () => {
|
const adminUserId = 1;
|
||||||
const trialUser = await prisma.user.findFirstOrThrow({ where: { email: "trial@example.com" } });
|
const ownerUserId = 2;
|
||||||
const proUser = await prisma.user.findFirstOrThrow({ where: { email: "pro@example.com" } });
|
const memberUserId = 3;
|
||||||
const booking = await prisma.booking.findFirstOrThrow({ where: { userId: proUser.id } });
|
const orgOwnerUserId = 4;
|
||||||
|
const adminUserEmail = "admin@example.com";
|
||||||
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
const ownerUserEmail = "owner@example.com";
|
||||||
method: "GET",
|
const memberUserEmail = "member@example.com";
|
||||||
body: {},
|
const orgOwnerUserEmail = "org-owner@example.com";
|
||||||
query: {
|
// mock user data
|
||||||
id: booking.id,
|
function buildMockData() {
|
||||||
|
//Create Users
|
||||||
|
prismock.user.create({
|
||||||
|
data: {
|
||||||
|
id: adminUserId,
|
||||||
|
username: "admin",
|
||||||
|
name: "Admin User",
|
||||||
|
email: adminUserEmail,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
prismock.user.create({
|
||||||
|
data: {
|
||||||
|
id: ownerUserId,
|
||||||
|
username: "owner",
|
||||||
|
name: "Owner User",
|
||||||
|
email: ownerUserEmail,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
prismock.user.create({
|
||||||
|
data: {
|
||||||
|
id: orgOwnerUserId,
|
||||||
|
username: "org-owner",
|
||||||
|
name: "Org Owner",
|
||||||
|
email: orgOwnerUserEmail,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
prismock.user.create({
|
||||||
|
data: {
|
||||||
|
id: memberUserId,
|
||||||
|
username: "member",
|
||||||
|
name: "Member User",
|
||||||
|
email: memberUserEmail,
|
||||||
|
bookings: {
|
||||||
|
create: {
|
||||||
|
id: 2,
|
||||||
|
uid: "2",
|
||||||
|
title: "Booking 2",
|
||||||
|
eventTypeId: 1,
|
||||||
|
startTime: "2024-08-30T06:45:00.000Z",
|
||||||
|
endTime: "2024-08-30T07:45:00.000Z",
|
||||||
|
attendees: {
|
||||||
|
create: {
|
||||||
|
name: "Member User",
|
||||||
|
email: memberUserEmail,
|
||||||
|
timeZone: "UTC",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
//create team
|
||||||
|
prismock.team.create({
|
||||||
|
data: {
|
||||||
|
id: 1,
|
||||||
|
name: "Team 1",
|
||||||
|
slug: "team1",
|
||||||
|
members: {
|
||||||
|
createMany: {
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
userId: adminUserId,
|
||||||
|
role: MembershipRole.ADMIN,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
userId: ownerUserId,
|
||||||
|
role: MembershipRole.OWNER,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
userId: memberUserId,
|
||||||
|
role: MembershipRole.MEMBER,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
//create Org
|
||||||
|
prismock.team.create({
|
||||||
|
data: {
|
||||||
|
id: 2,
|
||||||
|
name: "Org",
|
||||||
|
slug: "org",
|
||||||
|
isOrganization: true,
|
||||||
|
children: {
|
||||||
|
connect: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
members: {
|
||||||
|
createMany: {
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
userId: orgOwnerUserId,
|
||||||
|
role: MembershipRole.OWNER,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
userId: memberUserId,
|
||||||
|
role: MembershipRole.MEMBER,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
userId: ownerUserId,
|
||||||
|
role: MembershipRole.MEMBER,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
userId: adminUserId,
|
||||||
|
role: MembershipRole.MEMBER,
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
//create eventTypes
|
||||||
|
prismock.eventType.create({
|
||||||
|
data: {
|
||||||
|
id: 1,
|
||||||
|
title: "Event 1",
|
||||||
|
slug: "event",
|
||||||
|
length: 60,
|
||||||
|
bookings: {
|
||||||
|
connect: {
|
||||||
|
id: 2,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
prismock.eventType.create({
|
||||||
|
data: {
|
||||||
|
id: 2,
|
||||||
|
title: "Event 2",
|
||||||
|
slug: "event",
|
||||||
|
length: 60,
|
||||||
|
teamId: 1,
|
||||||
|
bookings: {
|
||||||
|
connect: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
//link eventType to teams
|
||||||
|
prismock.eventType.update({
|
||||||
|
where: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
owner: {
|
||||||
|
connect: {
|
||||||
|
id: ownerUserId,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
prismock.eventType.update({
|
||||||
|
where: {
|
||||||
|
id: 2,
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
team: {
|
||||||
|
connect: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
//link team to org
|
||||||
|
prismock.team.update({
|
||||||
|
where: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
parentId: 2,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
// Call Prisma to create booking with attendees
|
||||||
|
prismock.booking.create({
|
||||||
|
data: {
|
||||||
|
id: 1,
|
||||||
|
uid: "1",
|
||||||
|
title: "Booking 1",
|
||||||
|
userId: 1,
|
||||||
|
startTime: "2024-08-30T06:45:00.000Z",
|
||||||
|
endTime: "2024-08-30T07:45:00.000Z",
|
||||||
|
eventTypeId: 2,
|
||||||
|
attendees: {
|
||||||
|
create: {
|
||||||
|
name: "Admin User",
|
||||||
|
email: adminUserEmail,
|
||||||
|
timeZone: "UTC",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
req.userId = trialUser.id;
|
test("should not throw error for bookings where user is an attendee", async () => {
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
try {
|
method: "GET",
|
||||||
await authMiddleware(req);
|
query: {
|
||||||
} catch (error) {
|
id: 2,
|
||||||
const httpError = error as HttpError;
|
},
|
||||||
expect(httpError.statusCode).toBe(403);
|
prisma: prismock,
|
||||||
}
|
});
|
||||||
|
buildMockData();
|
||||||
|
req.userId = memberUserId;
|
||||||
|
await expect(authMiddleware(req)).resolves.not.toThrow();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("No error is thrown when user is the booking user", async () => {
|
test("should throw error for bookings where user is not an attendee", async () => {
|
||||||
const proUser = await prisma.user.findFirstOrThrow({ where: { email: "pro@example.com" } });
|
|
||||||
const booking = await prisma.booking.findFirstOrThrow({ where: { userId: proUser.id } });
|
|
||||||
|
|
||||||
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
body: {},
|
|
||||||
query: {
|
query: {
|
||||||
id: booking.id,
|
id: 1,
|
||||||
},
|
},
|
||||||
|
prisma: prismock,
|
||||||
});
|
});
|
||||||
|
buildMockData();
|
||||||
|
req.userId = memberUserId;
|
||||||
|
|
||||||
req.userId = proUser.id;
|
await expect(authMiddleware(req)).rejects.toThrow();
|
||||||
|
|
||||||
await authMiddleware(req);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("No error is thrown when user is system-wide admin", async () => {
|
test("should not throw error for booking where user is the event type owner", async () => {
|
||||||
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "admin@example.com" } });
|
|
||||||
const proUser = await prisma.user.findFirstOrThrow({ where: { email: "pro@example.com" } });
|
|
||||||
const booking = await prisma.booking.findFirstOrThrow({ where: { userId: proUser.id } });
|
|
||||||
|
|
||||||
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
body: {},
|
|
||||||
query: {
|
query: {
|
||||||
id: booking.id,
|
id: 2,
|
||||||
},
|
},
|
||||||
|
prisma: prismock,
|
||||||
});
|
});
|
||||||
|
buildMockData();
|
||||||
|
req.userId = ownerUserId;
|
||||||
|
await expect(authMiddleware(req)).resolves.not.toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
req.userId = adminUser.id;
|
test("should not throw error for booking where user is team owner or admin", async () => {
|
||||||
|
const { req: req1 } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
prisma: prismock,
|
||||||
|
});
|
||||||
|
const { req: req2 } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
prisma: prismock,
|
||||||
|
});
|
||||||
|
buildMockData();
|
||||||
|
|
||||||
|
req1.userId = adminUserId;
|
||||||
|
req2.userId = ownerUserId;
|
||||||
|
|
||||||
|
await expect(authMiddleware(req1)).resolves.not.toThrow();
|
||||||
|
await expect(authMiddleware(req2)).resolves.not.toThrow();
|
||||||
|
});
|
||||||
|
test("should throw error for booking where user is not team owner or admin", async () => {
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
prisma: prismock,
|
||||||
|
});
|
||||||
|
buildMockData();
|
||||||
|
|
||||||
|
req.userId = memberUserId;
|
||||||
|
|
||||||
|
await expect(authMiddleware(req)).rejects.toThrow();
|
||||||
|
});
|
||||||
|
test("should not throw error when user is system-wide admin", async () => {
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
id: 2,
|
||||||
|
},
|
||||||
|
prisma: prismock,
|
||||||
|
});
|
||||||
|
buildMockData();
|
||||||
|
req.userId = adminUserId;
|
||||||
req.isSystemWideAdmin = true;
|
req.isSystemWideAdmin = true;
|
||||||
|
|
||||||
await authMiddleware(req);
|
await authMiddleware(req);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("No error is thrown when user is org-wide admin", async () => {
|
it("should throw error when user is org-wide admin", async () => {
|
||||||
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
|
||||||
const memberUser = await prisma.user.findFirstOrThrow({ where: { email: "member1-acme@example.com" } });
|
|
||||||
const booking = await prisma.booking.findFirstOrThrow({ where: { userId: memberUser.id } });
|
|
||||||
|
|
||||||
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
body: {},
|
|
||||||
query: {
|
query: {
|
||||||
id: booking.id,
|
id: 1,
|
||||||
},
|
},
|
||||||
|
prisma: prismock,
|
||||||
});
|
});
|
||||||
|
buildMockData();
|
||||||
req.userId = adminUser.id;
|
req.userId = orgOwnerUserId;
|
||||||
req.isOrganizationOwnerOrAdmin = true;
|
req.isOrganizationOwnerOrAdmin = true;
|
||||||
|
|
||||||
await authMiddleware(req);
|
await authMiddleware(req);
|
||||||
|
|||||||
@@ -105,4 +105,87 @@ describe("GET /api/bookings", async () => {
|
|||||||
expect(responseData.bookings.find((b) => b.id === proUserBooking.id)).toBeUndefined();
|
expect(responseData.bookings.find((b) => b.id === proUserBooking.id)).toBeUndefined();
|
||||||
expect(groupedUsers.size).toBeGreaterThanOrEqual(2);
|
expect(groupedUsers.size).toBeGreaterThanOrEqual(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("Upcoming bookings feature", () => {
|
||||||
|
it("Returns only upcoming bookings when status=upcoming for regular user", async () => {
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
status: "upcoming",
|
||||||
|
},
|
||||||
|
pagination: DefaultPagination,
|
||||||
|
});
|
||||||
|
|
||||||
|
req.userId = proUser.id;
|
||||||
|
|
||||||
|
const responseData = await handler(req);
|
||||||
|
responseData.bookings.forEach((booking) => {
|
||||||
|
expect(new Date(booking.startTime).getTime()).toBeGreaterThanOrEqual(new Date().getTime());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Returns all bookings when status not specified for regular user", async () => {
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
pagination: DefaultPagination,
|
||||||
|
});
|
||||||
|
|
||||||
|
req.userId = proUser.id;
|
||||||
|
|
||||||
|
const responseData = await handler(req);
|
||||||
|
expect(responseData.bookings.find((b) => b.id === proUserBooking.id)).toBeDefined();
|
||||||
|
|
||||||
|
const { req: req2 } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
pagination: DefaultPagination,
|
||||||
|
});
|
||||||
|
|
||||||
|
req2.userId = proUser.id;
|
||||||
|
|
||||||
|
const responseData2 = await handler(req2);
|
||||||
|
expect(responseData2.bookings.find((b) => b.id === proUserBooking.id)).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Returns only upcoming bookings when status=upcoming for system-wide admin", async () => {
|
||||||
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
status: "upcoming",
|
||||||
|
},
|
||||||
|
pagination: {
|
||||||
|
take: 100,
|
||||||
|
skip: 0,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
req.isSystemWideAdmin = true;
|
||||||
|
req.userId = adminUser.id;
|
||||||
|
|
||||||
|
const responseData = await handler(req);
|
||||||
|
responseData.bookings.forEach((booking) => {
|
||||||
|
console.log(booking);
|
||||||
|
expect(new Date(booking.startTime).getTime()).toBeGreaterThanOrEqual(new Date().getTime());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Returns only upcoming bookings when status=upcoming for org admin", async () => {
|
||||||
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "GET",
|
||||||
|
query: {
|
||||||
|
status: "upcoming",
|
||||||
|
},
|
||||||
|
pagination: DefaultPagination,
|
||||||
|
});
|
||||||
|
|
||||||
|
req.userId = adminUser.id;
|
||||||
|
req.isOrganizationOwnerOrAdmin = true;
|
||||||
|
|
||||||
|
const responseData = await handler(req);
|
||||||
|
responseData.bookings.forEach((booking) => {
|
||||||
|
expect(new Date(booking.startTime).getTime()).toBeGreaterThanOrEqual(new Date().getTime());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import prismaMock from "../../../../../../../tests/libs/__mocks__/prismaMock";
|
||||||
|
|
||||||
|
import type { Request, Response } from "express";
|
||||||
|
import type { NextApiRequest, NextApiResponse } from "next";
|
||||||
|
import { createMocks } from "node-mocks-http";
|
||||||
|
import { describe, expect, test, beforeEach, vi } from "vitest";
|
||||||
|
|
||||||
|
import { buildEventType } from "@calcom/lib/test/builder";
|
||||||
|
import { MembershipRole } from "@calcom/prisma/enums";
|
||||||
|
|
||||||
|
import handler from "../../../../pages/api/event-types/[id]/_delete";
|
||||||
|
|
||||||
|
type CustomNextApiRequest = NextApiRequest & Request;
|
||||||
|
type CustomNextApiResponse = NextApiResponse & Response;
|
||||||
|
|
||||||
|
describe("DELETE /api/event-types/[id]", () => {
|
||||||
|
const eventTypeId = 1234567;
|
||||||
|
const teamId = 9999;
|
||||||
|
const adminUser = 1111;
|
||||||
|
const memberUser = 2222;
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.resetAllMocks();
|
||||||
|
// Mocking membership.findFirst
|
||||||
|
prismaMock.membership.findFirst.mockImplementation(({ where }) => {
|
||||||
|
const { userId, teamId, accepted, role } = where;
|
||||||
|
const mockData = [
|
||||||
|
{ userId: 1111, teamId: teamId, accepted: true, role: MembershipRole.ADMIN },
|
||||||
|
{ userId: 2222, teamId: teamId, accepted: true, role: MembershipRole.MEMBER },
|
||||||
|
];
|
||||||
|
// Return the correct user based on the query conditions
|
||||||
|
return mockData.find(
|
||||||
|
(membership) =>
|
||||||
|
membership.userId === userId &&
|
||||||
|
membership.teamId === teamId &&
|
||||||
|
membership.accepted === accepted &&
|
||||||
|
role.in.includes(membership.role)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Mocking eventType.findFirst
|
||||||
|
prismaMock.eventType.findFirst.mockResolvedValue(
|
||||||
|
buildEventType({
|
||||||
|
id: eventTypeId,
|
||||||
|
teamId,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Mocking team.findUnique
|
||||||
|
prismaMock.team.findUnique.mockResolvedValue({
|
||||||
|
id: teamId,
|
||||||
|
members: [
|
||||||
|
{ userId: memberUser, role: MembershipRole.MEMBER, teamId: teamId },
|
||||||
|
{ userId: adminUser, role: MembershipRole.ADMIN, teamId: teamId },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Error", async () => {
|
||||||
|
test("Fails to remove event type if user is not OWNER/ADMIN of team associated with event type", async () => {
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "DELETE",
|
||||||
|
body: {},
|
||||||
|
query: {
|
||||||
|
id: eventTypeId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assign userId to the request objects
|
||||||
|
req.userId = memberUser;
|
||||||
|
|
||||||
|
await handler(req, res);
|
||||||
|
expect(res.statusCode).toBe(403); // Check if the deletion was successful
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Success", async () => {
|
||||||
|
test("Removes event type if user is owner of team associated with event type", async () => {
|
||||||
|
// Mocks for DELETE request
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "DELETE",
|
||||||
|
body: {},
|
||||||
|
query: {
|
||||||
|
id: eventTypeId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assign userId to the request objects
|
||||||
|
req.userId = adminUser;
|
||||||
|
|
||||||
|
await handler(req, res);
|
||||||
|
expect(res.statusCode).toBe(200); // Check if the deletion was successful
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
import prismaMock from "../../../../../../tests/libs/__mocks__/prismaMock";
|
||||||
|
|
||||||
|
import type { Request, Response } from "express";
|
||||||
|
import type { NextApiRequest, NextApiResponse } from "next";
|
||||||
|
import { createMocks } from "node-mocks-http";
|
||||||
|
import { describe, expect, test, vi, afterEach } from "vitest";
|
||||||
|
|
||||||
|
import { buildEventType } from "@calcom/lib/test/builder";
|
||||||
|
|
||||||
|
import handler from "../../../pages/api/event-types/_post";
|
||||||
|
import checkParentEventOwnership from "../../../pages/api/event-types/_utils/checkParentEventOwnership";
|
||||||
|
import checkTeamEventEditPermission from "../../../pages/api/event-types/_utils/checkTeamEventEditPermission";
|
||||||
|
import checkUserMembership from "../../../pages/api/event-types/_utils/checkUserMembership";
|
||||||
|
import ensureOnlyMembersAsHosts from "../../../pages/api/event-types/_utils/ensureOnlyMembersAsHosts";
|
||||||
|
import { canUserAccessTeamWithRole } from "../../../pages/api/teams/[teamId]/_auth-middleware";
|
||||||
|
|
||||||
|
type CustomNextApiRequest = NextApiRequest & Request;
|
||||||
|
type CustomNextApiResponse = NextApiResponse & Response;
|
||||||
|
|
||||||
|
const adminUserId = 1;
|
||||||
|
const memberUserId = 10;
|
||||||
|
|
||||||
|
vi.mock("../../../pages/api/teams/[teamId]/_auth-middleware", () => ({
|
||||||
|
canUserAccessTeamWithRole: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../../../pages/api/event-types/_utils/checkUserMembership", () => ({
|
||||||
|
default: vi.fn(),
|
||||||
|
}));
|
||||||
|
vi.mock("../../../pages/api/event-types/_utils/checkParentEventOwnership", () => ({
|
||||||
|
default: vi.fn(),
|
||||||
|
}));
|
||||||
|
vi.mock("../../../pages/api/event-types/_utils/checkTeamEventEditPermission", () => ({
|
||||||
|
default: vi.fn(),
|
||||||
|
}));
|
||||||
|
vi.mock("../../../pages/api/event-types/_utils/ensureOnlyMembersAsHosts", () => ({
|
||||||
|
default: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.resetAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("POST /api/event-types", () => {
|
||||||
|
describe("Errors", () => {
|
||||||
|
test("should throw 401 if a non-admin user tries to create an event type with userId", async () => {
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
title: "Tennis class",
|
||||||
|
slug: "tennis-class-{{$guid}}",
|
||||||
|
length: 60,
|
||||||
|
hidden: true,
|
||||||
|
userId: memberUserId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await handler(req, res);
|
||||||
|
|
||||||
|
expect(res.statusCode).toBe(401);
|
||||||
|
expect(JSON.parse(res._getData()).message).toBe("ADMIN required for `userId`");
|
||||||
|
});
|
||||||
|
test("should throw 401 if not system-wide admin and user cannot access teamId with required roles", async () => {
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
title: "Tennis class",
|
||||||
|
slug: "tennis-class-{{$guid}}",
|
||||||
|
length: 60,
|
||||||
|
hidden: true,
|
||||||
|
teamId: 9999,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
req.userId = memberUserId;
|
||||||
|
vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => false);
|
||||||
|
|
||||||
|
await handler(req, res);
|
||||||
|
|
||||||
|
expect(res.statusCode).toBe(401);
|
||||||
|
expect(JSON.parse(res._getData()).message).toBe("ADMIN required for `teamId`");
|
||||||
|
});
|
||||||
|
test("should throw 400 if system-wide admin but neither userId nor teamId provided", async () => {
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
title: "Tennis class",
|
||||||
|
slug: "tennis-class-{{$guid}}",
|
||||||
|
length: 60,
|
||||||
|
hidden: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
req.isSystemWideAdmin = true;
|
||||||
|
await handler(req, res);
|
||||||
|
|
||||||
|
expect(res.statusCode).toBe(400);
|
||||||
|
expect(JSON.parse(res._getData()).message).toBe("`userId` or `teamId` required");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Success", () => {
|
||||||
|
test("should call checkParentEventOwnership and checkUserMembership if parentId is present", async () => {
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
title: "Tennis class",
|
||||||
|
slug: "tennis-class-{{$guid}}",
|
||||||
|
length: 60,
|
||||||
|
hidden: true,
|
||||||
|
userId: memberUserId,
|
||||||
|
parentId: 9999,
|
||||||
|
teamId: 9999,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
req.isSystemWideAdmin = true;
|
||||||
|
req.userId = adminUserId;
|
||||||
|
|
||||||
|
vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => false);
|
||||||
|
|
||||||
|
await handler(req, res);
|
||||||
|
expect(checkParentEventOwnership).toHaveBeenCalled();
|
||||||
|
expect(checkUserMembership).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should create event type successfully if all conditions are met", async () => {
|
||||||
|
const eventTypeTest = buildEventType();
|
||||||
|
const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
title: "test title",
|
||||||
|
slug: "test-slug",
|
||||||
|
length: 60,
|
||||||
|
hidden: true,
|
||||||
|
userId: memberUserId,
|
||||||
|
parentId: 9999,
|
||||||
|
teamId: 9999,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
req.isSystemWideAdmin = true;
|
||||||
|
req.userId = adminUserId;
|
||||||
|
|
||||||
|
vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => true);
|
||||||
|
vi.mocked(checkParentEventOwnership).mockImplementationOnce(async () => undefined);
|
||||||
|
vi.mocked(checkUserMembership).mockImplementationOnce(async () => undefined);
|
||||||
|
vi.mocked(checkTeamEventEditPermission).mockImplementationOnce(async () => undefined);
|
||||||
|
vi.mocked(ensureOnlyMembersAsHosts).mockImplementationOnce(async () => undefined);
|
||||||
|
|
||||||
|
prismaMock.eventType.create.mockResolvedValue(eventTypeTest);
|
||||||
|
|
||||||
|
await handler(req, res);
|
||||||
|
const data = JSON.parse(res._getData());
|
||||||
|
|
||||||
|
expect(prismaMock.eventType.create).toHaveBeenCalledTimes(1);
|
||||||
|
expect(res.statusCode).toBe(200);
|
||||||
|
expect(data.message).toBe("Event type created successfully");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -58,7 +58,7 @@ describe("isAdmin guard", () => {
|
|||||||
expect(scope).toBe(ScopeOfAdmin.SystemWide);
|
expect(scope).toBe(ScopeOfAdmin.SystemWide);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Returns org-wide admin when user is set as such", async () => {
|
it("Returns org-wide admin when user is set as such & admin API access is granted", async () => {
|
||||||
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: {},
|
body: {},
|
||||||
@@ -67,10 +67,21 @@ describe("isAdmin guard", () => {
|
|||||||
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
||||||
|
|
||||||
req.userId = adminUser.id;
|
req.userId = adminUser.id;
|
||||||
|
|
||||||
const { isAdmin, scope } = await isAdminGuard(req);
|
const { isAdmin, scope } = await isAdminGuard(req);
|
||||||
|
|
||||||
expect(isAdmin).toBe(true);
|
expect(isAdmin).toBe(true);
|
||||||
expect(scope).toBe(ScopeOfAdmin.OrgOwnerOrAdmin);
|
expect(scope).toBe(ScopeOfAdmin.OrgOwnerOrAdmin);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("Returns no admin when user is set as org admin but admin API access is revoked", async () => {
|
||||||
|
const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
|
||||||
|
method: "POST",
|
||||||
|
body: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-dunder@example.com" } });
|
||||||
|
|
||||||
|
req.userId = adminUser.id;
|
||||||
|
const { isAdmin } = await isAdminGuard(req);
|
||||||
|
expect(isAdmin).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
|
<a href="http://nestjs.com/" target="blank"><img src="https://github.com/user-attachments/assets/ce7c2ecf-6097-469a-8512-c846a9fb665d" height="200" alt="Nest Logo" /></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
|
[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
|
||||||
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
|
Cal.com is using the [Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
version: '3.8'
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
redis:
|
redis:
|
||||||
image: redis:latest
|
image: redis:latest
|
||||||
|
|||||||
@@ -10,8 +10,9 @@
|
|||||||
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
"start": "nest start",
|
"start": "nest start",
|
||||||
"dev:build:watch": "yarn workspace @calcom/platform-constants build:watch & yarn workspace @calcom/platform-utils build:watch & yarn workspace @calcom/platform-types build:watch",
|
"dev:build:watch": "yarn workspace @calcom/platform-constants build:watch & yarn workspace @calcom/platform-utils build:watch & yarn workspace @calcom/platform-types build:watch",
|
||||||
"dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build",
|
"dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build ",
|
||||||
"dev": "yarn dev:build && docker-compose up -d && yarn copy-swagger-module && yarn start --watch",
|
"dev": "yarn dev:build && docker-compose up -d && yarn copy-swagger-module && yarn start --watch",
|
||||||
|
"dev:no-docker": "yarn dev:build && yarn copy-swagger-module && yarn start --watch",
|
||||||
"start:debug": "nest start --debug --watch",
|
"start:debug": "nest start --debug --watch",
|
||||||
"start:prod": "node ./dist/apps/api/v2/src/main.js",
|
"start:prod": "node ./dist/apps/api/v2/src/main.js",
|
||||||
"test": "yarn dev:build && jest",
|
"test": "yarn dev:build && jest",
|
||||||
@@ -19,14 +20,16 @@
|
|||||||
"test:cov": "yarn dev:build && jest --coverage",
|
"test:cov": "yarn dev:build && jest --coverage",
|
||||||
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||||
"test:e2e": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.json",
|
"test:e2e": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.json",
|
||||||
|
"test:e2e:watch": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.json --watch",
|
||||||
"prisma": "yarn workspace @calcom/prisma prisma",
|
"prisma": "yarn workspace @calcom/prisma prisma",
|
||||||
"generate-schemas": "yarn prisma generate && yarn prisma format",
|
"generate-schemas": "yarn prisma generate && yarn prisma format",
|
||||||
"copy-swagger-module": "ts-node -r tsconfig-paths/register swagger/copy-swagger-module.ts"
|
"copy-swagger-module": "ts-node -r tsconfig-paths/register swagger/copy-swagger-module.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@calcom/platform-constants": "*",
|
"@calcom/platform-constants": "*",
|
||||||
|
"@calcom/platform-enums": "*",
|
||||||
|
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.36",
|
||||||
"@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
|
"@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
|
||||||
"@calcom/platform-libraries-0.0.22": "npm:@calcom/platform-libraries@0.0.22",
|
|
||||||
"@calcom/platform-types": "*",
|
"@calcom/platform-types": "*",
|
||||||
"@calcom/platform-utils": "*",
|
"@calcom/platform-utils": "*",
|
||||||
"@calcom/prisma": "*",
|
"@calcom/prisma": "*",
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { BookingsController } from "@/ee/bookings/controllers/bookings.controller";
|
import { BookingsController } from "@/ee/bookings/controllers/bookings.controller";
|
||||||
|
import { ApiKeyRepository } from "@/modules/api-key/api-key-repository";
|
||||||
import { BillingModule } from "@/modules/billing/billing.module";
|
import { BillingModule } from "@/modules/billing/billing.module";
|
||||||
import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
|
import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
|
||||||
import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
|
import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
|
||||||
@@ -10,7 +11,7 @@ import { Module } from "@nestjs/common";
|
|||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [PrismaModule, RedisModule, TokensModule, BillingModule],
|
imports: [PrismaModule, RedisModule, TokensModule, BillingModule],
|
||||||
providers: [TokensRepository, OAuthFlowService, OAuthClientRepository],
|
providers: [TokensRepository, OAuthFlowService, OAuthClientRepository, ApiKeyRepository],
|
||||||
controllers: [BookingsController],
|
controllers: [BookingsController],
|
||||||
})
|
})
|
||||||
export class BookingsModule {}
|
export class BookingsModule {}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { bootstrap } from "@/app";
|
import { bootstrap } from "@/app";
|
||||||
import { AppModule } from "@/app.module";
|
import { AppModule } from "@/app.module";
|
||||||
|
import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
|
||||||
import { GetBookingOutput } from "@/ee/bookings/outputs/get-booking.output";
|
import { GetBookingOutput } from "@/ee/bookings/outputs/get-booking.output";
|
||||||
import { GetBookingsOutput } from "@/ee/bookings/outputs/get-bookings.output";
|
import { GetBookingsOutput } from "@/ee/bookings/outputs/get-bookings.output";
|
||||||
import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
|
import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
|
||||||
@@ -13,14 +14,15 @@ import { NestExpressApplication } from "@nestjs/platform-express";
|
|||||||
import { Test } from "@nestjs/testing";
|
import { Test } from "@nestjs/testing";
|
||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
import * as request from "supertest";
|
import * as request from "supertest";
|
||||||
|
import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
|
||||||
import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
|
import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
|
||||||
import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
|
import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
|
||||||
import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
|
import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
|
||||||
import { withApiAuth } from "test/utils/withApiAuth";
|
import { withApiAuth } from "test/utils/withApiAuth";
|
||||||
|
|
||||||
import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
|
import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
|
||||||
import { handleNewBooking } from "@calcom/platform-libraries-0.0.22";
|
import { handleNewBooking } from "@calcom/platform-libraries";
|
||||||
import { ApiSuccessResponse, ApiResponse } from "@calcom/platform-types";
|
import { ApiSuccessResponse, ApiResponse, ApiErrorResponse } from "@calcom/platform-types";
|
||||||
|
|
||||||
describe("Bookings Endpoints", () => {
|
describe("Bookings Endpoints", () => {
|
||||||
describe("User Authenticated", () => {
|
describe("User Authenticated", () => {
|
||||||
@@ -30,6 +32,8 @@ describe("Bookings Endpoints", () => {
|
|||||||
let bookingsRepositoryFixture: BookingsRepositoryFixture;
|
let bookingsRepositoryFixture: BookingsRepositoryFixture;
|
||||||
let schedulesService: SchedulesService_2024_04_15;
|
let schedulesService: SchedulesService_2024_04_15;
|
||||||
let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
|
let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
|
||||||
|
let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
|
||||||
|
let apiKeyString: string;
|
||||||
|
|
||||||
const userEmail = "bookings-controller-e2e@api.com";
|
const userEmail = "bookings-controller-e2e@api.com";
|
||||||
let user: User;
|
let user: User;
|
||||||
@@ -55,11 +59,13 @@ describe("Bookings Endpoints", () => {
|
|||||||
bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
|
bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
|
||||||
eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
|
eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
|
||||||
schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
|
schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
|
||||||
|
apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(moduleRef);
|
||||||
user = await userRepositoryFixture.create({
|
user = await userRepositoryFixture.create({
|
||||||
email: userEmail,
|
email: userEmail,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const { keyString } = await apiKeysRepositoryFixture.createApiKey(user.id, null);
|
||||||
|
apiKeyString = keyString;
|
||||||
const userSchedule: CreateScheduleInput_2024_04_15 = {
|
const userSchedule: CreateScheduleInput_2024_04_15 = {
|
||||||
name: "working time",
|
name: "working time",
|
||||||
timeZone: "Europe/Rome",
|
timeZone: "Europe/Rome",
|
||||||
@@ -90,7 +96,10 @@ describe("Bookings Endpoints", () => {
|
|||||||
const bookingTimeZone = "Europe/London";
|
const bookingTimeZone = "Europe/London";
|
||||||
const bookingLanguage = "en";
|
const bookingLanguage = "en";
|
||||||
const bookingHashedLink = "";
|
const bookingHashedLink = "";
|
||||||
const bookingMetadata = {};
|
const bookingMetadata = {
|
||||||
|
timeFormat: "12",
|
||||||
|
meetingType: "organizer-phone",
|
||||||
|
};
|
||||||
const bookingResponses = {
|
const bookingResponses = {
|
||||||
name: "tester",
|
name: "tester",
|
||||||
email: "tester@example.com",
|
email: "tester@example.com",
|
||||||
@@ -102,7 +111,7 @@ describe("Bookings Endpoints", () => {
|
|||||||
guests: [],
|
guests: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
const body = {
|
const body: CreateBookingInput = {
|
||||||
start: bookingStart,
|
start: bookingStart,
|
||||||
end: bookingEnd,
|
end: bookingEnd,
|
||||||
eventTypeId: bookingEventTypeId,
|
eventTypeId: bookingEventTypeId,
|
||||||
@@ -135,23 +144,184 @@ describe("Bookings Endpoints", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should fail to create a booking with no_available_users_found_error", async () => {
|
||||||
|
const bookingStart = "2040-05-21T09:30:00.000Z";
|
||||||
|
const bookingEnd = "2040-05-21T10:30:00.000Z";
|
||||||
|
const bookingEventTypeId = eventTypeId;
|
||||||
|
const bookingTimeZone = "Europe/London";
|
||||||
|
const bookingLanguage = "en";
|
||||||
|
const bookingHashedLink = "";
|
||||||
|
const bookingMetadata = {
|
||||||
|
timeFormat: "12",
|
||||||
|
meetingType: "organizer-phone",
|
||||||
|
};
|
||||||
|
const bookingResponses = {
|
||||||
|
name: "tester",
|
||||||
|
email: "tester@example.com",
|
||||||
|
location: {
|
||||||
|
value: "link",
|
||||||
|
optionValue: "",
|
||||||
|
},
|
||||||
|
notes: "test",
|
||||||
|
guests: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const body: CreateBookingInput = {
|
||||||
|
start: bookingStart,
|
||||||
|
end: bookingEnd,
|
||||||
|
eventTypeId: bookingEventTypeId,
|
||||||
|
timeZone: bookingTimeZone,
|
||||||
|
language: bookingLanguage,
|
||||||
|
metadata: bookingMetadata,
|
||||||
|
hashedLink: bookingHashedLink,
|
||||||
|
responses: bookingResponses,
|
||||||
|
};
|
||||||
|
|
||||||
|
return request(app.getHttpServer())
|
||||||
|
.post("/v2/bookings")
|
||||||
|
.send(body)
|
||||||
|
.expect(400)
|
||||||
|
.then(async (response) => {
|
||||||
|
const responseBody: ApiErrorResponse = response.body;
|
||||||
|
expect(responseBody.error.message).toEqual("no_available_users_found_error");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should create a booking with api key to get owner id", async () => {
|
||||||
|
const bookingStart = "2040-05-22T09:30:00.000Z";
|
||||||
|
const bookingEnd = "2040-05-22T10:30:00.000Z";
|
||||||
|
const bookingEventTypeId = eventTypeId;
|
||||||
|
const bookingTimeZone = "Europe/London";
|
||||||
|
const bookingLanguage = "en";
|
||||||
|
const bookingHashedLink = "";
|
||||||
|
const bookingMetadata = {
|
||||||
|
timeFormat: "12",
|
||||||
|
meetingType: "organizer-phone",
|
||||||
|
};
|
||||||
|
const bookingResponses = {
|
||||||
|
name: "tester",
|
||||||
|
email: "tester@example.com",
|
||||||
|
location: {
|
||||||
|
value: "link",
|
||||||
|
optionValue: "",
|
||||||
|
},
|
||||||
|
notes: "test",
|
||||||
|
guests: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const body: CreateBookingInput = {
|
||||||
|
start: bookingStart,
|
||||||
|
end: bookingEnd,
|
||||||
|
eventTypeId: bookingEventTypeId,
|
||||||
|
timeZone: bookingTimeZone,
|
||||||
|
language: bookingLanguage,
|
||||||
|
metadata: bookingMetadata,
|
||||||
|
hashedLink: bookingHashedLink,
|
||||||
|
responses: bookingResponses,
|
||||||
|
};
|
||||||
|
|
||||||
|
return request(app.getHttpServer())
|
||||||
|
.post("/v2/bookings")
|
||||||
|
.send(body)
|
||||||
|
.set({ Authorization: `Bearer cal_test_${apiKeyString}` })
|
||||||
|
.expect(201)
|
||||||
|
.then(async (response) => {
|
||||||
|
const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
|
||||||
|
response.body;
|
||||||
|
expect(responseBody.status).toEqual(SUCCESS_STATUS);
|
||||||
|
expect(responseBody.data).toBeDefined();
|
||||||
|
expect(responseBody.data.userPrimaryEmail).toBeDefined();
|
||||||
|
expect(responseBody.data.userPrimaryEmail).toEqual(userEmail);
|
||||||
|
expect(responseBody.data.id).toBeDefined();
|
||||||
|
expect(responseBody.data.uid).toBeDefined();
|
||||||
|
expect(responseBody.data.startTime).toEqual(bookingStart);
|
||||||
|
expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
|
||||||
|
expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
|
||||||
|
expect(responseBody.data.metadata).toEqual(bookingMetadata);
|
||||||
|
|
||||||
|
createdBooking = responseBody.data;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("should reschedule a booking", () => {
|
||||||
|
it("should reschedule with updated start time, end time & metadata", async () => {
|
||||||
|
const newBookingStart = "2040-05-21T12:30:00.000Z";
|
||||||
|
const newBookingEnd = "2040-05-21T13:30:00.000Z";
|
||||||
|
const bookingEventTypeId = eventTypeId;
|
||||||
|
const bookingTimeZone = "Europe/London";
|
||||||
|
const bookingLanguage = "en";
|
||||||
|
const bookingHashedLink = "";
|
||||||
|
const newBookingMetadata = {
|
||||||
|
timeFormat: "24",
|
||||||
|
meetingType: "attendee-phone",
|
||||||
|
};
|
||||||
|
const bookingResponses = {
|
||||||
|
name: "tester",
|
||||||
|
email: "tester@example.com",
|
||||||
|
location: {
|
||||||
|
value: "link",
|
||||||
|
optionValue: "",
|
||||||
|
},
|
||||||
|
notes: "test",
|
||||||
|
guests: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const body: CreateBookingInput = {
|
||||||
|
rescheduleUid: createdBooking.uid,
|
||||||
|
start: newBookingStart,
|
||||||
|
end: newBookingEnd,
|
||||||
|
eventTypeId: bookingEventTypeId,
|
||||||
|
timeZone: bookingTimeZone,
|
||||||
|
language: bookingLanguage,
|
||||||
|
metadata: newBookingMetadata,
|
||||||
|
hashedLink: bookingHashedLink,
|
||||||
|
responses: bookingResponses,
|
||||||
|
};
|
||||||
|
|
||||||
|
return request(app.getHttpServer())
|
||||||
|
.post("/v2/bookings")
|
||||||
|
.send(body)
|
||||||
|
.expect(201)
|
||||||
|
.then(async (response) => {
|
||||||
|
const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
|
||||||
|
response.body;
|
||||||
|
expect(responseBody.status).toEqual(SUCCESS_STATUS);
|
||||||
|
expect(responseBody.data).toBeDefined();
|
||||||
|
expect(responseBody.data.userPrimaryEmail).toBeDefined();
|
||||||
|
expect(responseBody.data.userPrimaryEmail).toEqual(userEmail);
|
||||||
|
expect(responseBody.data.id).toBeDefined();
|
||||||
|
expect(responseBody.data.uid).toBeDefined();
|
||||||
|
expect(responseBody.data.startTime).toEqual(newBookingStart);
|
||||||
|
expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
|
||||||
|
expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
|
||||||
|
expect(responseBody.data.metadata).toEqual(newBookingMetadata);
|
||||||
|
|
||||||
|
createdBooking = responseBody.data;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("should get bookings", async () => {
|
it("should get bookings", async () => {
|
||||||
return request(app.getHttpServer())
|
return request(app.getHttpServer())
|
||||||
.get("/v2/bookings?filters[status]=upcoming")
|
.get("/v2/bookings?filters[status]=upcoming")
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
const responseBody: GetBookingsOutput = response.body;
|
const responseBody: GetBookingsOutput = response.body;
|
||||||
const fetchedBooking = responseBody.data.bookings[0];
|
|
||||||
|
|
||||||
expect(responseBody.data.bookings.length).toEqual(1);
|
expect(responseBody.data.bookings.length).toEqual(2);
|
||||||
|
const fetchedBooking = responseBody.data.bookings.find(
|
||||||
|
(booking) => booking.id === createdBooking.id
|
||||||
|
);
|
||||||
expect(responseBody.status).toEqual(SUCCESS_STATUS);
|
expect(responseBody.status).toEqual(SUCCESS_STATUS);
|
||||||
expect(responseBody.data).toBeDefined();
|
expect(responseBody.data).toBeDefined();
|
||||||
expect(fetchedBooking).toBeDefined();
|
expect(fetchedBooking).toBeDefined();
|
||||||
|
|
||||||
expect(fetchedBooking.id).toEqual(createdBooking.id);
|
if (fetchedBooking) {
|
||||||
expect(fetchedBooking.uid).toEqual(createdBooking.uid);
|
expect(fetchedBooking.id).toEqual(createdBooking.id);
|
||||||
expect(fetchedBooking.startTime).toEqual(createdBooking.startTime);
|
expect(fetchedBooking.uid).toEqual(createdBooking.uid);
|
||||||
expect(fetchedBooking.endTime).toEqual(createdBooking.endTime);
|
expect(fetchedBooking.startTime).toEqual(createdBooking.startTime);
|
||||||
expect(fetchedBooking.user?.email).toEqual(userEmail);
|
expect(fetchedBooking.endTime).toEqual(createdBooking.endTime);
|
||||||
|
expect(fetchedBooking.user?.email).toEqual(userEmail);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ import { MarkNoShowInput } from "@/ee/bookings/inputs/mark-no-show.input";
|
|||||||
import { GetBookingOutput } from "@/ee/bookings/outputs/get-booking.output";
|
import { GetBookingOutput } from "@/ee/bookings/outputs/get-booking.output";
|
||||||
import { GetBookingsOutput } from "@/ee/bookings/outputs/get-bookings.output";
|
import { GetBookingsOutput } from "@/ee/bookings/outputs/get-bookings.output";
|
||||||
import { MarkNoShowOutput } from "@/ee/bookings/outputs/mark-no-show.output";
|
import { MarkNoShowOutput } from "@/ee/bookings/outputs/mark-no-show.output";
|
||||||
|
import { hashAPIKey, isApiKey, stripApiKey } from "@/lib/api-key";
|
||||||
import { API_VERSIONS_VALUES } from "@/lib/api-versions";
|
import { API_VERSIONS_VALUES } from "@/lib/api-versions";
|
||||||
|
import { ApiKeyRepository } from "@/modules/api-key/api-key-repository";
|
||||||
import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
|
import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
|
||||||
import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
|
import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
|
||||||
import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
|
import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
|
||||||
@@ -28,10 +30,12 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
|
import { ConfigService } from "@nestjs/config";
|
||||||
import { ApiQuery, ApiTags as DocsTags } from "@nestjs/swagger";
|
import { ApiQuery, ApiTags as DocsTags } from "@nestjs/swagger";
|
||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
import { Request } from "express";
|
import { Request } from "express";
|
||||||
import { NextApiRequest } from "next/types";
|
import { NextApiRequest } from "next/types";
|
||||||
|
import { v4 as uuidv4 } from "uuid";
|
||||||
|
|
||||||
import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
|
import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
|
||||||
import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
|
import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
|
||||||
@@ -46,7 +50,8 @@ import {
|
|||||||
getBookingInfo,
|
getBookingInfo,
|
||||||
handleCancelBooking,
|
handleCancelBooking,
|
||||||
getBookingForReschedule,
|
getBookingForReschedule,
|
||||||
} from "@calcom/platform-libraries-0.0.22";
|
ErrorCode,
|
||||||
|
} from "@calcom/platform-libraries";
|
||||||
import { GetBookingsInput, CancelBookingInput, Status } from "@calcom/platform-types";
|
import { GetBookingsInput, CancelBookingInput, Status } from "@calcom/platform-types";
|
||||||
import { ApiResponse } from "@calcom/platform-types";
|
import { ApiResponse } from "@calcom/platform-types";
|
||||||
import { PrismaClient } from "@calcom/prisma";
|
import { PrismaClient } from "@calcom/prisma";
|
||||||
@@ -86,7 +91,9 @@ export class BookingsController {
|
|||||||
private readonly oAuthFlowService: OAuthFlowService,
|
private readonly oAuthFlowService: OAuthFlowService,
|
||||||
private readonly prismaReadService: PrismaReadService,
|
private readonly prismaReadService: PrismaReadService,
|
||||||
private readonly oAuthClientRepository: OAuthClientRepository,
|
private readonly oAuthClientRepository: OAuthClientRepository,
|
||||||
private readonly billingService: BillingService
|
private readonly billingService: BillingService,
|
||||||
|
private readonly config: ConfigService,
|
||||||
|
private readonly apiKeyRepository: ApiKeyRepository
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Get("/")
|
@Get("/")
|
||||||
@@ -211,6 +218,7 @@ export class BookingsController {
|
|||||||
@Permissions([BOOKING_WRITE])
|
@Permissions([BOOKING_WRITE])
|
||||||
@UseGuards(ApiAuthGuard)
|
@UseGuards(ApiAuthGuard)
|
||||||
async markNoShow(
|
async markNoShow(
|
||||||
|
@GetUser("id") userId: number,
|
||||||
@Body() body: MarkNoShowInput,
|
@Body() body: MarkNoShowInput,
|
||||||
@Param("bookingUid") bookingUid: string
|
@Param("bookingUid") bookingUid: string
|
||||||
): Promise<MarkNoShowOutput> {
|
): Promise<MarkNoShowOutput> {
|
||||||
@@ -219,6 +227,7 @@ export class BookingsController {
|
|||||||
bookingUid: bookingUid,
|
bookingUid: bookingUid,
|
||||||
attendees: body.attendees,
|
attendees: body.attendees,
|
||||||
noShowHost: body.noShowHost,
|
noShowHost: body.noShowHost,
|
||||||
|
userId,
|
||||||
});
|
});
|
||||||
|
|
||||||
return { status: SUCCESS_STATUS, data: markNoShowResponse };
|
return { status: SUCCESS_STATUS, data: markNoShowResponse };
|
||||||
@@ -236,8 +245,15 @@ export class BookingsController {
|
|||||||
): Promise<ApiResponse<BookingResponse[]>> {
|
): Promise<ApiResponse<BookingResponse[]>> {
|
||||||
const oAuthClientId = clientId?.toString();
|
const oAuthClientId = clientId?.toString();
|
||||||
try {
|
try {
|
||||||
|
const recurringEventId = uuidv4();
|
||||||
|
for (const recurringEvent of req.body) {
|
||||||
|
if (!recurringEvent.recurringEventId) {
|
||||||
|
recurringEvent.recurringEventId = recurringEventId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const createdBookings: BookingResponse[] = await handleNewRecurringBooking(
|
const createdBookings: BookingResponse[] = await handleNewRecurringBooking(
|
||||||
await this.createNextApiBookingRequest(req, oAuthClientId)
|
await this.createNextApiRecurringBookingRequest(req, oAuthClientId)
|
||||||
);
|
);
|
||||||
|
|
||||||
createdBookings.forEach(async (booking) => {
|
createdBookings.forEach(async (booking) => {
|
||||||
@@ -294,9 +310,17 @@ export class BookingsController {
|
|||||||
|
|
||||||
private async getOwnerId(req: Request): Promise<number | undefined> {
|
private async getOwnerId(req: Request): Promise<number | undefined> {
|
||||||
try {
|
try {
|
||||||
const accessToken = req.get("Authorization")?.replace("Bearer ", "");
|
const bearerToken = req.get("Authorization")?.replace("Bearer ", "");
|
||||||
if (accessToken) {
|
if (bearerToken) {
|
||||||
return this.oAuthFlowService.getOwnerId(accessToken);
|
if (isApiKey(bearerToken, this.config.get<string>("api.apiKeyPrefix") ?? "cal_")) {
|
||||||
|
const strippedApiKey = stripApiKey(bearerToken, this.config.get<string>("api.keyPrefix"));
|
||||||
|
const apiKeyHash = hashAPIKey(strippedApiKey);
|
||||||
|
const keyData = await this.apiKeyRepository.getApiKeyFromHash(apiKeyHash);
|
||||||
|
return keyData?.userId;
|
||||||
|
} else {
|
||||||
|
// Access Token
|
||||||
|
return this.oAuthFlowService.getOwnerId(bearerToken);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.logger.error(err);
|
this.logger.error(err);
|
||||||
@@ -336,6 +360,19 @@ export class BookingsController {
|
|||||||
return req as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
|
return req as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async createNextApiRecurringBookingRequest(
|
||||||
|
req: BookingRequest,
|
||||||
|
oAuthClientId?: string,
|
||||||
|
platformBookingLocation?: string
|
||||||
|
): Promise<NextApiRequest & { userId?: number } & OAuthRequestParams> {
|
||||||
|
const userId = (await this.getOwnerId(req)) ?? -1;
|
||||||
|
const oAuthParams = oAuthClientId
|
||||||
|
? await this.getOAuthClientsParams(oAuthClientId)
|
||||||
|
: DEFAULT_PLATFORM_PARAMS;
|
||||||
|
Object.assign(req, { userId, ...oAuthParams, platformBookingLocation });
|
||||||
|
return req as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
|
||||||
|
}
|
||||||
|
|
||||||
private handleBookingErrors(
|
private handleBookingErrors(
|
||||||
err: Error | HttpError | unknown,
|
err: Error | HttpError | unknown,
|
||||||
type?: "recurring" | `instant` | "no-show"
|
type?: "recurring" | `instant` | "no-show"
|
||||||
@@ -351,6 +388,9 @@ export class BookingsController {
|
|||||||
|
|
||||||
if (err instanceof Error) {
|
if (err instanceof Error) {
|
||||||
const error = err as Error;
|
const error = err as Error;
|
||||||
|
if (Object.values(ErrorCode).includes(error.message as unknown as ErrorCode)) {
|
||||||
|
throw new HttpException(error.message, 400);
|
||||||
|
}
|
||||||
throw new InternalServerErrorException(error?.message ?? errMsg);
|
throw new InternalServerErrorException(error?.message ?? errMsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -59,10 +59,6 @@ export class CreateBookingInput {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
rescheduleUid?: string;
|
rescheduleUid?: string;
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
recurringEventId?: string;
|
|
||||||
|
|
||||||
@IsTimeZone()
|
@IsTimeZone()
|
||||||
timeZone!: string;
|
timeZone!: string;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
|
import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
|
||||||
import { IsBoolean, IsNumber, IsOptional } from "class-validator";
|
import { IsBoolean, IsString, IsNumber, IsOptional } from "class-validator";
|
||||||
|
|
||||||
import type { AppsStatus } from "@calcom/platform-libraries-0.0.22";
|
import type { AppsStatus } from "@calcom/platform-libraries";
|
||||||
|
|
||||||
export class CreateRecurringBookingInput extends CreateBookingInput {
|
export class CreateRecurringBookingInput extends CreateBookingInput {
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
@@ -21,4 +21,8 @@ export class CreateRecurringBookingInput extends CreateBookingInput {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsNumber()
|
@IsNumber()
|
||||||
currentRecurringIndex?: number;
|
currentRecurringIndex?: number;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@IsOptional()
|
||||||
|
recurringEventId?: string;
|
||||||
}
|
}
|
||||||
@@ -20,10 +20,6 @@ class HandleMarkNoShowData {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
noShowHost?: boolean;
|
noShowHost?: boolean;
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
messageKey?: string;
|
|
||||||
|
|
||||||
@ValidateNested()
|
@ValidateNested()
|
||||||
@Type(() => Attendee)
|
@Type(() => Attendee)
|
||||||
@IsArray()
|
@IsArray()
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ class Primary {
|
|||||||
credentialId!: number;
|
credentialId!: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
class Calendar {
|
export class Calendar {
|
||||||
@IsEmail()
|
@IsEmail()
|
||||||
externalId!: string;
|
externalId!: string;
|
||||||
|
|
||||||
@@ -135,7 +135,7 @@ class Calendar {
|
|||||||
credentialId!: number;
|
credentialId!: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
class ConnectedCalendar {
|
export class ConnectedCalendar {
|
||||||
@ValidateNested()
|
@ValidateNested()
|
||||||
@IsObject()
|
@IsObject()
|
||||||
integration!: Integration;
|
integration!: Integration;
|
||||||
|
|||||||
Loaded 100 of 1695 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user