Scheduling infrastructure for absolutely everyone.
fix: user is already part of a team (#20774)
Rajiv Sahal7dbfc1b2e063
diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsxindex 0ecd2b45a4f..6d51cd2fd52 100644--- a/apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsx@@ -1,4 +1,11 @@import { _generateMetadata } from "app/_utils";+import { cookies, headers } from "next/headers";+import { redirect } from "next/navigation";++import { getServerSession } from "@calcom/features/auth/lib/getServerSession";+import { WEBAPP_URL } from "@calcom/lib/constants";++import { buildLegacyRequest } from "@lib/buildLegacyCtx";import ManagedUsersView from "~/settings/platform/managed-users/managed-users-view";@@ -11,7 +18,14 @@ export const generateMetadata = async () =>"/settings/platform/managed-users");-const ServerPageWrapper = () => {+const ServerPageWrapper = async () => {+ const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });+ const callbackUrl = `${WEBAPP_URL}/settings/platform/managed-users`;++ if (!session?.user) {+ redirect(`/login?callbackUrl=${callbackUrl}`);+ }+return <ManagedUsersView />;};diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsxindex 9cb10150d93..a35a026a6ea 100644--- a/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsx@@ -1,19 +1,15 @@-import { withAppDirSsr } from "app/WithAppDirSsr";-import type { PageProps } from "app/_types";import { _generateMetadata } from "app/_utils";import { cookies, headers } from "next/headers";+import { redirect } from "next/navigation";+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";+import { WEBAPP_URL } from "@calcom/lib/constants";-import { buildLegacyCtx } from "@lib/buildLegacyCtx";-import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps";+import { buildLegacyRequest } from "@lib/buildLegacyCtx";import LegacyPage, { LayoutWrapper } from "~/settings/platform/new/create-new-view";-type Props = {- isOrg: boolean;-};-export const generateMetadata = async () =>await _generateMetadata((t) => t("set_up_your_platform_organization"),@@ -23,10 +19,14 @@ export const generateMetadata = async () =>"/settings/platform/new");-const getData = withAppDirSsr<Props>(getServerSideProps);+const ServerPage = async () => {+ const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });+ const callbackUrl = `${WEBAPP_URL}/settings/platform/new`;++ if (!session?.user) {+ redirect(`/login?callbackUrl=${callbackUrl}`);+ }-const ServerPage = async ({ params, searchParams }: PageProps) => {- await getData(buildLegacyCtx(await headers(), await cookies(), await params, await searchParams));return (<LayoutWrapper><LicenseRequired>diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsxindex e37fa6d4730..d8cdb9fe31c 100644--- a/apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsx@@ -1,4 +1,11 @@import { _generateMetadata } from "app/_utils";+import { cookies, headers } from "next/headers";+import { redirect } from "next/navigation";++import { getServerSession } from "@calcom/features/auth/lib/getServerSession";+import { WEBAPP_URL } from "@calcom/lib/constants";++import { buildLegacyRequest } from "@lib/buildLegacyCtx";import PlatformPlansView from "~/settings/platform/plans/platform-plans-view";@@ -12,7 +19,14 @@ export const generateMetadata = async () => {);};-const ServerPageWrapper = () => {+const ServerPageWrapper = async () => {+ const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });+ const callbackUrl = `${WEBAPP_URL}/settings/platform/plans`;++ if (!session?.user) {+ redirect(`/login?callbackUrl=${callbackUrl}`);+ }+return <PlatformPlansView />;};diff --git a/packages/trpc/server/routers/viewer/organizations/create.handler.ts b/packages/trpc/server/routers/viewer/organizations/create.handler.tsindex 209907c46e8..20ac6e90df9 100644--- a/packages/trpc/server/routers/viewer/organizations/create.handler.ts+++ b/packages/trpc/server/routers/viewer/organizations/create.handler.ts@@ -112,6 +112,7 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => {slug: true,isOrganization: true,isPlatform: true,+ name: true,},},},@@ -173,7 +174,10 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => {});if (!!hasExistingPlatformOrOrgTeam?.team && isPlatform) {- throw new TRPCError({ code: "BAD_REQUEST", message: "User is already part of a team" });+ throw new TRPCError({+ code: "BAD_REQUEST",+ message: `You can't create a new team because you are already a part of ${hasExistingPlatformOrOrgTeam.team.name}`,+ });}const availability = getAvailabilityFromSchedule(DEFAULT_SCHEDULE);