![]() * 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> |
||
---|---|---|
.. | ||
20210605225044_init | ||
20210605225507_added_bookings | ||
20210606013704_made_booking_uid_unique | ||
20210613133618_add_team_membership_verification | ||
20210615140247_added_selected_calendar | ||
20210615142134_added_custom_event_name | ||
20210615153546_added_buffer_time | ||
20210615153759_add_email_verification_column | ||
20210618140954_added_event_type_custom | ||
20210628153550_password_reset_request | ||
20210629160507_hide_branding | ||
20210630014738_schedule_availability | ||
20210709231256_add_user_theme | ||
20210714151216_event_type_period_settings | ||
20210717120159_booking_confirmation | ||
20210718184017_reminder_mails | ||
20210722225431_minimum_booking_notice | ||
20210725123357_add_location_to_booking | ||
20210813142905_event_payment | ||
20210813194355_add_slug_to_team | ||
20210814175645_custom_inputs_type_enum | ||
20210820130519_add_placeholder_to_custom_event_types | ||
20210824054220_add_bio_branding_logo_to_team | ||
20210825004801_schedule_schema | ||
20210830064354_add_unique_to_team_slug | ||
20210902112455_event_type_unique_user_id_slug | ||
20210902121313_user_plan | ||
20210902125945_user_username_unique | ||
20210904162403_add_booking_status_enum | ||
20210908042159_teams_feature | ||
20210908220336_add_daily_data_table | ||
20210908235519_undo_unique_user_id_slug | ||
20210913211650_add_meeting_info | ||
20210918013258_add_two_factor_fields | ||
20210918152354_user_id_slug_fix | ||
20210919174415_add_user_locale | ||
20210922004424_add_disable_guests_to_event_type | ||
20211004231654_add_webhook_model | ||
20211011152041_non_optionals | ||
20211028233838_add_user_webhooks_relation | ||
20211101151249_update_rejected_bookings | ||
20211105200545_availability_start_and_end_time_as_time | ||
20211106121119_add_event_type_position | ||
20211110063531_add_custom_brand_color | ||
20211110142845_add_identity_provider_columns | ||
20211111013358_period_type_enum | ||
20211112145539_add_saml_login | ||
20211115182559_availability_issue | ||
20211120211639_add_payload_template | ||
20211207010154_add_destination_calendar | ||
20211209201138_membership_admin_role | ||
20211210182230_add_invited_to | ||
20211217201940_upgrade_to_v3 | ||
20211217215952_added_slot_interval_to_event_type | ||
20211220192703_email_to_lowercase | ||
20211228004752_adds_user_metadata | ||
20220105104913_add_away_field | ||
migration_lock.toml |