FIXXXXXX

RocketChat · Nov 12, 2021 · cc31fdd · cc31fdd
1 parent 3b67135
commit cc31fdd
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 16 deletions.
diff --git a/definition/rest/v1/licenses.ts b/definition/rest/v1/licenses.ts
@@ -1,4 +1,4 @@
-import type { ILicense } from '../../../ee/app/license/server/license';
+import type { ILicense } from '../../../ee/app/license/definitions/ILicense';
 
 export type LicensesEndpoints = {
 	'licenses.get': {

diff --git a/ee/app/license/definitions/ILicense.ts b/ee/app/license/definitions/ILicense.ts
@@ -0,0 +1,11 @@
+import { ILicenseTag } from './ILicenseTag';
+
+export interface ILicense {
+	url: string;
+	expiry: string;
+	maxActiveUsers: number;
+	modules: string[];
+	maxGuestUsers: number;
+	maxRoomsPerGuest: number;
+	tag?: ILicenseTag;
+}
diff --git a/ee/app/license/definitions/ILicenseTag.ts b/ee/app/license/definitions/ILicenseTag.ts
@@ -0,0 +1,4 @@
+export interface ILicenseTag {
+	name: string;
+	color: string;
+}
diff --git a/ee/app/license/server/license.ts b/ee/app/license/server/license.ts
@@ -4,24 +4,11 @@ import { Users } from '../../../../app/models/server';
 import { getBundleModules, isBundle, getBundleFromModule } from './bundles';
 import decrypt from './decrypt';
 import { getTagColor } from './getTagColor';
+import { ILicense } from '../definitions/ILicense';
+import { ILicenseTag } from '../definitions/ILicenseTag';
 
 const EnterpriseLicenses = new EventEmitter();
 
-interface ILicenseTag {
-	name: string;
-	color: string;
-}
-
-export interface ILicense {
-	url: string;
-	expiry: string;
-	maxActiveUsers: number;
-	modules: string[];
-	maxGuestUsers: number;
-	maxRoomsPerGuest: number;
-	tag?: ILicenseTag;
-}
-
 export interface IValidLicense {
 	valid?: boolean;
 	license: ILicense;

diff --git a/ee/server/services/package-lock.json b/ee/server/services/package-lock.json
diff --git a/ee/server/services/package.json b/ee/server/services/package.json
@@ -19,6 +19,7 @@
 	"license": "MIT",
 	"dependencies": {
 		"@rocket.chat/string-helpers": "^0.29.0",
+		"ajv": "^8.7.1",
 		"bcrypt": "^5.0.1",
 		"body-parser": "^1.19.0",
 		"colorette": "^1.3.0",