Send less data & receive better Subscription Context

FalkWolsky · FalkWolsky · commit 2123eb74c19a · 2024-11-02T20:20:52.000+01:00
diff --git a/client/packages/lowcoder/src/constants/subscriptionConstants.ts b/client/packages/lowcoder/src/constants/subscriptionConstants.ts
@@ -2,7 +2,7 @@
 export enum SubscriptionProductsEnum {
   SUPPORT = "QW8L3WPMiNjQjI",
   MEDIAPACKAGE = 'QW8MpIBHxieKXd',
-  AZUREAPIS = 'premium',
+  AZUREAPIS = 'QlQ7cdOh8Lv4dy',
   GOOGLEAPIS = 'enterprise',
   AWSAPIS = 'enterprise-global',
   PRIVATECLOUD = 'private-cloud',
@@ -69,6 +69,10 @@ export interface Subscription {
   quantity: number;
   billing_scheme: string;
   price: string;
+  histId?: string;
+  orgId?: string;
+  userId?: string;
+  customerId?: string;
 }
 
 export interface SubscriptionProduct {
@@ -108,9 +112,7 @@ export interface LowcoderNewCustomer {
 }
 
 export interface LowcoderSearchCustomer {
-  hostname: string;
   hostId: string;
-  email: string;
   orgId: string;
   userId: string;
 }
diff --git a/client/packages/lowcoder/src/redux/sagas/subscriptionSagas.ts b/client/packages/lowcoder/src/redux/sagas/subscriptionSagas.ts
@@ -17,9 +17,7 @@ function* fetchSubscriptionsSaga(action: ReturnType<typeof fetchSubscriptionsAct
     const deploymentId: string = yield select(getDeploymentId);
 
     const subscriptionSearchCustomer: LowcoderSearchCustomer = {
-      hostname: domain,
       hostId: deploymentId,
-      email: currentUser.email,
       orgId: orgID,
       userId: user.id,
     };
diff --git a/client/packages/lowcoder/src/util/context/SimpleSubscriptionContext.tsx b/client/packages/lowcoder/src/util/context/SimpleSubscriptionContext.tsx
@@ -62,9 +62,7 @@ export const SimpleSubscriptionContextProvider = (props: {
   const admin = user.orgRoleMap.get(orgID) === "admin" ? "admin" : "member";
 
   const subscriptionSearchCustomer: LowcoderSearchCustomer = {
-    hostname: domain,
     hostId: deploymentId,
-    email: currentUser.email,
     orgId: orgID,
     userId: user.id,
   };
diff --git a/client/packages/lowcoder/src/util/context/SubscriptionContext.tsx b/client/packages/lowcoder/src/util/context/SubscriptionContext.tsx
@@ -64,9 +64,7 @@ export const SubscriptionContextProvider = (props: {
   const userCount = useOrgUserCount(orgID);
 
   const subscriptionSearchCustomer: LowcoderSearchCustomer = {
-    hostname: domain,
     hostId: deploymentId,
-    email: currentUser.email,
     orgId: orgID,
     userId: user.id,
   };
@@ -128,7 +126,6 @@ export const SubscriptionContextProvider = (props: {
       if (subscriptionDataLoaded && userCount > 0) { // Ensure user count is available
         try {
           console.log("Total Users in Organization:", userCount);
-
           const updatedProducts = await Promise.all(
             products.map(async (product) => {
               const matchingSubscription = subscriptions.find(
