Hariom BalharaandGitHub
c2996cd2f8
## What does this PR do? Fix 404 booking pages when org support is enabled locally ## Type of change <!-- Please delete bullets that are not relevant. --> - Bug fix (non-breaking change which fixes an issue) ## How should this be tested? <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration --> - Add localhost:3000 to ALLOWED_HOSTNAMES which is the default recommendation for enabling org support locally. <img width="1035" alt="Screenshot 2023-07-10 at 11 04 35 AM" src="https://github.com/calcom/cal.com/assets/1780212/7272437b-afae-4073-905b-eafc39f9fafc"> - Simply restart the server and visit http://localhost:3000/pro. It will give 404. After this change it would work ## Mandatory Tasks - [x] Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.
65 lines
2.3 KiB
TypeScript
65 lines
2.3 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
|
|
import { orgDomainConfig, getOrgSlug } from "@calcom/features/ee/organizations/lib/orgDomains";
|
|
import * as constants from "@calcom/lib/constants";
|
|
|
|
function setupEnvs({ WEBAPP_URL = "https://app.cal.com" } = {}) {
|
|
Object.defineProperty(constants, "WEBAPP_URL", { value: WEBAPP_URL });
|
|
Object.defineProperty(constants, "ALLOWED_HOSTNAMES", {
|
|
value: ["cal.com", "cal.dev", "cal-staging.com", "cal.community", "cal.local:3000", "localhost:3000"],
|
|
});
|
|
Object.defineProperty(constants, "RESERVED_SUBDOMAINS", {
|
|
value: [ "app", "auth", "docs", "design", "console", "go", "status", "api", "saml", "www", "matrix", "developer", "cal", "my", "team", "support", "security", "blog", "learn", "admin"],
|
|
});
|
|
}
|
|
|
|
describe("Org Domains Utils", () => {
|
|
describe("orgDomainConfig", () => {
|
|
it("should return a valid org domain", () => {
|
|
setupEnvs();
|
|
expect(orgDomainConfig("acme.cal.com")).toEqual({
|
|
currentOrgDomain: "acme",
|
|
isValidOrgDomain: true,
|
|
});
|
|
});
|
|
|
|
it("should return a non valid org domain", () => {
|
|
setupEnvs();
|
|
expect(orgDomainConfig("app.cal.com")).toEqual({
|
|
currentOrgDomain: "app",
|
|
isValidOrgDomain: false,
|
|
});
|
|
});
|
|
|
|
it("should return a non valid org domain for localhost", () => {
|
|
setupEnvs();
|
|
expect(orgDomainConfig("localhost:3000")).toEqual({
|
|
currentOrgDomain: null,
|
|
isValidOrgDomain: false,
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("getOrgSlug", () => {
|
|
it("should handle a prod web app url with a prod subdomain hostname", () => {
|
|
setupEnvs();
|
|
expect(getOrgSlug("acme.cal.com")).toEqual("acme");
|
|
});
|
|
|
|
it("should handle a prod web app url with a staging subdomain hostname", () => {
|
|
setupEnvs();
|
|
expect(getOrgSlug("acme.cal.dev")).toEqual(null);
|
|
});
|
|
|
|
it("should handle a local web app with port url with a local subdomain hostname", () => {
|
|
setupEnvs({ WEBAPP_URL: "http://app.cal.local:3000" });
|
|
expect(getOrgSlug("acme.cal.local:3000")).toEqual("acme");
|
|
});
|
|
|
|
it("should handle a local web app with port url with a non-local subdomain hostname", () => {
|
|
setupEnvs({ WEBAPP_URL: "http://app.cal.local:3000" });
|
|
expect(getOrgSlug("acme.cal.com:3000")).toEqual(null);
|
|
});
|
|
});
|
|
});
|