feat: Single domain setup when only one org in the system #18383

hariombalhara · 2024-12-27T11:16:49Z

What does this PR do?

Fixes [CAL-4457] Support organization and dashboard on the same domain when there is one organization in the system #16938
Fixes CAL-4457

See Readme update on how to use.

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. 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?

Browse through the app through multiple pages.

…he WEBAPP_URL

linear · 2024-12-27T11:16:51Z

CAL-4457 Support organization and dashboard on the same domain when there is one organization in the system

github-actions · 2024-12-27T11:17:01Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Support acme.cal.com to be the org domain even when acme.cal.com is t…". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

hariombalhara · 2024-12-27T11:18:10Z

apps/web/getSubdomainRegExp.js

Renamed to getNextjsOrgRewriteConfig and made it more robust with better tests.

hariombalhara · 2024-12-27T11:18:35Z

apps/web/getNextjsOrgRewriteConfig.js

+ * app.company.cal.com -> app
+ * app.company.com -> app
+ */
+const getLeftMostSubdomain = (url) => {


Renamed getDefaultSubdomain -> getLeftMostSubdomain

hariombalhara · 2024-12-27T11:18:54Z

apps/web/getNextjsOrgRewriteConfig.js

+  return _url.hostname.match(regex)?.groups?.subdomain || null;
+};
+
+const getRegExpNotMatchingLeftMostSubdomain = (url) => {


Renamed getSubdomainRegExp -> getRegExpNotMatchingLeftMostSubdomain

hariombalhara · 2024-12-27T11:22:33Z

apps/web/next.config.js

@@ -124,7 +123,7 @@ const matcherConfigRootPath = {
  has: [
    {
      type: "host",
-      value: orgHostPath,
+      value: nextJsOrgRewriteConfig.orgHostPath,


if Single org setup isn't enabled the regex here should remain same

hariombalhara · 2024-12-27T11:22:59Z

apps/web/next.config.js

@@ -328,23 +328,23 @@ const nextConfig = {
        ? [
            {
              ...matcherConfigRootPath,
-              destination: "/team/:orgSlug?isOrgProfile=1",
+              destination: `/team/${orgSlug}?isOrgProfile=1`,


if single org setup isn't enabled, orgSlug = ":orgSlug"

github-actions · 2024-12-27T11:50:29Z

E2E results are ready!

Workflow #42994.1 latest results

…ain-setup

vercel · 2024-12-28T06:53:56Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jan 6, 2025 9:52pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 6, 2025 9:52pm

hariombalhara · 2024-12-31T11:31:47Z

@calcom/foundation for next.config.js review

graphite-app · 2024-12-31T11:35:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (12/31/24)

1 reviewer was added to this PR based on Keith Williams's automation.

hariombalhara · 2024-12-31T11:36:51Z

apps/web/next.config.js

-const matcherConfigRootPath = {
-  has: [
-    {
-      type: "host",
-      value: orgHostPath,
-    },
-  ],
-  source: "/",
-};
-
-const matcherConfigRootPathEmbed = {
-  has: [
-    {
-      type: "host",
-      value: orgHostPath,
-    },
-  ],


Clubbed them under a single object.

hariombalhara · 2024-12-31T11:37:32Z

apps/web/next.config.js

@@ -322,29 +327,33 @@ const nextConfig = {
      // These rewrites are other than booking pages rewrites and so that they aren't redirected to org pages ensure that they happen in beforeFiles
      ...(isOrganizationsEnabled
        ? [
+            orgDomainMatcherConfig.root


Allows to conditionally enable rewrite to organization for root path.

We disable it for single domain setup of org

zomars

LGTM. Appreciate the tests as well 🙏🏽

Support acme.cal.com to be the org domain even when acme.cal.com is t…

e25fe05

…he WEBAPP_URL

github-actions bot added the ❗️ .env changes contains changes to env variables label Dec 27, 2024

github-actions bot added enterprise area: enterprise, audit log, organisation, SAML, SSO High priority Created by Linear-GitHub Sync Low priority Created by Linear-GitHub Sync organizations area: organizations, orgs self-hosting labels Dec 27, 2024

keithwillcode added the core area: core, team members only label Dec 27, 2024

hariombalhara changed the title ~~Support acme.cal.com to be the org domain even when acme.cal.com is t…~~ feat: Single domain setup with one org Dec 27, 2024

hariombalhara commented Dec 27, 2024

View reviewed changes

apps/web/getSubdomainRegExp.js Outdated

Copy link

Member Author

hariombalhara Dec 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed to getNextjsOrgRewriteConfig and made it more robust with better tests.

hariombalhara commented Dec 27, 2024

View reviewed changes

vercel bot deployed to Preview – api December 27, 2024 11:22 View deployment

hariombalhara commented Dec 27, 2024

View reviewed changes

hariombalhara added the ready-for-e2e label Dec 27, 2024

Merge remote-tracking branch 'origin/main' into single-org-single-dom…

7b00ce1

…ain-setup

hariombalhara removed the Low priority Created by Linear-GitHub Sync label Dec 27, 2024

Make the domain root serve dashboard

0cf6628

vercel bot deployed to Preview – api December 28, 2024 07:01 View deployment

hariombalhara assigned hariombalhara and alishaz-polymath and unassigned alishaz-polymath Dec 31, 2024

hariombalhara requested review from alishaz-polymath and a team December 31, 2024 11:31

hariombalhara marked this pull request as ready for review December 31, 2024 11:31

graphite-app bot requested a review from a team December 31, 2024 11:32

dosubot bot added the ✨ feature New feature or request label Dec 31, 2024

hariombalhara commented Dec 31, 2024

View reviewed changes

hariombalhara changed the title ~~feat: Single domain setup with one org~~ feat: Single domain setup when only one org in the system Dec 31, 2024

zomars approved these changes Jan 6, 2025

View reviewed changes

Merge branch 'main' into single-org-single-domain-setup

7d7905a

vercel bot deployed to Preview – api January 6, 2025 21:59 View deployment

hariombalhara merged commit 6f531d0 into main Jan 7, 2025
38 checks passed

hariombalhara deleted the single-org-single-domain-setup branch January 7, 2025 03:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Single domain setup when only one org in the system #18383

feat: Single domain setup when only one org in the system #18383

hariombalhara commented Dec 27, 2024 •

edited

Loading

linear bot commented Dec 27, 2024

github-actions bot commented Dec 27, 2024

hariombalhara Dec 27, 2024

hariombalhara Dec 27, 2024

hariombalhara Dec 27, 2024

hariombalhara Dec 27, 2024

hariombalhara Dec 27, 2024

github-actions bot commented Dec 27, 2024 •

edited

Loading

vercel bot commented Dec 28, 2024 •

edited

Loading

hariombalhara commented Dec 31, 2024

graphite-app bot commented Dec 31, 2024

hariombalhara Dec 31, 2024

hariombalhara Dec 31, 2024

zomars left a comment

feat: Single domain setup when only one org in the system #18383

feat: Single domain setup when only one org in the system #18383

Conversation

hariombalhara commented Dec 27, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

linear bot commented Dec 27, 2024

github-actions bot commented Dec 27, 2024

hariombalhara Dec 27, 2024

Choose a reason for hiding this comment

hariombalhara Dec 27, 2024

Choose a reason for hiding this comment

hariombalhara Dec 27, 2024

Choose a reason for hiding this comment

hariombalhara Dec 27, 2024

Choose a reason for hiding this comment

hariombalhara Dec 27, 2024

Choose a reason for hiding this comment

github-actions bot commented Dec 27, 2024 • edited Loading

E2E results are ready!

vercel bot commented Dec 28, 2024 • edited Loading

hariombalhara commented Dec 31, 2024

graphite-app bot commented Dec 31, 2024

Graphite Automations

hariombalhara Dec 31, 2024

Choose a reason for hiding this comment

hariombalhara Dec 31, 2024

Choose a reason for hiding this comment

zomars left a comment

Choose a reason for hiding this comment

hariombalhara commented Dec 27, 2024 •

edited

Loading

github-actions bot commented Dec 27, 2024 •

edited

Loading

vercel bot commented Dec 28, 2024 •

edited

Loading