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): only returns active subscriptions (#6590)

liuyi5b315bfc81d2
diff --git a/packages/backend/server/src/plugins/payment/resolver.ts b/packages/backend/server/src/plugins/payment/resolver.ts
index cbc0d0eec9..d8200f01b8 100644
--- a/packages/backend/server/src/plugins/payment/resolver.ts
+++ b/packages/backend/server/src/plugins/payment/resolver.ts
@@ -369,6 +369,7 @@ export class UserSubscriptionResolver {
return this.db.userSubscription.findMany({
where: {
userId: user.id,
+ status: SubscriptionStatus.Active,
},
});
}
diff --git a/packages/backend/server/src/plugins/payment/service.ts b/packages/backend/server/src/plugins/payment/service.ts
index c4db3d9be3..58d7351602 100644
--- a/packages/backend/server/src/plugins/payment/service.ts
+++ b/packages/backend/server/src/plugins/payment/service.ts
@@ -765,7 +765,9 @@ export class SubscriptionService {
);
return {
price,
- coupon: !subscribed ? CouponType.ProEarlyAccessOneYearFree : undefined,
+ coupon: canHaveEADiscount
+ ? CouponType.ProEarlyAccessOneYearFree
+ : undefined,
};
} else {
const isAIEaUser = await this.features.isEarlyAccessUser(