Merge branch 'main' into chore/bump-follow-redirects

Author: keithwillcode

.changeset/config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json",
-  "changelog": ["@changesets/changelog-github", { "repo": "calcom/cal.com" }],
+  "changelog": ["@changesets/changelog-github", { "repo": "calcom/cal.diy" }],
   "commit": false,
   "fixed": [],
   "linked": [],

.env.appStore.example

@@ -24,8 +24,8 @@
 # ⚠️ ⚠️ ⚠️ THESE WILL BE MIGRATED TO THE DATABASE TO PREVENT AWS's 4KB ENV QUOTA ⚠️ ⚠️ ⚠️
 
 #   - BASECAMP
-# Used to enable Basecamp integration with Cal.com
-# @see https://github.com/calcom/cal.com#obtaining-basecamp-client-id-and-secret
+# Used to enable Basecamp integration with Cal.diy
+# @see https://github.com/calcom/cal.diy#obtaining-basecamp-client-id-and-secret
 BASECAMP3_CLIENT_ID=
 BASECAMP3_CLIENT_SECRET=
 BASECAMP3_USER_AGENT=
@@ -34,7 +34,7 @@ BASECAMP3_USER_AGENT=
 # Enables Cal Video. to get your key
 # 1. Visit our [Daily.co Partnership Form](https://go.cal.com/daily) and enter your information
 # 2. From within your dashboard, go to the [developers](https://dashboard.daily.co/developers) tab.
-# @see https://github.com/calcom/cal.com#obtaining-daily-api-credentials
+# @see https://github.com/calcom/cal.diy#obtaining-daily-api-credentials
 
 DAILY_API_KEY=
 DAILY_SCALE_PLAN=''
@@ -43,7 +43,7 @@ DAILY_MEETING_ENDED_WEBHOOK_SECRET=''
 
 #   - GOOGLE CALENDAR/MEET/LOGIN
 # Needed to enable Google Calendar integration and Login with Google
-# @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
+# @see https://github.com/calcom/cal.diy#obtaining-the-google-api-credentials
 GOOGLE_API_CREDENTIALS=
 
 # To enable Login with Google you need to:
@@ -55,18 +55,18 @@ GOOGLE_LOGIN_ENABLED=false
 
 #   - HUBSPOT
 # Used for the HubSpot integration
-# @see https://github.com/calcom/cal.com/#obtaining-hubspot-client-id-and-secret
+# @see https://github.com/calcom/cal.diy/#obtaining-hubspot-client-id-and-secret
 HUBSPOT_CLIENT_ID=""
 HUBSPOT_CLIENT_SECRET=""
 
 #   - OFFICE 365
 # Used for the Office 365 / Outlook.com Calendar / MS Teams integration
-# @see https://github.com/calcom/cal.com/#Obtaining-Microsoft-Graph-Client-ID-and-Secret
+# @see https://github.com/calcom/cal.diy/#Obtaining-Microsoft-Graph-Client-ID-and-Secret
 MS_GRAPH_CLIENT_ID=
 MS_GRAPH_CLIENT_SECRET=
 
 #   - SLACK
-# @see https://github.com/calcom/cal.com/#obtaining-slack-client-id-and-secret-and-signing-secret
+# @see https://github.com/calcom/cal.diy/#obtaining-slack-client-id-and-secret-and-signing-secret
 SLACK_SIGNING_SECRET=
 SLACK_CLIENT_ID=
 SLACK_CLIENT_SECRET=
@@ -87,7 +87,7 @@ TANDEM_BASE_URL="https://tandem.chat"
 
 #   - ZOOM
 # Used for the Zoom integration
-# @see https://github.com/calcom/cal.com/#obtaining-zoom-client-id-and-secret
+# @see https://github.com/calcom/cal.diy/#obtaining-zoom-client-id-and-secret
 ZOOM_CLIENT_ID=
 ZOOM_CLIENT_SECRET=
 
@@ -98,7 +98,7 @@ GIPHY_API_KEY=
 
 #   - VITAL
 # Used for the vital integration
-# @see https://github.com/calcom/cal.com/#obtaining-vital-api-keys
+# @see https://github.com/calcom/cal.diy/#obtaining-vital-api-keys
 VITAL_API_KEY=
 VITAL_WEBHOOK_SECRET=
 # "sandbox" | "prod" | "production" | "development"
@@ -108,7 +108,7 @@ VITAL_REGION="us"
 
 #   - ZAPIER
 # Used for the Zapier integration
-# @see https://github.com/calcom/cal.com/blob/main/packages/app-store/zapier/README.md
+# @see https://github.com/calcom/cal.diy/blob/main/packages/app-store/zapier/README.md
 ZAPIER_INVITE_LINK=""
 
 #   - LARK

.env.example

@@ -1,29 +1,16 @@
 # ********** INDEX **********
 #
-# - LICENSE (DEPRECATED)
+# - LICENSE
 # - DATABASE
 # - SHARED
 #   - NEXTAUTH
 # - E-MAIL SETTINGS
 # - ORGANIZATIONS
 
-# - LICENSE (DEPRECATED) ************************************************************************************
-# https://github.com/calcom/cal.com/blob/main/LICENSE
-#
-# Summary of terms:
-# - The codebase has to stay open source, whether it was modified or not
-# - You can not repackage or sell the codebase
-# - Acquire a commercial license to remove these terms by visiting: cal.com/sales
-#
-
-# To enable enterprise-only features please add your environment variable to the .env file then make your way to /auth/setup to select your license and follow instructions.
-
-CALCOM_LICENSE_KEY=
-# Signature token for the Cal.com License API (used for self-hosted integrations)
-# We will give you a token when we provide you with a license key this ensure you and only you can communicate with the Cal.com License API for your license key
-CAL_SIGNATURE_TOKEN=
-# The route to the Cal.com License API
-CALCOM_PRIVATE_API_ROUTE="https://goblin.cal.com"
+# - LICENSE ************************************************************************************
+# This project is licensed under the MIT License.
+# @see https://github.com/calcom/cal.diy/blob/main/LICENSE
+# Cal.diy is fully open source — no license key is required.
 # ***********************************************************************************************************
 
 # - DATABASE ************************************************************************************************
@@ -44,23 +31,21 @@ NEXT_PUBLIC_WEBSITE_URL='http://localhost:3000'
 NEXT_PUBLIC_EMBED_LIB_URL='http://localhost:3000/embed/embed.js'
 
 # To enable SAML login, set both these variables
-# @see https://github.com/calcom/cal.com/tree/main/packages/features/ee#setting-up-saml-login
+# @see https://github.com/calcom/cal.diy/tree/main/packages/features/ee#setting-up-saml-login
 # SAML_DATABASE_URL="postgresql://postgres:@localhost:5450/cal-saml"
 SAML_DATABASE_URL=
 # SAML_ADMINS='pro@example.com'
 SAML_ADMINS=
 # NEXT_PUBLIC_HOSTED_CAL_FEATURES=1
 NEXT_PUBLIC_HOSTED_CAL_FEATURES=
-# For additional security set to a random secret and use that value as the client_secret during the OAuth 2.0 flow.
-SAML_CLIENT_SECRET_VERIFIER=
 
 # If you use Heroku to deploy Postgres (or use self-signed certs for Postgres) then uncomment the follow line.
 # @see https://devcenter.heroku.com/articles/connecting-heroku-postgres#connecting-in-node-js
 # PGSSLMODE='no-verify'
 PGSSLMODE=
 
 # Define which hostnames are expected for the app to work on
-ALLOWED_HOSTNAMES='"cal.com","cal.dev","cal-staging.com","cal.community","cal.local:3000","localhost:3000"'
+ALLOWED_HOSTNAMES='"cal.local:3000","localhost:3000"'
 #  Reserved orgs subdomains for our own usage
 RESERVED_SUBDOMAINS='"app","auth","docs","design","console","go","status","api","saml","www","matrix","developer","cal","my","team","support","security","blog","learn","admin"'
 
@@ -150,7 +135,7 @@ GOOGLE_LOGIN_ENABLED=false
 
 #   - GOOGLE CALENDAR/MEET/LOGIN
 # Needed to enable Google Calendar integration and Login with Google
-# @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
+# @see https://github.com/calcom/cal.diy#obtaining-the-google-api-credentials
 GOOGLE_API_CREDENTIALS=
 # Token to verify incoming webhooks from Google Calendar
 GOOGLE_WEBHOOK_TOKEN=
@@ -196,17 +181,6 @@ FORMBRICKS_FEEDBACK_SURVEY_ID=
 AVATARAPI_USERNAME=
 AVATARAPI_PASSWORD=
 
-# Twilio
-# Used to send SMS reminders in workflows
-TWILIO_SID=
-TWILIO_TOKEN=
-TWILIO_MESSAGING_SID=
-TWILIO_PHONE_NUMBER=
-TWILIO_WHATSAPP_PHONE_NUMBER=
-TWILIO_WHATSAPP_REMINDER_CONTENT_SID=
-TWILIO_WHATSAPP_CANCELLED_CONTENT_SID=
-TWILIO_WHATSAPP_RESCHEDULED_CONTENT_SID=
-TWILIO_WHATSAPP_COMPLETED_CONTENT_SID=
 # For NEXT_PUBLIC_SENDER_ID only letters, numbers and spaces are allowed (max. 11 characters)
 NEXT_PUBLIC_SENDER_ID=
 TWILIO_VERIFY_SID=
@@ -246,7 +220,7 @@ API_KEY_PREFIX=cal_
 # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/
 # Configures the global From: header whilst sending emails.
 EMAIL_FROM='notifications@yourselfhostedcal.com'
-EMAIL_FROM_NAME='Cal.com'
+EMAIL_FROM_NAME='Cal.diy'
 
 # Configure SMTP settings (@see https://nodemailer.com/smtp/).
 # Configuration to receive emails locally (mailhog)
@@ -290,9 +264,6 @@ CLOUDFLARE_TURNSTILE_SECRET=
 # 0 = false, 1=true
 NEXT_PUBLIC_VERCEL_USE_BOTID_IN_BOOKER=
 
-# Set the following value to true if you wish to enable Team Impersonation
-NEXT_PUBLIC_TEAM_IMPERSONATION=false
-
 # Close.com internal CRM
 CLOSECOM_CLIENT_ID=
 CLOSECOM_CLIENT_SECRET=
@@ -301,8 +272,8 @@ CLOSECOM_CLIENT_SECRET=
 SENDGRID_SYNC_API_KEY=
 
 # Change your Brand
-NEXT_PUBLIC_APP_NAME="Cal.com"
-NEXT_PUBLIC_SUPPORT_MAIL_ADDRESS="help@cal.com"
+NEXT_PUBLIC_APP_NAME="Cal.diy"
+NEXT_PUBLIC_SUPPORT_MAIL_ADDRESS="help@cal.diy"
 NEXT_PUBLIC_COMPANY_NAME="Cal.com, Inc."
 # Set this to true in to disable new signups
 # NEXT_PUBLIC_DISABLE_SIGNUP=true
@@ -362,40 +333,27 @@ E2E_TEST_APPLE_CALENDAR_EMAIL=""
 E2E_TEST_APPLE_CALENDAR_PASSWORD=""
 
 # - CALCOM QA ACCOUNT
-# Used for E2E tests on Cal.com that require 3rd party integrations
+# Used for E2E tests on Cal.diy that require 3rd party integrations
 E2E_TEST_CALCOM_QA_EMAIL="qa@example.com"
 # Replace with your own password
 E2E_TEST_CALCOM_QA_PASSWORD="password"
 E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS=
 E2E_TEST_CALCOM_GCAL_KEYS=
 
 # - APP CREDENTIAL SYNC ***********************************************************************************
-# Used for self-hosters that are implementing Cal.com into their applications that already have certain integrations
+# Used for self-hosters that are implementing Cal.diy into their applications that already have certain integrations
 # Under settings/admin/apps ensure that all app secrets are set the same as the parent application
 # You can use: `openssl rand -base64 32` to generate one
 CALCOM_CREDENTIAL_SYNC_SECRET=""
 # This is the header name that will be used to verify the webhook secret. Should be in lowercase
 CALCOM_CREDENTIAL_SYNC_HEADER_NAME="calcom-credential-sync-secret"
 # This the endpoint from which the token is fetched
 CALCOM_CREDENTIAL_SYNC_ENDPOINT=""
-# Key should match on Cal.com and your application
+# Key should match on Cal.diy and your application
 # must be 24 bytes for AES256 encryption algorithm
 # You can use: `openssl rand -base64 24` to generate one
 CALCOM_APP_CREDENTIAL_ENCRYPTION_KEY=""
 
-# - OIDC E2E TEST *******************************************************************************************
-
-# Ensure this ADMIN EMAIL is present in the SAML_ADMINS list
-E2E_TEST_SAML_ADMIN_EMAIL=
-E2E_TEST_SAML_ADMIN_PASSWORD=
-
-E2E_TEST_OIDC_CLIENT_ID=
-E2E_TEST_OIDC_CLIENT_SECRET=
-E2E_TEST_OIDC_PROVIDER_DOMAIN=
-
-E2E_TEST_OIDC_USER_EMAIL=
-E2E_TEST_OIDC_USER_PASSWORD=
-
 # ***********************************************************************************************************
 
 # api v2
@@ -468,7 +426,7 @@ LINGO_DOT_DEV_API_KEY=
 DIRECTORY_IDS_TO_LOG=
 
 
-# Set this when Cal.com is used to serve only one organization's booking pages
+# Set this when Cal.diy is used to serve only one organization's booking pages
 # Read more about it in the README.md
 NEXT_PUBLIC_SINGLE_ORG_SLUG=
 
@@ -523,10 +481,3 @@ TRIGGER_DEV_PROJECT_REF=
 
 GOOGLE_ADS_ENABLED=1      # To enable Google Ads tracking (gclid)
 LINKEDIN_ADS_ENABLED=1    # To enable LinkedIn Ads tracking (li_fat_id)
-
-# - BACKBLAZE B2 (Compliance Documents) *************************************************************************
-# Used for storing and serving compliance documents (SOC 2, ISO 27001, pentest reports)
-B2_APPLICATION_KEY_ID=
-B2_APPLICATION_KEY=
-B2_BUCKET_ID=
-B2_BUCKET_NAME=

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions
-    url: https://github.com/calcom/cal.com/discussions
-    about: Need help selfhosting or ask a general question about the project? Open a discussion
+    url: https://github.com/calcom/cal.diy/discussions
+    about: Need help self-hosting or have a general question about Cal.diy? Open a discussion

.github/ISSUE_TEMPLATE/feature_request.md

@@ -55,4 +55,4 @@ assignees: ""
 - If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves feature request by removing this label, then you can start coding.
   - For clarity: Non-core member issues automatically get the `🚨 needs approval` label.
   - Your feature ideas are invaluable to us! However, they undergo review to ensure alignment with the product's direction.
-  - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
+  - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.diy/blob/main/CONTRIBUTING.md)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,10 @@
 ## What does this PR do?
 
-<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
+<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Note: Cal.diy is a community-maintained open-source project. Contributions here do NOT flow to Cal.com's production service. -->
 
 - Fixes #XXXX (GitHub issue number)
-- Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)
 
 ## Visual Demo (For contributors especially)
 
@@ -22,7 +23,7 @@ A visual demonstration is strongly recommended, for both the original and new ch
 ## Mandatory Tasks (DO NOT REMOVE)
 
 - [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
-- [ ] I have updated the developer docs in /docs if this PR makes changes that would require a [documentation change](https://cal.com/docs). If N/A, write N/A here and check the checkbox.
+- [ ] I have updated the developer docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
 - [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
 
 ## How should this be tested?
@@ -38,7 +39,7 @@ A visual demonstration is strongly recommended, for both the original and new ch
 
 <!-- Remove bullet points below that don't apply to you -->
 
-- I haven't read the [contributing guide](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
+- I haven't read the [contributing guide](https://github.com/calcom/cal.diy/blob/main/CONTRIBUTING.md)
 - My code doesn't follow the style guidelines of this project
 - I haven't commented my code, particularly in hard-to-understand areas
 - I haven't checked if my changes generate no new warnings

.github/actions/docker-build-and-test/action.yml

@@ -62,8 +62,8 @@ runs:
       with:
         images: |
           docker.io/calendso/calendso
-          docker.io/calcom/cal.com
-          ghcr.io/calcom/cal.com
+          docker.io/calcom/cal.diy
+          ghcr.io/calcom/cal.diy
         flavor: |
           latest=${{ !github.event.release.prerelease && inputs.use-as-latest == 'true' }}
           suffix=${{ inputs.platform-suffix }}
@@ -91,7 +91,7 @@ runs:
         docker compose logs database
 
     - name: Set up Docker Buildx
-      uses: useblacksmith/setup-docker-builder@v1
+      uses: docker/setup-buildx-action@v3
       with:
         driver-opts: |
           network=container:database
@@ -100,7 +100,7 @@ runs:
 
     - name: Build image
       id: docker_build
-      uses: useblacksmith/build-push-action@v2
+      uses: docker/build-push-action@v6
       with:
         context: ./
         file: ./Dockerfile
@@ -159,7 +159,7 @@ runs:
 
     - name: Push image
       id: docker_push
-      uses: useblacksmith/build-push-action@v2
+      uses: docker/build-push-action@v6
       if: ${{ inputs.push-image == 'true' && !github.event.release.prerelease }}
       with:
         context: ./