From ad10690043cd9a7b99c667269d62e94e66e313bd Mon Sep 17 00:00:00 2001
From: liuyi <forehalo@gmail.com>
Date: Fri, 22 Nov 2024 13:50:21 +0800
Subject: [PATCH] fix(server): ignore invalid subscription variant for
 subscriptinos query as well (#8894)

---
 .../server/src/plugins/payment/resolver.ts        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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])