- {org.organizationSettings?.isOrganizationConfigured ? (
+ {org.metadata?.isOrganizationConfigured ? (
{t("dns_configured")}
) : (
{t("dns_missing")}
@@ -136,7 +136,7 @@ function AdminOrgTable() {
{
updateMutation.mutate({
id: org.id,
- organizationSettings: {
+ metadata: {
isOrganizationConfigured: true,
},
});
diff --git a/packages/features/ee/teams/api/upgrade.ts b/packages/features/ee/teams/api/upgrade.ts
index db37c77b09..aebdbfd691 100644
--- a/packages/features/ee/teams/api/upgrade.ts
+++ b/packages/features/ee/teams/api/upgrade.ts
@@ -87,7 +87,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
if (!session) return { message: "Team upgraded successfully" };
- const redirectUrl = team?.isOrganization
+ const redirectUrl = metadata?.data?.isOrganization
? `${WEBAPP_URL}/settings/organizations/profile?upgraded=true`
: `${WEBAPP_URL}/settings/teams/${team.id}/profile?upgraded=true`;
diff --git a/packages/features/ee/teams/components/MemberListItem.tsx b/packages/features/ee/teams/components/MemberListItem.tsx
index c8de6d6369..714cfe9115 100644
--- a/packages/features/ee/teams/components/MemberListItem.tsx
+++ b/packages/features/ee/teams/components/MemberListItem.tsx
@@ -5,6 +5,7 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
@@ -46,7 +47,9 @@ const useCurrentUserId = () => {
};
const checkIsOrg = (team: Props["team"]) => {
- return team.isOrganization;
+ const metadata = teamMetadataSchema.safeParse(team.metadata);
+ if (metadata.success && metadata.data?.isOrganization) return true;
+ return false;
};
export default function MemberListItem(props: Props) {
diff --git a/packages/features/filters/components/TeamsFilter.tsx b/packages/features/filters/components/TeamsFilter.tsx
index 44dfe75bb6..1c34ce09b1 100644
--- a/packages/features/filters/components/TeamsFilter.tsx
+++ b/packages/features/filters/components/TeamsFilter.tsx
@@ -6,6 +6,7 @@ import { classNames } from "@calcom/lib";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import { AnimatedPopover, Avatar, Divider, Tooltip, VerticalDivider } from "@calcom/ui";
@@ -87,7 +88,7 @@ export const TeamsFilter = ({
/>
{teams
- ?.filter((team) => !team?.isOrganization)
+ ?.filter((team) => !teamMetadataSchema.parse(team.metadata)?.isOrganization)
.map((team) => (
}) {
- return team.isOrganization;
+export function isOrganization({ team }: { team: { metadata: Team["metadata"] } }) {
+ return teamMetadataSchema.parse(team.metadata)?.isOrganization;
}
export function getEntityPermissionLevel(
diff --git a/packages/lib/server/queries/teams/index.ts b/packages/lib/server/queries/teams/index.ts
index ba4ae2967b..c910c8cea1 100644
--- a/packages/lib/server/queries/teams/index.ts
+++ b/packages/lib/server/queries/teams/index.ts
@@ -83,7 +83,6 @@ export async function getTeamWithMembers(args: {
id: true,
name: true,
slug: true,
- isOrganization: true,
...(!!includeTeamLogo ? { logo: true } : {}),
bio: true,
hideBranding: true,
diff --git a/packages/lib/server/repository/team.test.ts b/packages/lib/server/repository/team.test.ts
index 8e2e71885d..c709b138a7 100644
--- a/packages/lib/server/repository/team.test.ts
+++ b/packages/lib/server/repository/team.test.ts
@@ -30,7 +30,9 @@ describe("getOrg", () => {
id: 101,
name: "Test Team",
slug: "test-slug",
- isOrganization: true,
+ metadata: {
+ isOrganization: true,
+ },
},
]);
@@ -50,16 +52,18 @@ describe("getOrg", () => {
expect(firstFindManyCallArguments[0]).toEqual({
where: {
slug: "test-slug",
- isOrganization: true,
+ metadata: {
+ path: ["isOrganization"],
+ equals: true,
+ },
},
select: {
id: true,
slug: true,
metadata: true,
- isOrganization: true,
},
});
- expect(org?.isOrganization).toBe(true);
+ expect(org?.metadata?.isOrganization).toBe(true);
});
it("should not return an org result if metadata.isOrganization isn't true", async () => {
@@ -89,13 +93,15 @@ describe("getOrg", () => {
expect(firstFindManyCallArguments[0]).toEqual({
where: {
slug: "test-slug",
- isOrganization: true,
+ metadata: {
+ path: ["isOrganization"],
+ equals: true,
+ },
},
select: {
id: true,
slug: true,
metadata: true,
- isOrganization: true,
},
});
expect(org).toBe(null);
@@ -165,7 +171,6 @@ describe("getTeam", () => {
slug: true,
name: true,
metadata: true,
- isOrganization: true,
},
});
expect(team).not.toBeNull();
@@ -180,7 +185,9 @@ describe("getTeam", () => {
id: 101,
name: "Test Team",
slug: "test-slug",
- isOrganization: true,
+ metadata: {
+ isOrganization: true,
+ },
},
]);
@@ -207,7 +214,6 @@ describe("getTeam", () => {
slug: true,
name: true,
metadata: true,
- isOrganization: true,
},
});
expect(team).toBe(null);
@@ -254,7 +260,10 @@ describe("getTeam", () => {
},
},
],
- isOrganization: true,
+ metadata: {
+ path: ["isOrganization"],
+ equals: true,
+ },
},
},
select: {
@@ -262,7 +271,6 @@ describe("getTeam", () => {
name: true,
slug: true,
metadata: true,
- isOrganization: true,
},
});
});
@@ -286,7 +294,10 @@ describe("getTeam", () => {
where: {
slug: "test-team",
parent: {
- isOrganization: true,
+ metadata: {
+ path: ["isOrganization"],
+ equals: true,
+ },
OR: [
{
slug: "test-org",
@@ -305,7 +316,6 @@ describe("getTeam", () => {
slug: true,
name: true,
metadata: true,
- isOrganization: true,
},
});
});
diff --git a/packages/lib/server/repository/team.ts b/packages/lib/server/repository/team.ts
index 5780c31102..26d63de555 100644
--- a/packages/lib/server/repository/team.ts
+++ b/packages/lib/server/repository/team.ts
@@ -7,9 +7,8 @@ import prisma from "@calcom/prisma";
import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
type TeamGetPayloadWithParsedMetadata =
- | (Omit, "metadata" | "isOrganization"> & {
+ | (Omit, "metadata"> & {
metadata: z.infer;
- isOrganization: boolean;
})
| null;
@@ -50,8 +49,7 @@ async function getTeamOrOrg({
teamSelect = {
...teamSelect,
metadata: true,
- isOrganization: true,
- } satisfies TeamSelect;
+ };
if (lookupBy.havingMemberWithId) where.members = { some: { userId: lookupBy.havingMemberWithId } };
if ("id" in lookupBy) {
@@ -65,7 +63,10 @@ async function getTeamOrOrg({
// Note that an organization and a team that doesn't belong to an organization, both have parentId null
// If the organization has null slug(but requestedSlug is 'test') and the team also has slug 'test', we can't distinguish them without explicitly checking the metadata.isOrganization
// Note that, this isn't possible now to have same requestedSlug as the slug of a team not part of an organization. This is legacy teams handling mostly. But it is still safer to be sure that you are fetching an Organization only in case of isOrgView
- where.isOrganization = true;
+ where.metadata = {
+ path: ["isOrganization"],
+ equals: true,
+ };
// We must fetch only the team here.
} else {
if (forOrgWithSlug) {
@@ -82,32 +83,21 @@ async function getTeamOrOrg({
// teamSelect extends Prisma.TeamSelect but still teams doesn't contain a valid team as per TypeScript and thus it doesn't consider it having team.metadata, team.id and other fields
// This is the reason below code is using a lot of assertions.
- const select = teamSelect;
-
const teams = await prisma.team.findMany({
where,
select: teamSelect,
});
const teamsWithParsedMetadata = teams
- .map((team) => {
- const teamX = team;
-
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore ts types are way too complciated for this now
- const parsedMetadata = teamMetadataSchema.parse(team.metadata ?? {});
- return {
- ...team,
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore It does exist
- isOrganization: team.isOrganization as boolean,
- metadata: parsedMetadata,
- };
- })
+ .map((team) => ({
+ ...team,
+ // Using Type assertion here because we know that the metadata is present and Prisma and TypeScript aren't playing well together
+ metadata: teamMetadataSchema.parse((team as { metadata: z.infer }).metadata),
+ }))
// In cases where there are many teams with the same slug, we need to find out the one and only one that matches our criteria
.filter((team) => {
// We need an org if isOrgView otherwise we need a team
- return isOrg ? team.isOrganization : !team.isOrganization;
+ return isOrg ? team.metadata?.isOrganization : !team.metadata?.isOrganization;
});
if (teamsWithParsedMetadata.length > 1) {
diff --git a/packages/lib/validateUsername.ts b/packages/lib/validateUsername.ts
index 10e03ede45..56d0a10de9 100644
--- a/packages/lib/validateUsername.ts
+++ b/packages/lib/validateUsername.ts
@@ -1,5 +1,6 @@
import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
import prisma from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
export const getUsernameForOrgMember = async ({
email,
@@ -93,12 +94,10 @@ export const validateAndGetCorrectedUsernameInTeam = async (
},
select: {
metadata: true,
- isOrganization: true,
parentId: true,
- organizationSettings: true,
parent: {
select: {
- organizationSettings: true,
+ metadata: true,
},
},
},
@@ -108,15 +107,17 @@ export const validateAndGetCorrectedUsernameInTeam = async (
teamId,
team,
});
- const organization = team?.isOrganization ? team : team?.parent;
+ const teamData = { ...team, metadata: teamMetadataSchema.parse(team?.metadata) };
+ const organization = teamData.metadata?.isOrganization ? teamData : teamData.parent;
if (organization) {
+ const orgMetadata = teamMetadataSchema.parse(organization.metadata);
// Organization context -> org-context username check
- const orgId = team?.parentId || teamId;
+ const orgId = teamData.parentId || teamId;
return validateAndGetCorrectedUsernameAndEmail({
username,
email,
organizationId: orgId,
- orgAutoAcceptEmail: organization?.organizationSettings?.orgAutoAcceptEmail || "",
+ orgAutoAcceptEmail: orgMetadata?.orgAutoAcceptEmail || "",
isSignup,
});
} else {
diff --git a/packages/prisma/migrations/20231215054122_organization_metadata/migration.sql b/packages/prisma/migrations/20231215054122_organization_metadata/migration.sql
deleted file mode 100644
index 59a5f73aec..0000000000
--- a/packages/prisma/migrations/20231215054122_organization_metadata/migration.sql
+++ /dev/null
@@ -1,43 +0,0 @@
-ALTER TABLE "Team" ADD COLUMN "isOrganization" BOOLEAN NOT NULL DEFAULT false;
-
--- CreateTable
-CREATE TABLE "OrganizationSettings" (
- "id" SERIAL NOT NULL,
- "organizationId" INTEGER NOT NULL,
- "isOrganizationConfigured" BOOLEAN NOT NULL DEFAULT false,
- "isOrganizationVerified" BOOLEAN NOT NULL DEFAULT false,
- "orgAutoAcceptEmail" TEXT NOT NULL,
-
- CONSTRAINT "OrganizationSettings_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "OrganizationSettings_organizationId_key" ON "OrganizationSettings"("organizationId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Team_slug_isOrganization_key" ON "Team"("slug", "isOrganization");
-
--- AddForeignKey
-ALTER TABLE "OrganizationSettings" ADD CONSTRAINT "OrganizationSettings_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
--- -- Set team field to notify if it is an organization -> Easier than metadata.parse(X).isOrganization
-UPDATE "Team"
- SET "isOrganization" = (metadata ->> 'isOrganization')::BOOLEAN
-WHERE
- metadata ->> 'isOrganization' = 'true';
-
--- -- Insert data into org settings
-INSERT INTO "OrganizationSettings" ("organizationId", "isOrganizationConfigured", "orgAutoAcceptEmail", "isOrganizationVerified")
-SELECT
- t.id,
- (t.metadata ->> 'isOrganizationConfigured')::BOOLEAN AS "isOrganizationConfigured",
- t.metadata ->> 'orgAutoAcceptEmail' AS "orgAutoAcceptEmail",
- (t.metadata ->> 'isOrganizationVerified')::BOOLEAN AS "isOrganizationVerified"
-FROM (
- SELECT
- id,
- metadata
- FROM
- "Team"
- WHERE
- metadata ->> 'isOrganization' = 'true'
-) AS t;
\ No newline at end of file
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index d3518661b8..90f8a76cf6 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -315,22 +315,10 @@ model Team {
apiKeys ApiKey[]
credentials Credential[]
accessCodes AccessCode[]
- isOrganization Boolean @default(false)
- organizationSettings OrganizationSettings?
instantMeetingTokens InstantMeetingToken[]
pendingPayment Boolean @default(false)
@@unique([slug, parentId])
- @@unique([slug, isOrganization])
-}
-
-model OrganizationSettings {
- id Int @id @default(autoincrement())
- organization Team @relation(fields: [organizationId], references: [id], onDelete: Cascade)
- organizationId Int @unique
- isOrganizationConfigured Boolean @default(false)
- isOrganizationVerified Boolean @default(false)
- orgAutoAcceptEmail String
}
enum MembershipRole {
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index be1d5b9e2e..2cd4232581 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -332,13 +332,6 @@ export const userMetadata = z
})
.nullable();
-export const orgSettingsSchema = z
- .object({
- isOrganizationVerified: z.boolean().optional(),
- isOrganizationConfigured: z.boolean().optional(),
- orgAutoAcceptEmail: z.string().optional(),
- })
- .nullable();
export type userMetadataType = z.infer;
export const teamMetadataSchema = z
@@ -347,6 +340,10 @@ export const teamMetadataSchema = z
paymentId: z.string(),
subscriptionId: z.string().nullable(),
subscriptionItemId: z.string().nullable(),
+ isOrganization: z.boolean().nullable(),
+ isOrganizationVerified: z.boolean().nullable(),
+ isOrganizationConfigured: z.boolean().nullable(),
+ orgAutoAcceptEmail: z.string().nullable(),
migratedToOrgFrom: z
.object({
teamSlug: z.string().or(z.null()).optional(),
diff --git a/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts b/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts
index ed481f9f62..4dd6a0ef2f 100644
--- a/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts
+++ b/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts
@@ -1,4 +1,4 @@
-import { withRoleCanCreateEntity } from "@calcom/lib/entityPermissionUtils";
+import { isOrganization, withRoleCanCreateEntity } from "@calcom/lib/entityPermissionUtils";
import { getTeamAvatarUrl, getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import type { PrismaClient } from "@calcom/prisma";
import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
@@ -34,7 +34,6 @@ export const teamsAndUserProfilesQuery = async ({ ctx }: TeamsAndUserProfileOpti
team: {
select: {
id: true,
- isOrganization: true,
name: true,
slug: true,
metadata: true,
@@ -56,7 +55,7 @@ export const teamsAndUserProfilesQuery = async ({ ctx }: TeamsAndUserProfileOpti
}
const nonOrgTeams = user.teams
- .filter((membership) => !membership.team.isOrganization)
+ .filter((membership) => !isOrganization({ team: membership.team }))
.map((membership) => ({
...membership,
team: {
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
index 24ac64ebea..9ce7b0ae0f 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
@@ -11,7 +11,8 @@ import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import type { PrismaClient } from "@calcom/prisma";
import { baseEventTypeSelect } from "@calcom/prisma";
import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
-import { EventTypeMetaDataSchema, teamMetadataSchema } from "@calcom/prisma/zod-utils";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
+import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
import { TRPCError } from "@trpc/server";
@@ -112,7 +113,6 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
team: {
select: {
id: true,
- isOrganization: true,
name: true,
slug: true,
parentId: true,
@@ -240,7 +240,8 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
eventTypeGroups,
memberships
.filter((mmship) => {
- if (mmship.team.isOrganization) {
+ const metadata = mmship.team.metadata;
+ if (metadata?.isOrganization) {
return false;
} else {
if (!input?.filters || !hasFilter(input?.filters)) {
diff --git a/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts b/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts
index a7466421a1..6574f8e6ee 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts
@@ -23,7 +23,6 @@ export const adminGetHandler = async ({ input }: AdminGetOptions) => {
name: true,
slug: true,
metadata: true,
- isOrganization: true,
members: {
where: {
role: "OWNER",
@@ -38,13 +37,6 @@ export const adminGetHandler = async ({ input }: AdminGetOptions) => {
},
},
},
- organizationSettings: {
- select: {
- isOrganizationConfigured: true,
- isOrganizationVerified: true,
- orgAutoAcceptEmail: true,
- },
- },
},
});
@@ -55,7 +47,7 @@ export const adminGetHandler = async ({ input }: AdminGetOptions) => {
});
}
const parsedMetadata = teamMetadataSchema.parse(org.metadata);
- if (!org?.isOrganization) {
+ if (!parsedMetadata?.isOrganization) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Organization not found",
diff --git a/packages/trpc/server/routers/viewer/organizations/adminGetAll.handler.ts b/packages/trpc/server/routers/viewer/organizations/adminGetAll.handler.ts
index 16d9996b55..7c2f01a1cb 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminGetAll.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminGetAll.handler.ts
@@ -12,14 +12,20 @@ type AdminGetAllOptions = {
export const adminGetUnverifiedHandler = async ({}: AdminGetAllOptions) => {
const allOrgs = await prisma.team.findMany({
where: {
- isOrganization: true,
+ AND: [
+ {
+ metadata: {
+ path: ["isOrganization"],
+ equals: true,
+ },
+ },
+ ],
},
select: {
id: true,
name: true,
slug: true,
metadata: true,
- organizationSettings: true,
members: {
where: {
role: "OWNER",
diff --git a/packages/trpc/server/routers/viewer/organizations/adminUpdate.handler.ts b/packages/trpc/server/routers/viewer/organizations/adminUpdate.handler.ts
index 8dff9e7d74..54e6b6c5bf 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminUpdate.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminUpdate.handler.ts
@@ -17,14 +17,11 @@ type AdminUpdateOptions = {
};
export const adminUpdateHandler = async ({ input }: AdminUpdateOptions) => {
- const { id, organizationSettings, ...restInput } = input;
+ const { id, ...restInput } = input;
const existingOrg = await prisma.team.findUnique({
where: {
id: id,
},
- include: {
- organizationSettings: true,
- },
});
if (!existingOrg) {
@@ -35,8 +32,10 @@ export const adminUpdateHandler = async ({ input }: AdminUpdateOptions) => {
}
const { mergeMetadata } = getMetadataHelpers(teamMetadataSchema.unwrap(), existingOrg.metadata);
-
- const data: Prisma.TeamUpdateArgs["data"] = restInput;
+ const data: Prisma.TeamUpdateArgs["data"] = {
+ ...restInput,
+ metadata: mergeMetadata({ ...restInput.metadata }),
+ };
if (restInput.slug) {
await throwIfSlugConflicts({ id, slug: restInput.slug });
@@ -50,33 +49,13 @@ export const adminUpdateHandler = async ({ input }: AdminUpdateOptions) => {
data.metadata = mergeMetadata({
// If we save slug, we don't need the requestedSlug anymore
requestedSlug: undefined,
+ ...input.metadata,
});
}
- const updatedOrganisation = await prisma.$transaction(async (tx) => {
- const updatedOrganisation = await tx.team.update({
- where: { id },
- data,
- });
-
- if (organizationSettings || existingOrg.organizationSettings) {
- await tx.organizationSettings.update({
- where: {
- organizationId: updatedOrganisation.id,
- },
- data: {
- isOrganizationConfigured:
- organizationSettings?.isOrganizationConfigured ||
- existingOrg.organizationSettings?.isOrganizationConfigured,
- isOrganizationVerified:
- organizationSettings?.isOrganizationVerified ||
- existingOrg.organizationSettings?.isOrganizationVerified,
- orgAutoAcceptEmail:
- organizationSettings?.orgAutoAcceptEmail || existingOrg.organizationSettings?.orgAutoAcceptEmail,
- },
- });
- }
- return updatedOrganisation;
+ const updatedOrganisation = await prisma.team.update({
+ where: { id },
+ data,
});
return updatedOrganisation;
diff --git a/packages/trpc/server/routers/viewer/organizations/adminUpdate.schema.ts b/packages/trpc/server/routers/viewer/organizations/adminUpdate.schema.ts
index d8b2704f02..82ca9a3572 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminUpdate.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminUpdate.schema.ts
@@ -1,12 +1,12 @@
import { z } from "zod";
-import { orgSettingsSchema } from "@calcom/prisma/zod-utils";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
export const ZAdminUpdate = z.object({
id: z.number(),
name: z.string().optional(),
slug: z.string().nullish(),
- organizationSettings: orgSettingsSchema.unwrap().optional(),
+ metadata: teamMetadataSchema.optional(),
});
export type TAdminUpdate = z.infer;
diff --git a/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts b/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts
index 1e0b5982c2..52d795edaf 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts
@@ -1,4 +1,5 @@
import { prisma } from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import { TRPCError } from "@trpc/server";
@@ -16,7 +17,10 @@ export const adminVerifyHandler = async ({ input }: AdminVerifyOptions) => {
const foundOrg = await prisma.team.findFirst({
where: {
id: input.orgId,
- isOrganization: true,
+ metadata: {
+ path: ["isOrganization"],
+ equals: true,
+ },
},
include: {
members: {
@@ -38,12 +42,17 @@ export const adminVerifyHandler = async ({ input }: AdminVerifyOptions) => {
const acceptedEmailDomain = foundOrg.members[0].user.email.split("@")[1];
- await prisma.organizationSettings.update({
+ const existingMetadataParsed = teamMetadataSchema.parse(foundOrg.metadata);
+
+ await prisma.team.update({
where: {
- organizationId: input.orgId,
+ id: input.orgId,
},
data: {
- isOrganizationVerified: true,
+ metadata: {
+ ...existingMetadataParsed,
+ isOrganizationVerified: true,
+ },
},
});
diff --git a/packages/trpc/server/routers/viewer/organizations/checkIfOrgNeedsUpgrade.handler.ts b/packages/trpc/server/routers/viewer/organizations/checkIfOrgNeedsUpgrade.handler.ts
index 5c618ccfd5..29e46303fe 100644
--- a/packages/trpc/server/routers/viewer/organizations/checkIfOrgNeedsUpgrade.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/checkIfOrgNeedsUpgrade.handler.ts
@@ -33,7 +33,7 @@ export async function checkIfOrgNeedsUpgradeHandler({ ctx }: GetUpgradeableOptio
/** We only need to return teams that don't have a `subscriptionId` on their metadata */
teams = teams.filter((m) => {
const metadata = teamMetadataSchema.safeParse(m.team.metadata);
- if (m.team.isOrganization) return false;
+ if (metadata.success && !metadata.data?.isOrganization) return false;
if (metadata.success && metadata.data?.subscriptionId) return false;
return true;
});
diff --git a/packages/trpc/server/routers/viewer/organizations/create.handler.ts b/packages/trpc/server/routers/viewer/organizations/create.handler.ts
index f26d5f3e4e..365644fb18 100644
--- a/packages/trpc/server/routers/viewer/organizations/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/create.handler.ts
@@ -123,16 +123,12 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => {
create: {
name,
...(!IS_TEAM_BILLING_ENABLED ? { slug } : {}),
- isOrganization: true,
metadata: {
...(IS_TEAM_BILLING_ENABLED ? { requestedSlug: slug } : {}),
- },
- organizationSettings: {
- create: {
- isOrganizationVerified: true,
- isOrganizationConfigured,
- orgAutoAcceptEmail: emailDomain,
- },
+ isOrganization: true,
+ isOrganizationVerified: true,
+ isOrganizationConfigured,
+ orgAutoAcceptEmail: emailDomain,
},
},
},
diff --git a/packages/trpc/server/routers/viewer/organizations/update.schema.ts b/packages/trpc/server/routers/viewer/organizations/update.schema.ts
index 151f957844..40e577de6d 100644
--- a/packages/trpc/server/routers/viewer/organizations/update.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/update.schema.ts
@@ -30,7 +30,7 @@ export const ZUpdateInputSchema = z.object({
timeZone: z.string().optional(),
weekStart: z.string().optional(),
timeFormat: z.number().optional(),
- metadata: teamMetadataSchema.unwrap().optional(),
+ metadata: teamMetadataSchema.unwrap().pick({ isOrganizationConfigured: true }).optional(),
});
export type TUpdateInputSchema = z.infer;
diff --git a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts
index 010782c6d1..d1e6315fe2 100644
--- a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts
@@ -3,6 +3,7 @@ import { randomBytes } from "crypto";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { isTeamAdmin } from "@calcom/lib/server/queries/teams";
import { prisma } from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import { TRPCError } from "@calcom/trpc/server";
import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
@@ -20,7 +21,8 @@ export const createInviteHandler = async ({ ctx, input }: CreateInviteOptions) =
const membership = await isTeamAdmin(ctx.user.id, teamId);
if (!membership || !membership?.team) throw new TRPCError({ code: "UNAUTHORIZED" });
- const isOrganizationOrATeamInOrganization = !!(membership.team?.parentId || membership.team.isOrganization);
+ const teamMetadata = teamMetadataSchema.parse(membership.team.metadata);
+ const isOrganizationOrATeamInOrganization = !!(membership.team?.parentId || teamMetadata?.isOrganization);
if (input.token) {
const existingToken = await prisma.verificationToken.findFirst({
diff --git a/packages/trpc/server/routers/viewer/teams/delete.handler.ts b/packages/trpc/server/routers/viewer/teams/delete.handler.ts
index 1dcf685703..0076e36a9d 100644
--- a/packages/trpc/server/routers/viewer/teams/delete.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/delete.handler.ts
@@ -4,6 +4,7 @@ import { deleteDomain } from "@calcom/lib/domainManager/organization";
import { isTeamOwner } from "@calcom/lib/server/queries/teams";
import { closeComDeleteTeam } from "@calcom/lib/sync/SyncServiceManager";
import { prisma } from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import { TRPCError } from "@trpc/server";
@@ -35,7 +36,9 @@ export const deleteHandler = async ({ ctx, input }: DeleteOptions) => {
},
});
- if (deletedTeam?.isOrganization && deletedTeam.slug) deleteDomain(deletedTeam.slug);
+ const deletedTeamMetadata = teamMetadataSchema.parse(deletedTeam.metadata);
+
+ if (deletedTeamMetadata?.isOrganization && deletedTeam.slug) deleteDomain(deletedTeam.slug);
// Sync Services: Close.cm
closeComDeleteTeam(deletedTeam);
diff --git a/packages/trpc/server/routers/viewer/teams/getUpgradeable.handler.ts b/packages/trpc/server/routers/viewer/teams/getUpgradeable.handler.ts
index af29ce7cf6..941c77a11e 100644
--- a/packages/trpc/server/routers/viewer/teams/getUpgradeable.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/getUpgradeable.handler.ts
@@ -37,7 +37,7 @@ export const getUpgradeableHandler = async ({ ctx }: GetUpgradeableOptions) => {
teams = teams.filter((m) => {
const metadata = teamMetadataSchema.safeParse(m.team.metadata);
if (metadata.success && metadata.data?.subscriptionId) return false;
- if (m.team.isOrganization) return false; // We also dont return ORGs as it will be handled in OrgUpgradeBanner
+ if (metadata.success && metadata.data?.isOrganization) return false; // We also dont return ORGs as it will be handled in OrgUpgradeBanner
if (m.team.children.length > 0) return false; // We also dont return ORGs as it will be handled in OrgUpgradeBanner
return true;
});
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
index b1fec96320..114c9fca37 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
@@ -37,23 +37,23 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberOptions) =
await checkRateLimitAndThrowError({
identifier: `invitedBy:${ctx.user.id}`,
});
- const team = await getTeamOrThrow(input.teamId);
-
- const isOrg = team.isOrganization;
-
- if (isOrg && input.role === MembershipRole.OWNER && !(await isOrganisationOwner(ctx.user.id, input.teamId)))
- throw new TRPCError({ code: "UNAUTHORIZED" });
-
await checkPermissions({
userId: ctx.user.id,
teamId:
ctx.user.organization.id && ctx.user.organization.isOrgAdmin ? ctx.user.organization.id : input.teamId,
- isOrg,
+ isOrg: input.isOrg,
});
- const { autoAcceptEmailDomain, orgVerified } = getIsOrgVerified(isOrg, team);
// Only owners can award owner role in an organization.
+ if (
+ input.isOrg &&
+ input.role === MembershipRole.OWNER &&
+ !(await isOrganisationOwner(ctx.user.id, input.teamId))
+ )
+ throw new TRPCError({ code: "UNAUTHORIZED" });
+ const team = await getTeamOrThrow(input.teamId, input.isOrg);
+ const { autoAcceptEmailDomain, orgVerified } = getIsOrgVerified(input.isOrg, team);
const usernameOrEmailsToInvite = await getUsernameOrEmailsToInvite(input.usernameOrEmail);
const orgConnectInfoByUsernameOrEmail = usernameOrEmailsToInvite.reduce((acc, usernameOrEmail) => {
return {
@@ -63,13 +63,13 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberOptions) =
orgAutoAcceptDomain: autoAcceptEmailDomain,
usersEmail: usernameOrEmail,
team,
- isOrg: isOrg,
+ isOrg: input.isOrg,
}),
};
}, {} as Record>);
const existingUsersWithMembersips = await getUsersToInvite({
usernamesOrEmails: usernameOrEmailsToInvite,
- isInvitedToOrg: isOrg,
+ isInvitedToOrg: input.isOrg,
team,
});
const existingUsersEmailsAndUsernames = existingUsersWithMembersips.reduce(
@@ -153,7 +153,7 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberOptions) =
currentUserTeamName: team?.name,
existingUsersWithMembersips: regularUsers,
language: translation,
- isOrg: isOrg,
+ isOrg: input.isOrg,
teamId: team.id,
currentUserParentTeamName: team?.parent?.name,
});
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts
index c3ac129944..d7207b8505 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts
@@ -61,8 +61,6 @@ const mockedTeam: TeamWithParent = {
parent: null,
isPrivate: false,
logoUrl: "",
- isOrganization: false,
- calVideoLogo: "",
};
const mockUser: Invitee = {
@@ -210,10 +208,7 @@ describe("Invite Member Utils", () => {
describe("getIsOrgVerified", () => {
it("should return the correct values when isOrg is true and teamMetadata.orgAutoAcceptEmail is true", () => {
const team = {
- organizationSettings: {
- id: 1,
- teamId: 1,
- isOrganizationConfigured: false,
+ metadata: {
isOrganizationVerified: true,
orgAutoAcceptEmail: "example.com",
},
@@ -232,10 +227,7 @@ describe("Invite Member Utils", () => {
metadata: {},
parent: {
...mockedTeam,
- organizationSettings: {
- id: 1,
- teamId: 1,
- isOrganizationConfigured: false,
+ metadata: {
isOrganizationVerified: false,
orgAutoAcceptEmail: "example.com",
},
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
index 6a89754dfe..5768055791 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
@@ -8,9 +8,10 @@ import { isTeamAdmin } from "@calcom/lib/server/queries";
import { isOrganisationAdmin } from "@calcom/lib/server/queries/organisations";
import slugify from "@calcom/lib/slugify";
import { prisma } from "@calcom/prisma";
-import type { Membership, OrganizationSettings, Team } from "@calcom/prisma/client";
+import type { Membership, Team } from "@calcom/prisma/client";
import { Prisma, type User } from "@calcom/prisma/client";
import { MembershipRole } from "@calcom/prisma/enums";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import { TRPCError } from "@trpc/server";
@@ -53,26 +54,18 @@ export function checkInputEmailIsValid(email: string) {
});
}
-export async function getTeamOrThrow(teamId: number) {
+export async function getTeamOrThrow(teamId: number, isOrg?: boolean) {
const team = await prisma.team.findFirst({
where: {
id: teamId,
},
include: {
- organizationSettings: true,
- parent: {
- include: {
- organizationSettings: true,
- },
- },
+ parent: true,
},
});
if (!team)
- throw new TRPCError({
- code: "NOT_FOUND",
- message: `Team not found`,
- });
+ throw new TRPCError({ code: "NOT_FOUND", message: `${isOrg ? "Organization" : "Team"} not found` });
return team;
}
@@ -392,29 +385,27 @@ export async function sendVerificationEmail({
}
}
-type TeamAndOrganizationSettings = Team & {
- organizationSettings?: OrganizationSettings | null;
-};
-
export function getIsOrgVerified(
isOrg: boolean,
- team: TeamAndOrganizationSettings & {
- parent: TeamAndOrganizationSettings | null;
+ team: Team & {
+ parent: Team | null;
}
) {
- const parentSettings = team.parent?.organizationSettings;
+ const teamMetadata = teamMetadataSchema.parse(team.metadata);
+ const orgMetadataSafeParse = teamMetadataSchema.safeParse(team.parent?.metadata);
+ const orgMetadataIfExists = orgMetadataSafeParse.success ? orgMetadataSafeParse.data : null;
- if (isOrg && team.organizationSettings?.orgAutoAcceptEmail) {
+ if (isOrg && teamMetadata?.orgAutoAcceptEmail) {
return {
isInOrgScope: true,
- orgVerified: team.organizationSettings.isOrganizationVerified,
- autoAcceptEmailDomain: team.organizationSettings.orgAutoAcceptEmail,
+ orgVerified: teamMetadata.isOrganizationVerified,
+ autoAcceptEmailDomain: teamMetadata.orgAutoAcceptEmail,
};
- } else if (parentSettings?.orgAutoAcceptEmail) {
+ } else if (orgMetadataIfExists?.orgAutoAcceptEmail) {
return {
isInOrgScope: true,
- orgVerified: parentSettings.isOrganizationVerified,
- autoAcceptEmailDomain: parentSettings.orgAutoAcceptEmail,
+ orgVerified: orgMetadataIfExists.isOrganizationVerified,
+ autoAcceptEmailDomain: orgMetadataIfExists.orgAutoAcceptEmail,
};
}
diff --git a/packages/trpc/server/routers/viewer/teams/list.handler.ts b/packages/trpc/server/routers/viewer/teams/list.handler.ts
index 946d3a1498..23a29411ff 100644
--- a/packages/trpc/server/routers/viewer/teams/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/list.handler.ts
@@ -1,4 +1,5 @@
import { prisma } from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import type { TrpcSessionUser } from "../../../trpc";
@@ -19,15 +20,9 @@ export const listHandler = async ({ ctx }: ListOptions) => {
},
include: {
team: {
- select: {
- id: true,
- name: true,
- slug: true,
- logo: true,
- isOrganization: true,
+ include: {
inviteTokens: true,
parent: true,
- parentId: true,
},
},
},
@@ -36,7 +31,8 @@ export const listHandler = async ({ ctx }: ListOptions) => {
return memberships
.filter((mmship) => {
- return !mmship.team.isOrganization;
+ const metadata = teamMetadataSchema.parse(mmship.team.metadata);
+ return !metadata?.isOrganization;
})
.map(({ team: { inviteTokens, ..._team }, ...membership }) => ({
role: membership.role,
diff --git a/packages/trpc/server/routers/viewer/teams/listOwnedTeams.handler.ts b/packages/trpc/server/routers/viewer/teams/listOwnedTeams.handler.ts
index 878228944e..e28927a879 100644
--- a/packages/trpc/server/routers/viewer/teams/listOwnedTeams.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/listOwnedTeams.handler.ts
@@ -1,5 +1,6 @@
import { prisma } from "@calcom/prisma";
import { MembershipRole } from "@calcom/prisma/enums";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import type { TrpcSessionUser } from "../../../trpc";
@@ -32,7 +33,8 @@ export const listOwnedTeamsHandler = async ({ ctx }: ListOptions) => {
return user?.teams
?.filter((m) => {
- return !m.team.isOrganization;
+ const metadata = teamMetadataSchema.parse(m.team.metadata);
+ return !metadata?.isOrganization;
})
?.map(({ team }) => team);
};
diff --git a/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts b/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts
index 0124a4fe18..b3171438bd 100644
--- a/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts
@@ -4,6 +4,7 @@ import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
import { isTeamAdmin, isTeamOwner } from "@calcom/lib/server/queries/teams";
import { closeComDeleteTeamMembership } from "@calcom/lib/sync/SyncServiceManager";
import type { PrismaClient } from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
import { TRPCError } from "@trpc/server";
@@ -74,17 +75,20 @@ export const removeMemberHandler = async ({ ctx, input }: RemoveMemberOptions) =
const orgInfo = await ctx.prisma.team.findUnique({
where: { id: input.teamId },
select: {
- isOrganization: true,
- organizationSettings: true,
metadata: true,
},
});
- const orgMetadata = orgInfo?.organizationSettings;
if (!foundUser || !orgInfo) throw new TRPCError({ code: "NOT_FOUND" });
- if (orgInfo?.isOrganization && orgMetadata?.isOrganizationVerified && orgMetadata?.orgAutoAcceptEmail) {
- if (foundUser.email.endsWith(orgMetadata.orgAutoAcceptEmail)) {
+ const parsedMetadata = teamMetadataSchema.parse(orgInfo.metadata);
+
+ if (
+ parsedMetadata?.isOrganization &&
+ parsedMetadata.isOrganizationVerified &&
+ parsedMetadata.orgAutoAcceptEmail
+ ) {
+ if (foundUser.email.endsWith(parsedMetadata.orgAutoAcceptEmail)) {
await ctx.prisma.user.delete({
where: { id: input.memberId },
});
diff --git a/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts b/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
index 0985e1f7a7..a3390fb8eb 100644
--- a/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
@@ -15,7 +15,7 @@ type InviteMemberOptions = {
};
export const resendInvitationHandler = async ({ ctx, input }: InviteMemberOptions) => {
- const team = await getTeamOrThrow(input.teamId);
+ const team = await getTeamOrThrow(input.teamId, input.isOrg);
await checkPermissions({
userId: ctx.user.id,
diff --git a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
index afc90cd5f1..e0a60bd8b9 100644
--- a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
@@ -2,6 +2,7 @@ import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
import { prisma } from "@calcom/prisma";
import type { Webhook } from "@calcom/prisma/client";
import { MembershipRole } from "@calcom/prisma/enums";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
import { TRPCError } from "@trpc/server";
@@ -67,7 +68,6 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
team: {
select: {
id: true,
- isOrganization: true,
name: true,
slug: true,
parentId: true,
@@ -115,7 +115,8 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
const teamWebhookGroups: WebhookGroup[] = user.teams
.filter((mmship) => {
- return !mmship.team.isOrganization;
+ const metadata = teamMetadataSchema.parse(mmship.team.metadata);
+ return !metadata?.isOrganization;
})
.map((membership) => {
const orgMembership = teamMemberships.find(