Skip to content

Scheduling infrastructure for absolutely everyone.

fix: sign upsert error (#25437)

Udit Takkar179ace23e164
diff --git a/packages/features/auth/signup/handlers/calcomHandler.ts b/packages/features/auth/signup/handlers/calcomHandler.ts
index dae38c2f95d..0ea62c1c863 100644
--- a/packages/features/auth/signup/handlers/calcomHandler.ts
+++ b/packages/features/auth/signup/handlers/calcomHandler.ts
@@ -154,6 +154,7 @@ const handler: CustomNextApiHandler = async (body, usernameStatus) => {
},
});
if (team) {
+ const organizationId = team.isOrganization ? team.id : team.parent?.id ?? null;
const user = await prisma.user.upsert({
where: { email },
update: {
@@ -166,12 +167,14 @@ const handler: CustomNextApiHandler = async (body, usernameStatus) => {
update: { hash: hashedPassword },
},
},
+ organizationId,
},
create: {
username,
email,
identityProvider: IdentityProvider.CAL,
password: { create: { hash: hashedPassword } },
+ organizationId,
},
});
// Wrapping in a transaction as if one fails we want to rollback the whole thing to preventa any data inconsistencies
diff --git a/packages/features/auth/signup/handlers/selfHostedHandler.ts b/packages/features/auth/signup/handlers/selfHostedHandler.ts
index 5bfc23335cf..69d88ccc23c 100644
--- a/packages/features/auth/signup/handlers/selfHostedHandler.ts
+++ b/packages/features/auth/signup/handlers/selfHostedHandler.ts
@@ -88,6 +88,7 @@ export default async function handler(body: Record<string, string>) {
}
}
+ const organizationId = team.isOrganization ? team.id : team.parent?.id ?? null;
const user = await prisma.user.upsert({
where: { email: userEmail },
update: {
@@ -100,12 +101,14 @@ export default async function handler(body: Record<string, string>) {
},
emailVerified: new Date(Date.now()),
identityProvider: IdentityProvider.CAL,
+ organizationId,
},
create: {
username: correctedUsername,
email: userEmail,
password: { create: { hash: hashedPassword } },
identityProvider: IdentityProvider.CAL,
+ organizationId,
},
});