Patch subscription plan frontend validation

backend/src/ee/services/EELicenseService.ts

@@ -95,6 +95,13 @@ class EELicenseService {
 
         return this.globalFeatureSet;
     }
+    
+    public async refreshOrganizationPlan(organizationId: string) {
+        if (this.instanceType === 'cloud') {
+            this.localFeatureSet.del(organizationId);
+            await this.getOrganizationPlan(organizationId);
+        }
+    }
 
     public async initGlobalFeatureSet() {
         const licenseServerKey = await getLicenseServerKey();

backend/src/helpers/organization.ts

@@ -153,22 +153,24 @@ export const updateSubscriptionOrgQuantity = async ({
 
       EELicenseService.localFeatureSet.del(organizationId);
     }
-    
-    if (EELicenseService.instanceType === 'enterprise-self-hosted') {
-      // instance of Infisical is an enterprise self-hosted instance
-      
-      const usedSeats = await MembershipOrg.countDocuments({
-        status: ACCEPTED
-      });
-
-      await licenseKeyRequest.patch(
-        `${await getLicenseServerUrl()}/api/license/v1/license`,
-        {
-          usedSeats
-        }
-      );
-    }
   }
 
+  if (EELicenseService.instanceType === 'enterprise-self-hosted') {
+    // instance of Infisical is an enterprise self-hosted instance
+    
+    const usedSeats = await MembershipOrg.countDocuments({
+      status: ACCEPTED
+    });
+
+    await licenseKeyRequest.patch(
+      `${await getLicenseServerUrl()}/api/license/v1/license`,
+      {
+        usedSeats
+      }
+    );
+  }
+
+  await EELicenseService.refreshOrganizationPlan(organizationId);
+
   return stripeSubscription;
 };

backend/src/helpers/workspace.ts

@@ -6,6 +6,7 @@ import {
 	Secret
 } from '../models';
 import { createBot } from '../helpers/bot';
+import { EELicenseService } from '../ee/services';
 import { SecretService } from '../services';
 
 /**
@@ -22,24 +23,25 @@ export const createWorkspace = async ({
 	name: string;
 	organizationId: string;
 }) => {
-  // create workspace
-  const workspace = await new Workspace({
-    name,
-    organization: organizationId,
-    autoCapitalization: true
-  }).save();
+	// create workspace
+	const workspace = await new Workspace({
+		name,
+		organization: organizationId,
+		autoCapitalization: true
+	}).save();
   
-  // initialize bot for workspace
-  await createBot({
-    name: 'Infisical Bot',
-    workspaceId: workspace._id
-  });
+	// initialize bot for workspace
+	await createBot({
+		name: 'Infisical Bot',
+		workspaceId: workspace._id
+	});
   
-  // initialize blind index salt for workspace
-  await SecretService.createSecretBlindIndexData({
-    workspaceId: workspace._id
-  });
+	// initialize blind index salt for workspace
+	await SecretService.createSecretBlindIndexData({
+		workspaceId: workspace._id
+	});
 
+	await EELicenseService.refreshOrganizationPlan(organizationId);
 
 	return workspace;
 };

frontend/src/hooks/api/subscriptions/types.ts

@@ -1,7 +1,7 @@
 export type SubscriptionPlan = {
   _id: string;
   membersUsed: number;
-  membersLimit: number;
+  memberLimit: number;
   auditLogs: boolean;
   customAlerts: boolean;
   customRateLimits: boolean;

frontend/src/layouts/AppLayout/AppLayout.tsx

@@ -61,7 +61,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
   const { subscription } = useSubscription();
 
   const host = window.location.origin;
-  const isAddingProjectsAllowed = ((subscription?.workspacesUsed || 1) < (subscription?.workspaceLimit || 3)) || host !== 'https://app.infisical.com';
+  const isAddingProjectsAllowed = subscription?.workspaceLimit ? (subscription.workspacesUsed < subscription.workspaceLimit) : true;
 
   const createWs = useCreateWorkspace();
   const uploadWsKey = useUploadWsKey();

frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx

@@ -60,7 +60,7 @@ export const OrgSettingsPage = () => {
 
   const [completeInviteLink, setcompleteInviteLink] = useState<string | undefined>('');
 
-  const isMoreUsersNotAllowed = ((subscription?.membersUsed || 0) >= (subscription?.membersLimit || 1)) && host === 'https://app.infisical.com';
+  const isMoreUsersNotAllowed = subscription?.memberLimit ? (subscription.membersUsed >= subscription.memberLimit) : false;
 
   const onRenameOrg = async (name: string) => {
     if (!currentOrg?._id) return;