Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Single domain setup with one org #18383

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat: Single domain setup with one org #18383

wants to merge 3 commits into from
+208 −138

Conversation

hariombalhara
Copy link
Member

What does this PR do?

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?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

@linear Linear
Copy link

linear bot commented Dec 27, 2024

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

@github-actions github-actions bot added the ❗️ .env changes contains changes to env variables label Dec 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions 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 keithwillcode added the core area: core, team members only label Dec 27, 2024
@hariombalhara 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
hariombalhara commented Dec 27, 2024
View reviewed changes
apps/web/getSubdomainRegExp.js Outdated
Copy link
Member Author

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
hariombalhara commented Dec 27, 2024
View reviewed changes
apps/web/getNextjsOrgRewriteConfig.js
* app.company.cal.com -> app
* app.company.com -> app
*/
const getLeftMostSubdomain = (url) => {
Copy link
Member Author

Choose a reason for hiding this comment

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

Renamed getDefaultSubdomain -> getLeftMostSubdomain

hariombalhara
hariombalhara commented Dec 27, 2024
View reviewed changes
apps/web/getNextjsOrgRewriteConfig.js
return _url.hostname.match(regex)?.groups?.subdomain || null;
};

const getRegExpNotMatchingLeftMostSubdomain = (url) => {
Copy link
Member Author

Choose a reason for hiding this comment

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

Renamed getSubdomainRegExp -> getRegExpNotMatchingLeftMostSubdomain

hariombalhara
hariombalhara commented Dec 27, 2024
View reviewed changes
apps/web/next.config.js Outdated
@@ -124,7 +123,7 @@ const matcherConfigRootPath = {
has: [
{
type: "host",
value: orgHostPath,
value: nextJsOrgRewriteConfig.orgHostPath,
Copy link
Member Author

Choose a reason for hiding this comment

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

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

hariombalhara
hariombalhara commented Dec 27, 2024
View reviewed changes
apps/web/next.config.js Outdated
@@ -328,23 +328,23 @@ const nextConfig = {
? [
{
...matcherConfigRootPath,
destination: "/team/:orgSlug?isOrgProfile=1",
destination: `/team/${orgSlug}?isOrgProfile=1`,
Copy link
Member Author

Choose a reason for hiding this comment

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

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

@github-actions GitHub Actions
Copy link
Contributor

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

E2E results are ready!

@hariombalhara hariombalhara removed the Low priority Created by Linear-GitHub Sync label Dec 27, 2024
@vercel Vercel
Copy link

vercel bot commented Dec 28, 2024 •
edited
Loading

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 Dec 28, 2024 6:54am
calcom-web-canary ⬜️ Ignored (Inspect) Visit Preview Dec 28, 2024 6:54am

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO ❗️ .env changes contains changes to env variables High priority Created by Linear-GitHub Sync organizations area: organizations, orgs ready-for-e2e self-hosting
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[CAL-4457] Support organization and dashboard on the same domain when there is one organization in the system
2 participants
@hariombalhara @keithwillcode