* 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>
* 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>
* [WIP] checkpoint before pull & merge
- Added teams to sidebar
- Refactored team settings
- Improved team list UI
This code will be partly reverted next commit.
* [WIP]
- Moved team code back to components
- Removed team link from sidebar
- Built new team manager screen based on Event Type designs
- Component-ized frequently reused code (SettingInputContainer, FlatIconButton)
* [WIP]
- Created LinkIconButton as standalone component
- Added functionality to sidebar of team settings
- Fixed type bug on public team page induced by my normalization of members array in team query
- Removed teams-old which was kept as refrence
- Cleaned up loose ends
* [WIP]
- added create team model
- fixed profile missing label due to my removal of default label from component
* [WIP]
- Fixed TeamCreateModal trigger
- removed TeamShell, it didn't make the cut
- added getPlaceHolderAvatar
- renamed TeamCreate to TeamCreateModal
- removed deprecated UsernameInput and replaced uses with suggested TextField
* fix save button
* [WIP]
- Fixed drop down actions on team list
- Cleaned up state updates
* [WIP] converting teams to tRPC
* [WIP] Finished refactor to tRPC
* [WIP] Finishing touches
* [WIP] Team availability beginning
* team availability mvp
* - added validation to change role
- modified layout of team availability
- corrected types
* fix ui issue on team availability screen
* - added virtualization to team availability
- added flexChildrenContainer boolean to Shell to allow for flex on children
* availability style fix
* removed hard coded team type as teams now use inferred type from tRPC
* Removed unneeded vscode settings
* Reverted prisma schema
* Fixed migrations
* Removes unused dayjs plugins
* Reverts type regression
* Type fix
* Type fixes
* Type fixes
* Moves team availability code to ee
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* wip
* tmp mig
* add cron api key to header
* feels safer
* Revert "wip"
This reverts commit 15a8358661.
* test
* add name
* normalize dates
* maybe works
* test
* fixz
* maybe fix ci
* deprecated
* step 1 -- raw sql
* seems to work
* migration seems to work
* br
* fix comment
* timouet
* disconnect prisma test
* test order
* maybs
* seems to work
* tz
* tweak
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* WIP, WIP, WIP, WIP
* Adds missing types
* Type fixes for useSlots
* Type fixes
* Fixes periodType 500 error when updating
* Adds missing dayjs plugin and type fixes
* An attempt was made to fix tests
* Save work in progress
* Added UTC overflow to days
* Update lib/availability.ts
Co-authored-by: Alex Johansson <alexander@n1s.se>
* No more magic numbers
* Fixed slots.test & added getWorkingHours.test
* Tests pass, simpler logic, profit?
* Timezone shifting!
* Forgot to unskip tests
* Updated the user page
* Added American seed user, some fixes
* tmp fix so to continue testing availability
* Removed timeZone parameter, fix defaultValue auto-scroll
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
* added CSS variable --brand-color
* added CustomBranding component
* prisma update for brand color
* added brandcolor to user context in viewer.me
* conflict resolution
* added brandColor input and mutation
* custom brand color to availability
* brandColor added to BookingPage
* fixed availability, booking for team and added customBranding to success
* brandColor added to cancel/uid
* requested changes
* lint fix
* further changes
* lint fix
* Add event type reordering
* Add migration for position field
* hack on a hack
* can edit
* fix ordering
* Remove console.log
Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: KATT <alexander@n1s.se>
* Refactored Schedule component
* Merge branch 'main' into feature/availability-page-revamp
* wip
* Turned value into number, many other TS tweaks
* NodeJS 16x works 100% on my local, but out of scope for this already massive PR
* Fixed TS errors in viewer.tsx and schedule/index.ts
* Reverted next.config.js
* Fixed minor remnant from moving types to @lib/types
* schema comment
* some changes to form handling
* add comments
* Turned ConfigType into number; which seems to be the value preferred by tRPC
* Fixed localized time display during onboarding
* Update components/ui/form/Schedule.tsx
Co-authored-by: Alex Johansson <alexander@n1s.se>
* Added showToast to indicate save success
* Converted number to Date, and also always establish time based on current date
* prevent height flickering of availability
by removing mb-2 of input field
* availabilty: re-added mb-2 but added min-height
* Quite a few bugs discovered, but this seems functional
Co-authored-by: KATT <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.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
* 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 prisma models and migration, minor webhook init --WIP
* --WIP
* --WIP
* added radix-checkbox and other webhook additions --WIP
* added API connections and other modifications --WIP
* --WIP
* replaced checkbox with toggle --WIP
* updated to use Dialog instead of modal --WIP
* fixed API and other small fixes -WIP
* created a dummy hook for test --WIP
* replaced static hook with dynamic hooks
* yarn lock conflict quickfix
* added cancel event hook and other minor additions --WIP
* minor improvements --WIP
* added more add-webhook flow items--WIP
* updated migration to have alter table for eventType
* many ui/ux fixes, logic fixes and action fixes --WIP
* bugfix for incorrect webhook filtering
* some more fixes, edit webhook --WIP
* removed redundant checkbox
* more bugfixes and edit-webhook flow --WIP
* more build and lint fixes
* --WIP
* more fixes and added toast notif --WIP
* --updated iconButton
* clean-up
* fixed enabled check in edit webhook
* another fix
* fixed edit webhook bug
* added await to payload lambda
* wrapped payload call in promise
* fixed cancel/uid CTA alignment
* --requested changes --removed eventType relationship
* Adds missing migration
* Fixes missing daysjs plugin and type fixes
* Adds failsafe for webhooks
* Adds missing dayjs utc plugins
* Fixed schema and migrations
* Updates webhooks query
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>
* feat: setup translations
* feat: i18n setup
* Update pages/settings/profile.tsx
Co-authored-by: Alex Johansson <alexander@n1s.se>
* fix: abstract locale hook
* fix: set default locale if preferred locale is not supported
* Revert "fix: set default locale if preferred locale is not supported"
This reverts commit e2a3d81371.
* fix: set default locale if preferred locale is not supported
* fix: use 1 namespace and remove unnecessary logs
* fix: yarn.lock
* fix: linting errors
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
* Store video data in event location; fixed several types
* fixed malformed id
* Insert Zoom data when updating as well
* Add columns to store (video) meetings
* Store meeting data
* fixed type
* Use stored videoCallData
* Store location in field as well
* Use meta field for booking reference
* Introduced meta field in code
* Revert "Introduced meta field in code"
This reverts commit 535baccee3.
* Revert "Use meta field for booking reference"
This reverts commit 174c252f67.
* Linting fixes
Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Heavy WIP
* More WIP
* Playing with backwards compat
* Moar wip
* wip
* Email changes for group feature
* Committing in redundant migrations for reference
* Combine all WIP migrations into a single feature migration
* Make backup of current version of radio area pending refactor
* Improved accessibility through keyboard
* Cleanup in seperate commit so I can cherrypick later
* Added RadioArea component
* wip
* Ignore .yarn file
* Kinda stable
* Getting closer...
* Hide header when there are only personal events
* Added uid to event create, updated EventTypeDescription
* Delete redundant migration
* Committing new team related migrations
* Optimising & implemented backwards compatibility
* Removed now redundant pages
* Undid prototyping to calendarClient I did not end up using
* Properly typed Select & fixed lint throughout
* How'd that get here, removed.
* TODO: investigate why userData is not compatible with passed type
* This likely matches the event type that is created for a user
* Few bugfixes
* Adding datepicker optimisations
* Fixed new event type spacing, initial profile should always be there
* Gave NEXT_PUBLIC_BASE_URL a try but I think it's not the right solution
* Updated EventTypeDescription to account for long titles, added logo to team page.
* Added logo to team query
* Added cancel Cypress test because an upcoming merge contains changes
* Fix for when the event type description is long
* Turned Theme into the useTheme hook, and made it fully compatible with teams pages
* Built AvatarGroup ui component + moved Avatar to ui
* Give the avatar some space fom the description
* Fixed timeZone selector
* Disabled tooltip +1-...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Converts booking deletion to soft-delete + more robust cancellation
* Update pages/api/cancel.ts
infer type :)
Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
- 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
* refactored settings/team landing page
* changed team edit flow, WIP
* merge conflict fix for teams.tsx
* minor fixes to edit team, WIP
* invite-member and disband team APIs attached inside edit-team page
* added remove-member API in edit-team page, minor fixes
* minor code fix, WIP
* WIP
* add logo, bio, branding to team schema
* bio, logo, branding, slug patch API and minor code fix-- WIP
* fn to Disband team directly from the dropdown menu in settings/teams page, removed debug remnants --WIP
* Pull latest data after an action in settings/teams-edit page
* added slug conflict check at Patch time
* code clean-up
* initial change request fixes --WIP
* prop type fix and add warn button color theme --WIP
* added warn Button to Dialog
* remaining change request fixes
* added noop from react-query
* updated invited team-list design
* prettier fix for api/teams/profile
* removed noop import and added custom noop
* minor Button fix
* requested changes addressed
* wip
* wip
* db: schedule schema
* fix adding time goes into new day
fix adding new time not keeping updating ranges
fix updating ranges not maintaining changed values
* remove photo upload
* remove unused code
* remove more unused code
* undo time lib
* didnt actually change this
* dont show onboardi
ng flow for users created before sept 1 2021
* use more consistent max-widths
* align all inputs in scheduler component
* allow overriding of default styles
* match figma designs
implement goto previous step
* add more types, match figma
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Don't duplicate custom input when editing before db persist
* Remove correct custom input during delete pre db persist (id undefined)
* Moved typings to prisma, keeping backwards compatibility with @map
* Updated all usages of the enum
* add edit links to events on dashboard
* fit elements on screen for mobile
* initialize components for consistent text styles
* add more fine grained width/height settings
* add higher level setting for when an event is available
- db: add supporting values to period allow setting an amount of days,
a range, or unlimited number days an event is available
* fix issue where periodDates are null
* return minimal required data, handle date parsing
* [ui] limit booking days based on user period settings
* api: validate user period settings
* [db] migration for event type period settings
Omar López