Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

fix(server): ignore invalid subscription variant for subscriptinos query as well (#8894)

liuyiad10690043cd
diff --git a/packages/backend/server/src/plugins/payment/resolver.ts b/packages/backend/server/src/plugins/payment/resolver.ts
index f8771677e3..ac24e58c62 100644
--- a/packages/backend/server/src/plugins/payment/resolver.ts
+++ b/packages/backend/server/src/plugins/payment/resolver.ts
@@ -402,12 +402,25 @@ export class UserSubscriptionResolver {
throw new AccessDenied();
}
- return this.db.userSubscription.findMany({
+ const subscriptions = await this.db.userSubscription.findMany({
where: {
userId: user.id,
status: SubscriptionStatus.Active,
},
});
+
+ subscriptions.forEach(subscription => {
+ if (
+ subscription.variant &&
+ ![SubscriptionVariant.EA, SubscriptionVariant.Onetime].includes(
+ subscription.variant as SubscriptionVariant
+ )
+ ) {
+ subscription.variant = null;
+ }
+ });
+
+ return subscriptions;
}
@ResolveField(() => [UserInvoiceType])