Implemented disable_modules

RocketChat · Sep 15, 2023 · 4072803 · 4072803
1 parent 82ddfef
commit 4072803
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 80 deletions.
diff --git a/apps/meteor/client/views/hooks/useUpgradeTabParams.ts b/apps/meteor/client/views/hooks/useUpgradeTabParams.ts
@@ -16,9 +16,12 @@ export const useUpgradeTabParams = (): { tabType: UpgradeTabVariant | false; tri
 	const hasValidLicense = licensesData?.licenses.some((license) => license.modules.length > 0) ?? false;
 	const hadExpiredTrials = cloudWorkspaceHadTrial ?? false;
 
-	const trialLicense = licensesData?.licenses?.find(({ meta }) => meta?.trial);
-	const isTrial = licensesData?.licenses?.every(({ meta }) => meta?.trial) ?? false;
-	const trialEndDate = trialLicense?.meta ? format(new Date(trialLicense.meta.trialEnd), 'yyyy-MM-dd') : undefined;
+	// #TODO: Update to use license v3 format, load meta info from license.information
+	const licenseMeta = licensesData?.licenses?.map((license: any) => (license.meta ?? license.cloudMeta) as Record<string, any>);
+
+	const trialLicense = licenseMeta?.find((meta) => meta?.trial);
+	const isTrial = licenseMeta?.every((meta) => meta?.trial) ?? false;
+	const trialEndDate = trialLicense ? format(new Date(trialLicense.trialEnd), 'yyyy-MM-dd') : undefined;
 
 	const upgradeTabType = getUpgradeTabType({
 		registered,

diff --git a/apps/meteor/ee/app/license/server/fromV2toV3.ts b/apps/meteor/ee/app/license/server/fromV2toV3.ts
@@ -3,7 +3,7 @@
  * Transform a License V2 into a V3 representation.
  */
 
-import type { ILicenseV2, ILicenseV3, Module } from '@rocket.chat/core-typings';
+import type { ILicenseV2, ILicenseV3, LicenseModule } from '@rocket.chat/core-typings';
 
 import { isBundle, getBundleFromModule, getBundleModules } from './bundles';
 import { getTagColor } from './getTagColor';
@@ -53,7 +53,7 @@ export const fromV2toV3 = (v2: ILicenseV2): ILicenseV3 => {
 				v2.modules
 					.map((licenseModule) => (isBundle(licenseModule) ? getBundleModules(licenseModule) : [licenseModule]))
 					.reduce((prev, curr) => [...prev, ...curr], [])
-					.map((licenseModule) => ({ module: licenseModule as Module })),
+					.map((licenseModule) => ({ module: licenseModule as LicenseModule })),
 			),
 		],
 		limits: {
@@ -108,5 +108,6 @@ export const fromV2toV3 = (v2: ILicenseV2): ILicenseV3 => {
 				  }
 				: {}),
 		},
+		cloudMeta: v2.meta,
 	};
 };