e29aa2097e
* feat: add backend validation for conflicting team slugs during org onboarding - Added findOwnedTeamsByUserId method to TeamRepository - Created buildTeamsAndInvites method in BaseOnboardingService that automatically: - Detects teams with same slug as organization - Marks conflicting teams for migration (isBeingMigrated: true) - Filters empty team names and invite emails - Updated BillingEnabledOrgOnboardingService to use new method - Updated SelfHostedOnboardingService to use new method - Added comprehensive tests for slug conflict scenarios This ensures backend validation even if frontend is bypassed, preventing slug conflicts during organization creation. All inheriting classes automatically get this validation without code changes. * refactor: use TeamRepository in listOwnedTeamsHandler Refactored listOwnedTeamsHandler to use TeamRepository.findOwnedTeamsByUserId instead of direct Prisma queries. This: - Reduces code duplication - Ensures consistency across the codebase - Follows repository pattern - Makes the handler more maintainable * fix: update tests to use renamed buildTeamsAndInvites method - Renamed testFilterTeamsAndInvites to testBuildTeamsAndInvites - Made test wrapper method async to match the async buildTeamsAndInvites - Added orgSlug parameter to all test calls - Updated all 9 test cases to use await with the new method signature - Fixed lint warnings by using proper types instead of 'any' - Imported OnboardingIntentResult and User types - Used Pick<User> for mockUser type - Removed all 'as any' type casts Fixes test failures where filterTeamsAndInvites was renamed to buildTeamsAndInvites in the base service. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: mock TeamRepository in tests to prevent database calls Added vi.mock for TeamRepository to avoid database calls in unit tests. The buildTeamsAndInvites method now calls ensureConflictingSlugTeamIsMigrated which uses TeamRepository.findOwnedTeamsByUserId(). Mocking this prevents Prisma errors in CI while keeping the tests focused on filtering logic. The mock returns an empty array so no teams are found for migration, allowing the tests to verify the filtering behavior without database access. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: improve readability of ensureConflictingSlugTeamIsMigrated Refactored the conditional logic in ensureConflictingSlugTeamIsMigrated for better readability while preserving exact behavior. Changed from manual array manipulation to using .map() for updating team migration status. This is a cosmetic change with no functional differences. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Organizations feature
From the Original RFC:
We want to create organisations within Cal.com to enable people to easily and effectively manage multiple teams. An organisation will live above the current teams layer.
App setup
-
Log in as admin and in Settings, turn on Organizations feature flag under Features section. Organizations feature has an operational feature flag in order to turn on the entire feature.
-
Set the following environment variables as described:
CALCOM_LICENSE_KEY: Since Organizations is an EE feature, a license key should be present, either as this environment variable or visiting as an Admin/auth/setup. To get a license key, please contact salesNEXT_PUBLIC_WEBAPP_URL: In case of local development, this variable should be set tohttp://app.cal.local:3000to be able to handle subdomains correctly in terms of authentication and cookiesNEXTAUTH_URL: Should be equal toNEXT_PUBLIC_WEBAPP_URLwhich ishttp://app.cal.local:3000NEXTAUTH_COOKIE_DOMAIN: In case of local development, this variable should be set to.cal.localto be able to accept session cookies in subdomains as well otherwise it should be set to the corresponding environment such as.cal.dev,.cal.qaor.cal.com. If you choose another subdomain, the value for this should match the apex domain ofNEXT_PUBLIC_WEBAPP_URLwith a leading dot (.)ORGANIZATIONS_ENABLED: Should be set to1ortrueSTRIPE_ORG_MONTHLY_PRICE_ID: For dev and all testing should be set to your own testing key. Or ask for the shared key if you're a core member.ORGANIZATIONS_AUTOLINK: Optional. Set to1ortrueto let new signed-up users using Google external provider join the corresponding organization based on the email domain name.
-
Add
app.cal.localto your host file, either:sudo npx hostile set localhost app.cal.local- Add it yourself
-
Add
acme.cal.localto host file given that the org create for it will beacme, otherwise do this for whatever slug will be assigned to the org. This is needed to test org-related public URLs, such as sub-teams, members and event-types. -
Be sure to be logged in with any type of user and visit
/settings/organizations/newand follow setup steps with the slug matching the org slug from step 3 -
Log in as admin and go to Settings and under Organizations you will need to accept the newly created organization in order to be operational
-
After finishing the org creation, you will be automatically logged in as the owner of the organization, and the app will be shown in organization mode
Note
Browsers do not allow camera/mic access on any non-HTTPS hosts except for localhost. To test cal video organization meeting links locally (app.cal.local/video/[uid]). You can access the meeting link by replacing app.cal.local with localhost in the URL.
For eg:- Use http://localhost:3000/video/nAjnkjejuzis99NhN72rGt instead of http://app.cal.local:3000/video/nAjnkjejuzis99NhN72rGt.
To get an HTTPS URL for localhost, you can use a tunneling tool such as ngrok or Tunnelmole . Alternatively, you can generate an SSL certificate for your local domain using mkcert. Turn off any SSL certificate validation in your HTTPS client (be sure to do this for local only, otherwise its a security risk).
Tunnelmole - Open Source Tunnelling Tool:
To install Tunnelmole, execute the command:
curl -O https://install.tunnelmole.com/8dPBw/install && sudo bash install
After a successful installation, you can run Tunnelmole using the following command, replacing 8000 with your actual port number if it is different:
tmole 8000
In the output, you'll see two URLs, one HTTP and an HTTPS URL. For privacy and security reasons, it is recommended to use the HTTPS URL.
View the Tunnelmole README for additional information and other installation methods such as npm or building your own binaries from source.
ngrok - Closed Source Tunnelling Tool:
ngrok is a popular closed source tunneling tool. You can run ngrok using the same port, using the format ngrok http <port> replacing <port> with your actual port number. For example:
ngrok http 8000
This will generate a public URL that you can use to access your localhost server.
DNS setup
When a new organization is created, other than not being verified up until the admin accepts it in settings as explained in step 6, a flag gets created that marks the organization as missing DNS setup. That flag get auto-checked by the system upon organization creation when the Cal instance is deployed in Vercel and the subdomain registration was successful. Logging in as admin and going to Settings > Organizations section, you will see that flag as a badge, designed to give admins a glimpe on what is pending in terms of making an organization work. Alongside the mentioned badge, an email gets sent to admins in order to warn them there is a pending action about setting up DNS for the newly created organization to work. Read more about the Organization Setup here