From add59896f57d638058fedf7e395977a574f718db Mon Sep 17 00:00:00 2001
From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date: Fri, 2 Aug 2024 20:34:11 +0300
Subject: [PATCH] fix: platform orgs shouldn't have org redirect (#16032)

* fix: platform orgs shouldn't have custom domains

* fixup! Merge branch 'main' into no-redirect-for-platform-orgs

* fixup! Merge branch 'main' into no-redirect-for-platform-orgs
---
 packages/lib/createAProfileForAnExistingUser.ts | 5 +++++
 packages/lib/server/repository/team.ts          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/lib/createAProfileForAnExistingUser.ts b/packages/lib/createAProfileForAnExistingUser.ts
index 8771f917a6..c1a1e1f526 100644
--- a/packages/lib/createAProfileForAnExistingUser.ts
+++ b/packages/lib/createAProfileForAnExistingUser.ts
@@ -57,6 +57,11 @@ export const createAProfileForAnExistingUser = async ({
 
   const orgUrl = getOrgFullOrigin(orgSlug);
 
+  if (org.isPlatform) {
+    // We don't want redirects for Platform Organizations
+    return profile;
+  }
+
   if (user.currentUsername) {
     log.debug(`Creating redirect for user ${user.currentUsername} to ${orgUrl}/${usernameInOrg}`);
     await prisma.tempOrgRedirect.upsert({
diff --git a/packages/lib/server/repository/team.ts b/packages/lib/server/repository/team.ts
index c8f55b3061..3615351ca0 100644
--- a/packages/lib/server/repository/team.ts
+++ b/packages/lib/server/repository/team.ts
@@ -162,6 +162,7 @@ const teamSelect = Prisma.validator<Prisma.TeamSelect>()({
   metadata: true,
   isOrganization: true,
   organizationSettings: true,
+  isPlatform: true,
 });
 
 export class TeamRepository {