81d33b51bc
v1.6.1 ( #2851 )
...
* Turbo fixes
* Make apps single pages public
* fixed /booking skeleton (#2722 )
* fixed /booking skeleton
* nit
* Type fixes
* Test fixes
* Update playwright.config.ts
* More test fixes
* Update dynamic-booking-pages.test.ts
* add invite link to Zapier setup page (#2696 )
* add invite link and toaster to zapier setup page
* create env variable for invite link and save in database
* fetch invite link form getStaticProps
* add getStaticPath method
* clean code
* Moves app setup and index page
* Moves Loader to ui
* Trying new way to handle dynamic app store pages
* Cleanup
* Update tailwind.config.js
* zapier invite link fixes
* Tests fixes
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Add more embed events (#2719 )
* Add more embed events
* Add more embed events
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* adds availability select loader (#2718 )
* Improve logs and Fix unwanted 500 to reduce noise in logs (#2674 )
* Improve logs
* Fix unintentional 500
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Change date format for RecurringBookings (#2707 )
* Change date format for RecurringBookings
* Missing bookingId query param
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* added giphy description (#2730 )
* fixes #2732 (#2732 )
* Hotfix : Fix Infinite loading of Bookings (#2729 )
* Add more embed events
* Add more embed events
* Fix nextCursor calculation logic
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Hotfix: Success page for recurring event (#2725 )
* Merge pull request #2672 from calcom/main
v1.5.4
* Turbo fixes
* Make apps single pages public
* Fix preview.html not built and thus served during depooy (#2713 )
* Hotfix: Success page layout broken due to duplicate "When" (#2716 )
* Update BookingPage.tsx
* Reverting unchaged lines
* Fixing recurrenceRule for ICS files
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
* Fix preview.html not built and thus served during depooy (#2727 )
Co-authored-by: Omar López <zomars@me.com>
* Allow deletion of a disabled event (#2737 )
* allows deletion of disabled event
* some visual fixes
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Multiple E2E improvements
* Parallelizes some tests
* Update booking-pages.test.ts
* E2E and paid bookings fixes
* Add 'free' and 'workingElsewhere' as a non-blocking event (#2652 )
* Add 'free' and 'workingElsewhere' to non-blocking event - this will allow bookings at these times
* Update CalendarService.ts
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* TODO marks blocking test to be fixed
* Update testUtils.ts
* Update testUtils.ts
* getBusyTimes consolidation
* Fixes delete-me test
* E2E fixing attemps
* Adjusting Zapier endpoints for publishing integration (#2728 )
* add /me endpoint for zapier API testing
* remove cacellationReason from listBookings response
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
* Fix reschedule not happening in calendar if two calendards are there (#2733 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Increases timeout temporarily
* Merge pull request #2745 from calcom/apps/multiple-categories
Allow apps to belong to multiple categories
* Build fixes
* Populate msteams key in db (#2743 )
* Populate msteams key in db
* Fix calendar credentials to teams
* Clarify account dialog
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Improving Email DRYness (#2486 )
* Email DRY
* WIP
* Improve email DRYness
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* E2E fixtures (#2747 )
* Sign in button should be changed or disabled after click #2654 (#2749 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* Fixing ESLint warnings (#2723 )
* Fixing warnings
* Reverting and disabling ESLint in some cases
* Reverting Next Images
* Reverting file, bad merge
* Targeting ESLint to line
* Additional warnings
* New warning squished
* More tweaks and major fixes
* Uneeded conf
Co-authored-by: Omar López <zomars@me.com>
* Fix/avoid multiple schedule deletions (#2602 )
* Prevents users from deleting the same schedule multiple times due to delay before the schedule disappears. It also applies the same fix to team disband.
Schedule deletion:
Team disband:
Fixes issue [#2569 ](https://github.com/calcom/cal.com/issues/2569 )
Bug fix (non-breaking change which fixes an issue)
**apps/web/components/LightLoader.tsx** → this file was created in order to make a light color loading spinner available. It's necessary when we need to display a loading spinner above dark backgrounds.
**apps/web/components/availability/ScheduleListItem.tsx** → this component was created in order to give a schedule list item its own state.
* Removing a "setTimeout" that was only used for testing purposes
* Adding a code review suggestion to my modifications
* Changing loading style
* Cleanup
* Avoids using unnecessary state
* Revert "Adding a code review suggestion to my modifications"
This reverts commit b5e40062d7#2757 )
* Added check on create eventtype to see is user has slug that already exists, added error check on onError
* revert yarn.lock back
* Catches prisma known error instead of making an additional query
Co-authored-by: zomars <zomars@me.com>
* Fix white border (#2761 )
* fix: remove hardcoded redirect in signin url email verification (#2764 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
* Bad UX when user wants to set the default Event Type Title #2245 (#2760 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* Skip sending emails in E2E
* Users Phone Number Option (#2669 )
* Users Phone Number Option
* Implemented improvments
* Add validation to form
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Fix/unpaid unconfirmed (#2553 )
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/integrations.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/confirm.ts
Co-authored-by: alannnc <alannnc@gmail.com>
* Modal window before delete stripe integration
* ESLint Report
* Test fixes
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
* Mutually exclusive options (#2755 )
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Readd steps to create a new user #2665 (#2759 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* remove redundant conditional expressions (#2756 )
* remove redundant conditional expressions
* remove redundant conditional expression
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
* Fix adds redirect callback that support app.cal.com (#2768 )
* Fix adds redirect callback that support app.cal.com
* Update apps/web/pages/api/auth/[...nextauth].tsx
Check origin of website and baseurl
Co-authored-by: Omar López <zomars@me.com>
* fix: lint issue extra space removed
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* respect local set timezone and update url on mismatch (#2506 )
* ensure `timeZone()` will make its way to the URL
fixes https://github.com/calcom/cal.com/issues/2482
* keep `timeZone()` and the offset from URL in sync
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Squashed commit of the following:
commit 27540b09ce#2764 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
commit ae15a7d7392a5a89fe502ce1e78053#2725 )
* Merge pull request #2672 from calcom/main
v1.5.4
* Turbo fixes
* Make apps single pages public
* Fix preview.html not built and thus served during depooy (#2713 )
* Hotfix: Success page layout broken due to duplicate "When" (#2716 )
* Update BookingPage.tsx
* Reverting unchaged lines
* Fixing recurrenceRule for ICS files
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
commit 2d6d1cb444#2716 )
commit ef68f4f4f8#2713 )
commit 18c28cc3fdd40e8caff93161cc4d45ed808c3be4099a477ded808c3be6#2672 from calcom/main
v1.5.4
* Typo
* Typo
* Update apps/web/pages/apps/categories/[category].tsx
* Apply suggestions from code review
* Alert to describe exclusion of options (#2770 )
* Alert to describe exclusion of options
* Update apps/web/pages/event-types/[type].tsx
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/components/eventtype/RecurringEventController.tsx
Co-authored-by: Omar López <zomars@me.com>
* Formatting
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: split time correctly if the local working hours are just across mid night (#2766 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Update crowdin.yml
* New Crowdin translations by Github Action (#2773 )
* New Crowdin translations by Github Action
* Update vital.json
* Update vital.json
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Omar López <zomars@me.com>
* Add Google cal extneral calendar id to booking reference (#2671 )
* Set google cal event id to use our uid
* Save calendar external id to bookingRef
* Pass external calendar ids to update and delete
* Create migration
* Fix type errors
* Fix prisma url
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
* v1.6
* v1.6
* 2FA submit disabled (#2790 )
* fixing the hyperlink for open startup (#2777 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Add login event (#2784 )
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e1b59dacd64#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com>
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com>
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Add vscode tasks.json (#2801 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* save additional inputs as json + view details of booking (#2796 )
* move custom inputs from description to own json object
* show custom inputs on success page
* fix type error
* add custom inputs to email and webhook
* add custom inputs to all emails
* add values for custom inputs when rescheduling
* add custom input everywhere description is shown
* fix bug with boolean value
* fix issues with null values
* disable custom inputs and add notes for organizer
* don't show custom input with empty string
* don't show custom inputs with empty string in calender event and email
* add link to booking details page
* redirect to success page to see booking details
* add functionality to cancel and reschedule booking
* fix bookings that require confirmation
* clean code
* fix infinite lopp in useEffect of success page
* show web conference details message when integration as location
* improve design of cancelling event
* clean code
* disable darkmode for organizer on booking details page
* fix dark mode for cancelling booking
* fix build error
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e1b59dacd64#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com>
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com>
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Type fixes
* Abstracts minimal booking select
* Type fixes
* Update listBookings.ts
* Update common.json
* Update bookingReminder.ts
* Consolidates isOutOfBounds
* Update webhookResponse-chromium.txt
* Update TableActions.tsx
* Type fixes
* Update BookingPage.tsx
* Update webhookResponse-chromium.txt
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Update check-types.yml
* adding organizer as attendee to google calendar events (#2779 )
* Fix auto-select and close of dropdown (#2819 )
* fixes dynamic color and typefix for tfunction after react upgrade (#2821 )
* New Crowdin translations by Github Action (#2791 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
* Relocates admin to console
# Conflicts:
# apps/admin
* Relocates admin to console
* Fix login submit (#2849 )
* fix: long string overflowing calendar div (#2842 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Adding labels (#2783 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Wrong username is identified if query params are present and user doesn't exist (#2838 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Meet/Zoom Email Clarification (#2828 )
* Add clarificaiton to email
* Update apps/web/lib/emails/templates/organizer-scheduled-email.ts
* Add to attendee scheduled email
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Request the inclusion Assuncion Time Zone (#2840 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Fix UI of dialog (#2788 )
* removed large mandatory height and scroll
* added z index using css
* cleanup
* fixed TS errors
* extract dialog out of dropdown
* Adds custom loading text to confirmation dialog
* rename update
* utilizing mutation loading state
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Hotfix: Fixing Security Issues (#2848 )
* Fixing Privilege Escalation
* Fixing critical obj ref in availability
* Fixing reschedule security issue
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Merge production to main
* Update vital.json
* Update vital.json
* Fix login page CTA disabled state (#2832 )
* fix(ui/login): better disabled state for login CTA
The fix involves tracking the form submission with a dedicated state `submitInProgress` with React.
`formState` from `react-hook-form` does not take time taken for the network call into account. For example,
if the api takes 5 seconds to complete, we would expect the `formState.isSubmitting` to be true for `5`
seconds. But, surprisingly this is not the case and `formState` from `react-hook-form` resolves
immediately after it makes a successful connection to the endpoint.
A dedicated state (with `useState`) is introduced that is enabled when the user clicks on the login CTA, and disabled when the api call is resolved, either successfully or with an error.
* Update login.tsx
* Update login.tsx
* Fixes isSubmitting state
Co-authored-by: zomars <zomars@me.com>
* Playwright binaries shouldn't be on deps
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Arthur Cruz <42497300+arthur1041@users.noreply.github.com>
Co-authored-by: Mitchell Moore <47459168+Mitchell-Moore@users.noreply.github.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: andreaestefania12 <19562383+andreaestefania12@users.noreply.github.com>
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Hashen <37979557+Hashen110@users.noreply.github.com>
Co-authored-by: buschco <colin@busch.dev>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Ankit Gordhandas <agordhandas@gmail.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Ken Miller <kemiller@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Arun Kumar <palerdot@users.noreply.github.com>
2022-05-23 11:42:29 -06:00
ed808c3be6
Merge pull request #2672 from calcom/main
...
v1.5.4
2022-05-09 14:56:23 -06:00
f10bf38292
Removed deprecated JWT secrets ( #2574 )
2022-04-21 15:10:23 -06:00
8bc5a75249
Feature: Verify login on signup with magic link. ( #2122 )
...
* manual migration to rename verificationtoken, maybe it could be dropped and create a new table instead if we're not using it, will consult @zomars
* feat: rename verificationRequest --> verificationToken in schema.prisma
* fix: rename verificationRequest -> verificationToken in the codebase
* feat: add default cookies for next-auth
* fix: moves @lib/serverConfig to @calcom/lib so it can be called by website too
* fix: make self-certificate work in dev env by not rejecting tls in serverConfig
* fix verificationTokenToken typo
Co-authored-by: Omar López <zomars@me.com>
* Adds domain: .cal.com if not dev env in cookies
* Adds default-cookies to apps/web, and nextauth_domain to turbo website build deps"a
* update NEXTAUTH_DOMAIN to NEXTAUTH_COOKIE_DOMAIN
* Updates website submodule
* Removes deprecated env vars
* Consolidates auth logic in one place
* Updates website module
* Signup fixes
* Build fixes
* Updates example
* Updates example
* Fixes
* Fix Email Verification
* fix: move csrf-token cookiePrefix from __Host -> __Secure
* Removes console log
* Fixes link in email template
* Removed irrelevant coment
* Testing with a 32 bit secret
* Fixes for cookien in E2E
* E2E fixes
* Fixes Stripe tests locally
* Temp fix for E2E
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-04-21 14:32:25 -06:00
9ed666a475
Add app-store tests ( #2465 )
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-14 09:30:38 +05:30
b6da0f0553
Allows E2E to run from forks ( #2423 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-10 18:19:06 +02:00
ec58a9dd70
The Dotenv Refactor ( #2275 )
...
* dotenv refactoring
* dotenv fixes
* Env variables cleanup
* Updates e2e variables
* Moves environment file to types
* Removes conflicting configs
* Readds missing variables
* Fixes
* More fixes
* Update .env.example
* Update yarn.lock
* Update turbo.json
* Fixes e2e
* Temp fix
* disables cache for lint
* Please work
* I'm getting desperate here.
* Matches node versions
* Take 2
* Revert "Take 2"
This reverts commit a735f47f23
2022-03-25 17:39:38 -07:00
55587e92c1
Fix a set of E2E bugs causing several CI failures ( #2177 )
...
* Fix E2E bugs causing CI failutes
* Revert setup in dx
Co-authored-by: zomars <zomars@me.com>
2022-03-17 12:36:11 -07:00
69dd6fe7d4
Adds testing mail credentials ( #1865 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-16 10:47:23 +00:00
fe35cf6570
Extract prisma to it's own package ( #1823 )
...
* Moved prisma to packages
* Add missing prisma configs
* Extracts common libs and types
* Build and pipeline fixes
* Adds missing package
* Prisma scripts cleanup
* Updates lint staged
* Type fixes
* Sort imports
* Updates yarn lock file
* Fixes for yarn dx
* Revert "Sort imports"
This reverts commit 076109decab9b9ba307fc03696c3b0da5c4896f3.
* Formatting
* Prevent double TS version
* Fix conflict
* Extracted e2e configs
2022-02-15 13:30:52 -07:00
fdf7516cdd
CI turbo caching troubleshooting ( #1862 )
...
# Conflicts:
# .github/workflows/e2e.yml
2022-02-15 12:18:14 -07:00
f0eed8ad30
E2E fixes ( #1858 )
2022-02-15 10:44:30 -07:00
79f9bf6d5e
E2E fix attempt ( #1845 )
...
* E2E fix attemp
* Moves playwright config to root
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-14 15:23:33 -07:00
6fee04d07c
Another one ( #1799 )
2022-02-10 19:22:33 -07:00
abce15ff0d
E2E fixes ( #1798 )
2022-02-10 19:12:57 -07:00
855aa56e77
Removes unused command
2022-02-10 14:22:45 -07:00
2234b7d5de
Name update
2022-02-10 14:22:45 -07:00
5d6f94fce7
e2e fixes
2022-02-10 14:22:45 -07:00
c711c80b8d
e2e fixes
2022-02-10 14:22:45 -07:00
0e43766b9c
Test fixes
2022-02-10 14:22:45 -07:00
3d4de9476d
e2e fixes
2022-02-10 14:22:45 -07:00
20da74b4a6
Workflow updates
2022-02-10 14:22:45 -07:00
1976aa761c
added playwright html reporter ( #1715 )
...
* added playwright html reporter
* upload artifacts
* add junit reporter
* upload artifacts
* revert
* upload report as artifact
* upload only report in ci
* remove playwright cache
* revert caching
* upload reporter as artifact
* remove all cache
* revert changes
* Update .github/workflows/e2e.yml
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 16:30:21 +00:00
00a79bdaba
Ignores e2e test for translation PRs ( #1748 )
2022-02-08 15:42:05 +00:00
e5f8437282
Fixes oauth tests ( #1506 )
...
* Fixes oauth tests
* Login page type fixes
* Delegates approval to github UI
2022-01-13 13:45:44 -07:00
1a20b0a0c6
Add log in with Google and SAML ( #1192 )
...
* Add log in with Google
* Fix merge conflicts
* Merge branch 'main' into feature/copy-add-identity-provider
# Conflicts:
# pages/api/auth/[...nextauth].tsx
# pages/api/auth/forgot-password.ts
# pages/settings/security.tsx
# prisma/schema.prisma
# public/static/locales/en/common.json
* WIP: SAML login
* fixed login
* fixed verified_email check for Google
* tweaks to padding
* added BoxyHQ SAML service to local docker-compose
* identityProvider is missing from the select clause
* user may be undefined
* fix for yarn build
* Added SAML configuration to Settings -> Security page
* UI tweaks
* get saml login flag from the server
* UI tweaks
* moved SAMLConfiguration to a component in ee
* updated saml migration date
* fixed merge conflict
* fixed merge conflict
* lint fixes
* check-types fixes
* check-types fixes
* fixed type errors
* updated docker image for SAML Jackson
* added api keys config
* added default values for SAML_TENANT_ID and SAML_PRODUCT_ID
* - move all env vars related to saml into a separate file for easy access
- added SAML_ADMINS comma separated list of emails that will be able to configure the SAML metadata
* cleanup after merging main
* revert mistake during merge
* revert mistake during merge
* set info text to indicate SAML has been configured.
* tweaks to text
* tweaks to text
* i18n text
* i18n text
* tweak
* use a separate db for saml to avoid Prisma schema being out of sync
* use separate docker-compose file for saml
* padding tweak
* Prepare for implementing SAML login for the hosted solution
* WIP: Support for SAML in the hosted solution
* teams view has changed, adjusting saml changes accordingly
* enabled SAML only for PRO plan
* if user was invited and signs in via saml/google then update the user record
* WIP: embed saml lib
* 302 instead of 307
* no separate docker-compose file for saml
* - ogs cleanup
- type fixes
* fixed types for jackson
* cleaned up cors, not needed by the oauth flow
* updated jackson to support encryption at rest
* updated saml-jackson lib
* allow only the required http methods
* fixed issue with latest merge with main
* - Added instructions for deploying SAML support
- Tweaked SAML audience identifier
* fixed check for hosted Cal instance
* Added a new route to initiate Google and SAML login flows
* updated saml-jackson lib (node engine version is now 14.x or above)
* moved SAML instructions from Google Docs to a docs file
* moved randomString to lib
* comment SAML_DATABASE_URL and SAML_ADMINS in .env.example so that default is SAML off.
* fixed path to randomString
* updated @boxyhq/saml-jackson to v0.3.0
* fixed TS errors
* tweaked SAML config UI
* fixed types
* added e2e test for Google login
* setup secrets for Google login test
* test for OAuth login buttons (Google and SAML)
* enabled saml for the test
* added test for SAML config UI
* fixed nextauth import
* use pkce flow
* tweaked NextAuth config for saml
* updated saml-jackson
* added ability to delete SAML configuration
* SAML variables explainers and refactoring
* Prevents constant collision
* Var name changes
* Env explainers
* better validation for email
Co-authored-by: Omar López <zomars@me.com>
* enabled GOOGLE_API_CREDENTIALS in e2e tests (Github Actions secret)
* cleanup (will create an issue to handle forgot password for Google and SAML identities)
Co-authored-by: Chris <76668588+bytesbuffer@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-01-13 20:05:23 +00:00
f8c036164c
Adds security checks for PRs ( #1503 )
...
* Update lint.yml
* Build and e2e on PRs
* Adds security checks for PRs
2022-01-13 12:37:34 -07:00
67bcbfd75a
Runs lint on all PRs to main (including external contributors) ( #1502 )
...
* Update lint.yml
* Build and e2e on PRs
2022-01-13 18:09:37 +00:00
54be2a2ec1
Update e2e.yml ( #1498 )
2022-01-13 16:52:31 +00:00
84d75cf693
Upgrades next-auth to v4 ( #1185 )
...
* Upgrades next-auth to v4
* Fixes next-auth session types
* Type fixes
* Fixes login issue
* Team page fixes
* Type fixes
* Fixes secret
* Adds test for forgotten password
* Skips if pw secret is undefined
* Prevents error if PW secret is undefined
* Adds PLAYWRIGHT_SECRET explainer
* Adds pending auth TODOs
* Adds missing secret
* Fixed imports
* Fixed imports
* Type fixes
* Test fixes
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-07 20:23:37 +00:00
21103580f7
Zomars/cal 748 paid bookings are failing ( #1335 )
...
* E2E video adjustments
* Adds test to add Stripe integration
* Type fix
* WIP: Payment troubleshooting
* Paid bookings shouldn't be confirmed by default
* Runs stripe test only if installed
* BookingListItem Adjustments
* Pending paid bookings should be unconfirmed
* Attempt to fix paid bookings
* Type fixes
* Type fixes
* Tests fixes
* Adds paid booking to seeder
* Moves stripe tests to own file
* Matches app locale to Stripe's
* Fixes minimun price for testing
* Stripe test fixes
* Fixes stripe frame test
* Added some Stripe TODOs
2021-12-17 16:58:23 +00:00
e6f71c81bb
E2E tests refactoring ( #1318 )
...
* Adds test todos
* Can't seem to change locales
* WIP playwright test refactoring
* jest-playwright cleanup
* Test fixes
* Test fixes
* More test fixes
* WIP: Testing fixes
* More test fixes
* Removes unused files
* Installs missing browsers for e2e
* ts-node fixes
* ts-check fixes
* Type fixes
* Fixes e2e
* FFS
* Renamex webhook snapshot
* Fixes webhook cross-platform
* Renamed webhook snapshot
* Apply suggestions from code review
Co-authored-by: Max Schmitt <max@schmitt.mx>
* Removes kont dependency
* Cleanup playwright options
* Next.js cache optimizations on CI
* Uses cache on e2e as well
* Fixme is introducing side-effects
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Max Schmitt <max@schmitt.mx>
2021-12-15 16:25:49 +00:00
05fa1feab0
Migrate availability schedule for everyone ( #1179 )
...
* wip
* tmp mig
* add cron api key to header
* feels safer
* Revert "wip"
This reverts commit 15a8358661
2021-12-08 12:08:57 +00:00
df687009bd
fix onboarding login glitch ( #1118 )
2021-11-08 14:10:02 +00:00
0ee523643d
upgrade to next.js 12 ( #1111 )
2021-11-03 14:02:17 +00:00
265c634db9
upgrade to Next.js 12 ( #1109 )
2021-11-02 14:19:40 +00:00
dc4331ed17
rewrite existing cypress tests to playwright ( #931 )
2021-10-13 14:26:56 +01:00
a9ee2ef9ae
add playwright for e2e testing ( #873 )
2021-10-07 17:07:57 +02:00
649e79bdc7
statically render profile pages ( #615 )
2021-09-27 17:09:19 +01:00
4d2e556d7d
fix CI e2e tests ( #748 )
2021-09-23 14:11:58 +01:00
7e6e935ed3
add free plan ( #549 )
...
- add new fields to support this
- when free:
- fade out all event types after first
- hide events after first on booking page
- make booking page after the first one 404 if accessed directly
- add e2e tests
2021-09-06 13:51:15 +00:00
d88ebd233d
add cypress e2e testing ( #534 )
2021-09-02 16:41:15 +00:00
Omar López
