maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Orgs publishing with billing (#10662) 

Co-authored-by: Leo Giovanetti <hello@leog.me>
This commit is contained in:
Joe Au-Yeung 2023-08-09 12:56:53 -04:00 committed by GitHub
parent cde9b24a9b
commit 68d2a97e92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/features/ee/teams/api/upgrade.ts
View File

@ -36,12 +36,24 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
if (!team) {
const prevTeam = await prisma.team.findFirstOrThrow({ where: { id } });
const metadata = teamMetadataSchema.parse(prevTeam.metadata);
const metadata = teamMetadataSchema.safeParse(prevTeam.metadata);
if (!metadata.success) throw new HttpError({ statusCode: 400, message: "Invalid team metadata" });
if (!metadata.data?.requestedSlug) {
throw new HttpError({
statusCode: 400,
message: "Can't publish team/org without `requestedSlug`",
});
}
const { requestedSlug, ...newMetadata } = metadata.data;
/** We save the metadata first to prevent duplicate payments */
team = await prisma.team.update({
where: { id },
data: {
metadata: {
...newMetadata,
paymentId: checkoutSession.id,
subscriptionId: subscription.id || null,
subscriptionItemId: subscription.items.data[0].id || null,
@ -49,7 +61,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
},
});
/** Legacy teams already have a slug, this will allow them to upgrade as well */
const slug = prevTeam.slug || metadata?.requestedSlug;
const slug = prevTeam.slug || requestedSlug;
if (slug) {
try {
/** Then we try to upgrade the slug, which may fail if a conflict came up since team creation */