Commit graph

838 commits

Author SHA1 Message Date
Syed Ali Shahbaz
af89de8004
Wrong language in emails ()
* test --wip

* --wip

* --wip

* --wip

* split language into organizer-attendees

* name fix for tAttendees

* --WIP

* added attendee locale migration, --WIP

* --wip

* fixed check types --wip

* updated person language type

* test snapshot updated

* --wip

* --WIP

* --WIP

* --WIP

* test changes revert

* cleanup

* removed extra space from test

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-27 13:32:53 -07:00
Peer Richelsen
1eac8a1aa3
fixed 404 () 2022-01-27 12:40:10 +00:00
Jamie Pine
e06edadda5
Improved authentication screens (Login/Logout/Forgot Password) () 2022-01-27 10:16:20 +00:00
Miguel Nieto A
73de0c2185
Fix signup query ()
* Remove emailVerified not null from query

* Improve query to find existing user

* Add test suite to Signup from a Team Invite

* Allow importing modules with aliases

* Delete created data after all tests

* Resolve conflicts

* Use teampro instead of pro user and refactor code
2022-01-26 16:56:22 +00:00
buschco
cad77ad237
fix mapping for cancel webhook () () ()
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-01-26 16:41:18 +00:00
Alex van Andel
b4c96c96e6 Explicitly set email variable for readability
Minor code clarity tweak making the comment redundant.
2022-01-26 09:01:43 -07:00
Peer Richelsen
ce4ed40ae0
removed developer.cal.com from 404 () 2022-01-25 18:23:24 +00:00
Peer Richelsen
1bf4913051
added <InfoBadge> component with tooltip ()
* added <InfoBadge> component with tooltip, added to event-types event name

* added title to <InfoBadge> for a12y
2022-01-25 00:31:05 +00:00
Peer Richelsen
8de822500c
fixed mismatch of bg color for success page () 2022-01-24 14:27:56 +00:00
Omar López
8f6f34931b
Allow choosing destination calendar per event type () 2022-01-21 14:35:31 -07:00
buschco
7737164bbf
fix mapping for cancel webhook () () 2022-01-21 12:06:45 +00:00
Syed Ali Shahbaz
24182625bb
redirect to cancellation survey () 2022-01-20 09:32:24 +00:00
Deepak Prabhakara
e0a923979a
fixed issue with mixed up Google login, profile.id is undefined and this is causing the first record to be retrieved instead of the AND query failing ()
(cherry picked from commit 4f168616e7b7a0a03b979b434b4aa20c7b612cb0)
2022-01-19 18:24:00 -07:00
Peer Richelsen
c6e60bd706
added telemetry to importer ()
* added telemetry to importer

* wip

* ignore typescript errors in jitsu telemetry
2022-01-19 17:26:44 +00:00
Omar López
118ee6bfb6
Follow up to ()
* Lazy loads phone input

* Removes duplicate CSS
2022-01-19 09:55:29 -07:00
Syed Ali Shahbaz
e52e1e3e23
Survey at account deletion ()
* redirect to /cancellation

* relative path

* base URL check added
2022-01-19 09:03:51 -07:00
Bailey Pumfleet
33694196e1
Calendly & SavvyCal import ()
* Calendly & SavvyCal import

* added string keys to import

* Update pages/api/import/savvycal.ts

Co-authored-by: Omar López <zomars@me.com>

* Update pages/api/import/savvycal.ts

Co-authored-by: Omar López <zomars@me.com>

* Update pages/getting-started.tsx

Co-authored-by: Omar López <zomars@me.com>

* fixed string

* prettier

Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-15 16:23:42 +00:00
Peer Richelsen
4e74c0e27f
fixed switching background color () 2022-01-14 22:01:06 +00:00
Syed Ali Shahbaz
fac4de1144
Enhancement/cal 708 delete account ()
* --WIP

* --WIP

* --WIP

* added prisma migration and delete cascade for user

* stripe customer removal and other --wip

* --wip

* added stripe user delete

* removed log remnants

* fixed signout import

* cleanup

* Changes requested

* fixed common-json apostrophe

* Simplifies account deletion logic and add e2e tests

* Cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-01-14 13:49:15 +00:00
Omar López
e5f8437282
Fixes oauth tests ()
* Fixes oauth tests

* Login page type fixes

* Delegates approval to github UI
2022-01-13 13:45:44 -07:00
Deepak Prabhakara
1a20b0a0c6
Add log in with Google and SAML ()
* 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
Philip Niedertscheider
9c94aadbf7
Fixed Google Calendar custom destination calendar deletion ()
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-01-13 19:47:15 +00:00
Bailey Pumfleet
f7fda47534
Add ability to change email () 2022-01-12 21:54:48 +00:00
Bailey Pumfleet
c48d0d6c34
Fix reorder arrow alignment () 2022-01-12 13:57:51 +00:00
Syed Ali Shahbaz
ac6275b906
hotfix for images hosted elsewhere and link stored in DB ()
* hotfix for images hosted elsewhere and link stored in DB

* improved if else

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-12 13:06:39 +00:00
Jamie Pine
70683a89b9
Added "New Event Type" button on Team settings ()
- Moved CreateNewEventButton in pages/event-types/index to dedicated component as this is used in two places now.
- Implemented CreateEventType button on Team settings screen and replaced old markup in on event types page with new component.
- Upgrade vanilla JS inputs to library primitives.
- Created TextArea & TextAreaField components in components/form.
- [Bugfix] Changed back button behavior in Shell to have a specified back path as CreateEventType's modal interfered with the router.goBack behavior.
- Ensure modal data is preserved in URL params for router accuracy and removed on exit.
2022-01-12 01:29:20 -08:00
Bailey Pumfleet
7739994f4e
Add an away mode to disable your booking page ()
* Add away column and status circle

* Add away status toggle

* Show message on booking page when away

* Update common.json

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-11 10:32:40 +00:00
Syed Ali Shahbaz
e24d8889fc
Cal 710 turn dataimagejpegbase64 avatar into ()
* --wip

* added next-config custom header path

* added avatar endpoint

* cleanup --wip

* adding gravatar fallback support --wip

* added endpoint rewrite and avatar access

* gravatar support added

* build err fix

* updated HeadSEO with new avatar logic

* --wip

* adds og compat

* added truncated bio

* cleanup

* changed truncate of body from 24 chars to 32 chars

* removed unused, commented code

* removed trailing whitespace

* requested changes

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-11 08:54:02 +00:00
Omar López
84d75cf693
Upgrades next-auth to v4 ()
* 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
Peer Richelsen
e93b7d942a
hide slug event-types on mobile () 2022-01-06 22:13:38 +00:00
Edward Fernández
6e7359ae96
fix code validation when the google calendar integration does not have all permission ()
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
2022-01-06 15:06:31 -07:00
Edward Fernández
bd2a795d7a
[CAL-770] add new integration architecture revamp ()
* [CAL-770] add new integration architecture revamp

* Type fixes

* Type fixes

* [CAL-770] Remove tsconfig.tsbuildinfo

* [CAL-770] add integration test

* Improve google calendar test integration

* Remove console.log

* Change response any to void in the deleteEvent method

* Remove unnecesary const

* Add tsconfig.tsbuildinfo to the .gitignore

* Remove process env variables as const

Co-authored-by: Edward Fernández <edwardfernandez@Edwards-Mac-mini.local>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
2022-01-06 12:28:31 -05:00
Peer Richelsen
8a70ea66e9
added url to event-types preview ()
* added url to event-types preview

* wip

* wip
2022-01-06 10:39:16 +00:00
Peer Richelsen
46df4c048e
hide order buttons on mobile event types ()
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-01-06 10:24:19 +00:00
Omar López
a66610d9c2
Zomars/cal 777 switching off paid mode bug ()
* Adds Form component

* Disabling price sets it to 0
2022-01-03 23:19:05 +00:00
Omar López
4cd7a4ce5b
Adds trial banner and in-app upgrade ()
* WIP trial banner

* Fixes days left count

* Defers stripe loading until needed

* Fixes auth issues

* Checkout fixes

* Allows for signup testing

* Debugging checkout

* Adds tests for trial banner

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-03 22:50:59 +00:00
Syed Ali Shahbaz
4be4a01968
Blank success page in January bookings ()
* added 1 to UTC month conversion to make it 1 to 12

* with as numtype
2021-12-30 09:04:08 -07:00
Adrien La
1567feb75e
i18n - Translate booking status when empty screen ()
* i18n translate booking status when empty screen

* i18n - status key added to fr & en

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-27 13:29:43 +01:00
Alex van Andel
9d7dc09974
Use the matched user email to send the password reset to () 2021-12-21 18:31:32 +01:00
Omar López
7bc7b241ac
Zomars/cal 794 normalize emails in db ()
* Email input UX improvements

* Makes email queries case insensitive

* Lowercases all emails

* Type fixes

* Re adds lowercase email to login

* Removes citext dependency

* Updates schema

* Migration fixes

* Added failsafes to team invites

* Team invite improvements

* Deleting the index, lowercasing 

```
calendso=> UPDATE users SET email=LOWER(email);
ERROR:  duplicate key value violates unique constraint "users.email_unique"
DETAIL:  Key (email)=(free@example.com) already exists.
```

vs.

```
calendso=> CREATE UNIQUE INDEX "users.email_unique" ON "users" (email);
ERROR:  could not create unique index "users.email_unique"
DETAIL:  Key (email)=(Free@example.com) is duplicated.
```

I think it'll be easier to rectify for users if they try to run the migrations if the index stays in place.

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-12-21 00:59:06 +00:00
Syed Ali Shahbaz
0dd72888a9
removed team from profile url () 2021-12-20 17:26:35 +01:00
Peer Richelsen
d95e26d55c
fixes 404 for subpaths, adds prefilled url to sign up form ()
* fixes 404 for subpaths, adds prefilled url to sign up form

* Added tweak to support BASE_URL for self hosted ()

* Added tweak to support BASE_URL for self hosted (without linking to our signup)
* also hides the signup popular page

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-12-20 09:11:39 +00:00
Omar López
3bc659af44
Let email case sensitive () 2021-12-19 21:01:25 +00:00
Alex van Andel
cbf528c33e
Allows setting the event frequency to other than event length () 2021-12-19 12:11:31 +00:00
Joel Lu
38f762f7b2
fix: refresh UserDropdown after update ()
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-18 15:06:05 +00:00
Omar López
21103580f7
Zomars/cal 748 paid bookings are failing ()
* 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
Jamie Pine
c21f0c2d49
Even Better Teams ()
- dropdown improvements
- Improve performance of team availability
- Fix default timezone
- Allow team admins to edit event types
- Change team availability slot input to dropdown select (15,30,60)
- Prevent teams from access if not pro user
2021-12-17 00:16:59 +00:00
Jamie Pine
4ce879e5dc
UX improvement to public facing team pages
- Added default member avatars
- Fixed member item spacing
- Added team description ()
2021-12-17 00:12:06 +00:00
Jamie Pine
25372b3c9e
- fix border radius ()
- upgrade button / input components
- clean up markup
2021-12-16 17:03:32 -07:00
Alex van Andel
a3bd226347
Bugfix/year change () 2021-12-16 15:20:38 +00:00