* 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>
* feat: add ApiKey model for new Api auth, owned by a user
* fix: remove metadata:Json and add note:String instead in new apiKey model
* fix: rename apiKey to apiKeys in moder User relation in schema.prisma
* feat: add hashedKey to apiKey and lastUsedAt datetime to keep track of usage of keys and makiung them securely stored in db
* fix 30 day -> 30 days in expiresAt
* feat: api keys frontend in security page
* adds hashedKey to api key model, add frontend api keys in security page
* Make frontend work to create api keys with or without expiry, note, defaults to 1 month expiry
* remove migration for now, add env.example to swagger, sync api
* feat: hashed api keys
* fix: minor refactor and cleanup in apiKeys generator
* add api key success modal
* sync apps/api
* feat: We have API Keys in Security =)
* remove swagger env from pr
* apps api sync
* remove comments in password section
* feat: migration for api keys schema
* sync api w main
* delete apps/api
* add back apps/api
* make min date and disabled optional props in datepicker
* feat fix type check errors
* fix : types
* fix: rmeove renaming of verificationrequest token indexes in migration
* fix: remove extra div
* Fixes for feedback in PR
* fix button />
* fix: rename weird naming of translation for you_will_only_view_it_once
* fix: remove ternary and use && to avoid null for false
* fix sync apps/api with main not old commit
* fix empty className
* fix: remove unused imports
* fix remove commented jsx fragment close
* fix rename editing
* improve translations
* feat: adds beta tag in security tab under api keys
* fix: use api keys everywhere
* fix: cleanup code in api keys
* fix: use watch and controller for neverexpires/datepicker
* Fixes: improve api key never expires
* add back change password h2 title section in security page
* fix update env API_KEY_ prefix default to cal_
* fix: improve eidt api keys modal
* fix: update edit mutation in viewer.apiKeys
* Update apps/web/ee/components/apiKeys/ApiKeyListItem.tsx
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* fix: item: any to pass build
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: Alex van Andel <me@alexvanandel.com>
* patch applied
* patch applied
* We shouldn't pollute global css
* Build fixes
* Updates typings
* WIP extracting zoom to package
* Revert "Upgrades next to 12.1 (#1895)" (#1903)
This reverts commit ede0e98e1f.
* Tweak/gitignore prisma zod (#1905)
* Extracts ignored createEventTypeBaseInput
* Adds postinstall script
* Revert "Tweak/gitignore prisma zod (#1905)" (#1906)
This reverts commit 15bfeb30d7.
* Eslint fixes (#1898)
* Eslint fixes
* Docs build fixes
* Upgrade to next 12.1 (#1904)
* Upgrades next to 12.1
* Fixes build
* Updaters e2e test pipelines
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Fix URL by removing slash and backslash (#1733)
* Fix URl by removing slash and backslash
* Implement slugify
* Add data type
* Fixing folder structure
* Solve zod-utils conflict
* Build fixes (#1929)
* Build fixes
* Fixes type error
* WIP
* Conflict fixes
* Removes unused file
* TODO
* WIP
* Type fixes
* Linting
* WIP
* Moved App definition to types
* WIP
* WIP
* WIP
* WIP WIP
* Renamed zoomvideo app
* Import fix
* Daily.co app (#2022)
* Daily.co app
* Update packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
Co-authored-by: Omar López <zomars@me.com>
* Update packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
Co-authored-by: Omar López <zomars@me.com>
* Missing deps for newly added contants to lib
Co-authored-by: Omar López <zomars@me.com>
* WIP
* WIP
* WIP
* Daily fixes
* Updated type info
* Slack Oauth integration - api route ideas
* Adds getLocationOptions
* Type fixes
* Adds location option for daily video
* Revert "Slack Oauth integration - api route ideas"
This reverts commit 35ffa78e92.
* Slack Oauth + verify sig
* Slack Oauth + verify sig
Implementing connect slack with workspace OAuth
Implemented the ability for slack to send requests on events (commands etc) - This only works if slacks signature matches with our signature
* Revert "Slack Oauth + verify sig"
This reverts commit ee95795e0f.
* WIP - Signature verifiaction failure
* Huddle01 migration to app store (#2038)
* Jitsi Video App migration
* Removing uneeded dependencies
* Missed unused reference
* Missing dependency
`@calcom/lib` is needed in the `locationOption.ts` file
* Huddle01 migration to app store
* WIP: PostData for creating event
* Optimising Query
Vital as we only have 3 seconds max to return the response to slack.
* Jitsi Video App migration (#2027)
* Jitsi Video App migration
* Removing uneeded dependencies
* Missed unused reference
* Missing dependency
`@calcom/lib` is needed in the `locationOption.ts` file
Co-authored-by: Omar López <zomars@me.com>
* Monorepo/app store MS Teams Integration (#2080)
* Create teamsvideo package
* Remove zoom specific refrences
* Add teams video files
* Rename to office365_video
* Add call back to add crednetial type office365_teams
* Rename to office_video to match type
* Add MS Teams as a location option
* Rename files
* Add teams reponse interface and create meeting
* Comment out Daily imports
* Add check for Teams integration
* Add token checking functions
* Change template to create event rather than meeting
* Add comment to test between create link and event
* Add teams URL to booking
* Ask for just onlineMeeting permission
* Add MS Teams logo
* Add message to have an enterprise account
* Remove comments
* Comment back hasDailyIntegration
* Comment back daily credentials
* Update link to MS Graph section of README
* Move API calls to package
Co-authored-by: Omar López <zomars@me.com>
* Re-adds missing module for transpiling
* Adding connect button if there is on user
* Adds email as required field for app store metadata
* WIP: migrates tandem to app store
* Cleanup
* Migrates tandem api routes to app store
* Fixes tandem api handlers
* Big WIP WIP
* Show todays bookings.
* No booking message to json
* Transition into modals
Better UX for submitting forms.
* Create Bookings - Working
* Fixing /today to show today and not all upcoming
* Fixing message
* Build fixes
* WIP
* Fixes annoying circular dependency bug
I've spent a whole day on this....
* Location option cleanup
* Type fixes
* Update EventManager.ts
* Update CalendarManager.ts
* Merge branch 'monorepo/app-store' into sean-monorepo-slack-oauth
* Moves CalendarService back to lib
* Moves apple calendar to App Store
* Cleanup
* Booking Success
* Merge branch 'main' into sean-monorepo-slack-oauth
* Restored moved file
* Delete TeamRole.tsx
* Undoing unrelated changes
* Cleanup
* Cleanup
* Updates website
* Delete .env.example
* Update yarn.lock
* Adds instructions to README
* Build fixes
* Uses generic app store api handler
* Adds install button and cleanup
* Updates .env.example
* Update README.md
* Renames slackapp to slackmessaing
* Update InstallAppButton.tsx
* Delete locationOption.ts
* Type fixes
* Build fixes
* Links + Fixing connection issue
* fixed merge conflict
* fixed merge conflict
* Type fixes
* Update index.ts
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Juan Esteban Nieto Cifuentes <89233604+Jenietoc@users.noreply.github.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peer@cal.com>
* updated saml-jackson
* if logged in redirect to getting-started page with username in the query param
* 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
* updated updated saml-jackson
* document PGSSLMODE for Heroku
* tweaks to PGSSLMODE doc
* for self-hosted instance just allow user to signin with any identity (as long as email matches)
* fixed submitting flag
* added username to onboarding flow (if requested during signup)
* added telemetry for google login, saml login, saml config
* check if firstName and lastName are defined
* convert mutation to an async op
* added e2e test to ensure username query param gets picked up during onboarding
* fixed minor typo and added note about configuring Google integration as an Internal app when self-hosting
* cleaned up unnecessary ssr in sso signup routes
* renamed function
* Revert "cleaned up unnecessary ssr in sso signup routes"
This reverts commit 3607ffef79.
* moved client side code to useEffect hook
* - format
- fixed Save button in SAML config component
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Crypto events (#1390)
* update schemas, functions & ui to allow creating and updating events with a smart contract property
* remove adding sc address in the dialog that first pops-up when creating a new event, since its an advanced option
* add sc to booking ui
* some more ts && error handling
* fetch erc20s and nfts list in event-type page
* some cleanup within time limit
* ts fix 1
* more ts fixes
* added web3 section to integrations
* added web3 wrapper, needs connection to user_settings db
* extract to api
* Update eventType.ts
* Update components/CryptoSection.tsx
Change comment from // to /** as @zomars suggested
Co-authored-by: Omar López <zomars@me.com>
* convert axios to fetch, change scAddress to smartContractAddress, load bloxy from next_public_env
* Fix branch conflict
* add enable/disable btn web3
* fixed away user causing duplicate entries
* Remove web3 validation
* renamed web3 button in integrations
* remove unused variable
* Add metadata column
* added loader and showToast to the web3 btn
* fix: remove smartContractAddress from info sended
* send to user events when the contract is missing
* use window.web3 instead of web3
* use NEXT_PUBLIC_WEB3_AUTH_MSG
* remove web3 auth from .env
* wip
* wip
* Add metamask not installed msg and success redirect
* add redirect when verified
* styled web3 button and added i18n to web3
* fixed redirect after verification
* wip
* wip
* moved crypto section to ee
Co-authored-by: Yuval Drori <53199044+yuvd@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
Co-authored-by: Yuval Drori <yuvald29@protonmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* 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>
* ⬆️ Bump tailwindcss from 2.2.14 to 2.2.15
Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 2.2.14 to 2.2.15.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v2.2.14...v2.2.15)
---
updated-dependencies:
- dependency-name: tailwindcss
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* updating cal will provide a zoom meeting url
* updating cal will provide a zoom meeting url
* modifying how daily emails send
* modifying how daily emails send
* daily table
* migration updates
* rebasing updates
* updating Daily references to a new table
* merge updates, adding Daily references to book/events.ts
* updated video email templates to remove Daily specific references
* updating the events.ts and refactoring in the event manager
* removing the package-lock
* updating some of the internal Daily notes
* removing handle errors raw from the Daily video client
* prettier formatting fixes
* Added the Daily location to calendar events and updated Cal video references to Daily.co video
* updating references to create in event manager to check for Daily video
* adding a daily interface in the event manager
* adding daily to the location labels
* resolving yarn merge conflicts
* removing prettier auto and refactoring integrations: daily in the event manager
* removing changes to estlintrc.json
* updating message when daily video call meeting has not started
* updated modal time buffer
* changed video calls to Cal colors
* removing change to undoing change to lodash/merge on the event manager
* removing change on the event-types to match the main repo
* updating the border color in daily video calls
* updating cal will provide a zoom meeting url
* updating cal will provide a zoom meeting url
* modifying how daily emails send
* modifying how daily emails send
* daily table
* migration updates
* rebasing updates
* updating Daily references to a new table
* merge updates, adding Daily references to book/events.ts
* updated video email templates to remove Daily specific references
* updating the events.ts and refactoring in the event manager
* removing the package-lock
* updating some of the internal Daily notes
* removing handle errors raw from the Daily video client
* prettier formatting fixes
* Added the Daily location to calendar events and updated Cal video references to Daily.co video
* updating references to create in event manager to check for Daily video
* adding a daily interface in the event manager
* adding daily to the location labels
* resolving yarn merge conflicts
* removing prettier auto and refactoring integrations: daily in the event manager
* removing changes to estlintrc.json
* updated modal time buffer
* updates to enable recording
* removed the console log line for debugging int he DailyVideoAdapter
* removed the env copy created here
* updating readme and chaging Daily Scale Plan variable to true
* merge changes
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lola-Ojabowale <lola.ojabowale@gmail.com>
### Internals
- Replace `lodash.*` packages with plain `lodash` & replace `lodash.*` imports with `lodash/` - should have no impact on bundle size and opens up for us to use all of lodash
- Update `viewer.me` to cherry-pick what we actually need on that query to avoid leaking extra context info
- Update `getIntegrations` to never include `.key`-property to avoid leaking
### Visual
- Update calendars so `primary` is displayed last
- Update connected calendars so they are in ascending order in which you connected them
* ⬆️ Bump tailwindcss from 2.2.14 to 2.2.15
Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 2.2.14 to 2.2.15.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v2.2.14...v2.2.15)
---
updated-dependencies:
- dependency-name: tailwindcss
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* updating cal will provide a zoom meeting url
* updating cal will provide a zoom meeting url
* modifying how daily emails send
* modifying how daily emails send
* daily table
* migration updates
* daily table
* rebasing updates
* updating Daily references to a new table
* updating internal notes
* merge updates, adding Daily references to book/events.ts
* updated video email templates to remove Daily specific references
* updating the events.ts and refactoring in the event manager
* removing the package-lock
* changing calendso video powered by Daily.co to cal video powered by Daily.co
* updating some of the internal Daily notes
* added a modal for when the call/ link is invalid
* removing handle errors raw from the Daily video client
* prettier formatting fixes
* Added the Daily location to calendar events and updated Cal video references to Daily.co video
* updating references to create in event manager to check for Daily video
* fixing spacing on the cancel booking modal and adding Daily references in the event manager
* formatting fixes
* updating the readme file
* adding a daily interface in the event manager
* adding daily to the location labels
* added a note to cal event parser
* resolving yarn merge conflicts
* updating dailyReturn to DailyReturnType
* removing prettier auto and refactoring integrations: daily in the event manager
* removing changes to estlintrc.json
* updating read me formatting
* indent space for Daily ReadMe section
* resolving the merge conflicts in the yarn file
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lola-Ojabowale <lola.ojabowale@gmail.com>
* added license banner and NEXT_PUBLIC_LICENSE_CONSENT in .env.example. agree to hide the banner
* minor changes to license banner
* added /ee/ to tailwind purge config
* wip
* Adds react-use-intercom
* Adds intercom env var
* Loads intercom dynamically if env is set
* CAL-473 Fixes client-side routing for authed pages
* Moves intercom code to ee
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* add generic calendar icon for caldav
* module for symmetric encrypt/decrypt
* caldav integration
* use Radix dialog
* Move caldav components to /caldav
* remove duplicate cancel button, unused function
* ensure app can connect to caldav server before adding
* fix calendar clients can possibly return null
* fix: add caldav dialog does not close when submitted
* safely attempt all caldav operations
* clarify variable name, fix typo
* use common helper for stripping html
* remove usage of request lib until "completed"
* add types and usage comments to crypto lib
* add encryption key to example env file
- Introduced useTelemetry() hook
- Telemetry events are sent for page_view, booking_confirmed, time_selected, date_selected events
- Telemetry is configured (and can be disabled) with NEXT_PUBLIC_TELEMETRY_KEY env variable
* Added MS_GRAPH_CLIENT_* credentials to .env.example.
* Refactored the google integration into an abstraction layer for creating events and getting the user schedule from either Google or Office 365.
* FIX: when re-authorizing the Google Integration the refresh_token would no longer be set and the google integration would stop working.
* Updated Office 365 integration image
Hariom Balhara