review

RocketChat · Dec 8, 2023 · 458bc07 · 458bc07
1 parent 2db46e9
commit 458bc07
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 57 deletions.
diff --git a/ee/packages/license/src/MockedLicenseBuilder.ts b/ee/packages/license/src/MockedLicenseBuilder.ts
@@ -1,8 +1,5 @@
-import type { ILicenseTag } from './definition/ILicenseTag';
-import type { ILicenseV3 } from './definition/ILicenseV3';
-import type { LicenseLimit } from './definition/LicenseLimit';
-import type { LicenseModule } from './definition/LicenseModule';
-import type { LicensePeriod, Timestamp } from './definition/LicensePeriod';
+import type { ILicenseTag, ILicenseV3, LicenseLimit, LicenseModule, LicensePeriod, Timestamp } from '@rocket.chat/core-typings';
+
 import { encrypt } from './token';
 
 export class MockedLicenseBuilder {

diff --git a/ee/packages/license/src/definition/ILicenseTag.ts b/ee/packages/license/src/definition/ILicenseTag.ts
diff --git a/ee/packages/license/src/definition/ILicenseV2.ts b/ee/packages/license/src/definition/ILicenseV2.ts
diff --git a/ee/packages/license/src/definition/ILicenseV3.ts b/ee/packages/license/src/definition/ILicenseV3.ts
diff --git a/ee/packages/license/src/definition/LicenseBehavior.ts b/ee/packages/license/src/definition/LicenseBehavior.ts
diff --git a/ee/packages/license/src/definition/LicenseInfo.ts b/ee/packages/license/src/definition/LicenseInfo.ts
diff --git a/ee/packages/license/src/definition/LicenseLimit.ts b/ee/packages/license/src/definition/LicenseLimit.ts
diff --git a/ee/packages/license/src/definition/LicenseModule.ts b/ee/packages/license/src/definition/LicenseModule.ts
diff --git a/ee/packages/license/src/definition/LicensePeriod.ts b/ee/packages/license/src/definition/LicensePeriod.ts
diff --git a/ee/packages/license/src/definition/LicenseValidationOptions.ts b/ee/packages/license/src/definition/LicenseValidationOptions.ts
diff --git a/ee/packages/license/src/definition/LimitContext.ts b/ee/packages/license/src/definition/LimitContext.ts
diff --git a/ee/packages/license/src/definition/events.ts b/ee/packages/license/src/definition/events.ts
diff --git a/ee/packages/license/src/deprecated.ts b/ee/packages/license/src/deprecated.ts
@@ -1,4 +1,5 @@
-import type { ILicenseV3, LicenseLimitKind } from './definition/ILicenseV3';
+import type { ILicenseV3, LicenseLimitKind } from '@rocket.chat/core-typings';
+
 import type { LicenseManager } from './license';
 import { getModules } from './modules';
 import { defaultLimits } from './validation/validateDefaultLimits';

diff --git a/ee/packages/license/src/events/deprecated.ts b/ee/packages/license/src/events/deprecated.ts
@@ -1,4 +1,5 @@
-import type { LicenseModule } from '../definition/LicenseModule';
+import type { LicenseModule } from '@rocket.chat/core-typings';
+
 import type { LicenseManager } from '../license';
 import { hasModule } from '../modules';
 

diff --git a/ee/packages/license/src/events/emitter.ts b/ee/packages/license/src/events/emitter.ts
@@ -1,5 +1,5 @@
-import type { BehaviorWithContext } from '../definition/LicenseBehavior';
-import type { LicenseModule } from '../definition/LicenseModule';
+import type { BehaviorWithContext, LicenseModule } from '@rocket.chat/core-typings';
+
 import type { LicenseManager } from '../license';
 import { logger } from '../logger';
 

diff --git a/ee/packages/license/src/events/listeners.ts b/ee/packages/license/src/events/listeners.ts
@@ -1,6 +1,5 @@
-import type { LicenseLimitKind } from '../definition/ILicenseV3';
-import type { BehaviorWithContext, LicenseBehavior } from '../definition/LicenseBehavior';
-import type { LicenseModule } from '../definition/LicenseModule';
+import type { LicenseLimitKind, LicenseModule, BehaviorWithContext, LicenseBehavior } from '@rocket.chat/core-typings';
+
 import type { LicenseManager } from '../license';
 import { hasModule } from '../modules';
 

diff --git a/ee/packages/license/src/events/overwriteClassOnLicense.ts b/ee/packages/license/src/events/overwriteClassOnLicense.ts
@@ -1,4 +1,5 @@
-import type { LicenseModule } from '../definition/LicenseModule';
+import type { LicenseModule } from '@rocket.chat/core-typings';
+
 import type { LicenseManager } from '../license';
 import { onLicense } from './deprecated';
 

diff --git a/ee/packages/license/src/index.ts b/ee/packages/license/src/index.ts
@@ -1,6 +1,5 @@
-import type { LicenseLimitKind } from './definition/ILicenseV3';
-import type { LicenseInfo } from './definition/LicenseInfo';
-import type { LimitContext } from './definition/LimitContext';
+import type { LicenseLimitKind, LicenseInfo, LimitContext } from '@rocket.chat/core-typings';
+
 import { getAppsConfig, getMaxActiveUsers, getUnmodifiedLicenseAndModules } from './deprecated';
 import { onLicense } from './events/deprecated';
 import {
@@ -28,15 +27,6 @@ import { getCurrentValueForLicenseLimit, setLicenseLimitCounter } from './valida
 import { validateFormat } from './validation/validateFormat';
 
 export { DuplicatedLicenseError } from './errors/DuplicatedLicenseError';
-export * from './definition/ILicenseTag';
-export * from './definition/ILicenseV2';
-export * from './definition/ILicenseV3';
-export * from './definition/LicenseBehavior';
-export * from './definition/LicenseInfo';
-export * from './definition/LicenseLimit';
-export * from './definition/LicenseModule';
-export * from './definition/LicensePeriod';
-export * from './definition/LimitContext';
 export * from './MockedLicenseBuilder';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention

diff --git a/ee/packages/license/src/isItemAllowed.ts b/ee/packages/license/src/isItemAllowed.ts
@@ -1,6 +1,4 @@
-import type { LicenseLimitKind } from './definition/ILicenseV3';
-import type { LicenseBehavior } from './definition/LicenseBehavior';
-import type { LicenseValidationOptions } from './definition/LicenseValidationOptions';
+import type { LicenseLimitKind, LicenseBehavior, LicenseValidationOptions } from '@rocket.chat/core-typings';
 
 const isItemAllowed = <T>(item: T, allowList?: T[]): boolean => {
 	return !allowList || allowList.includes(item);

diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts
@@ -1,14 +1,18 @@
+import type {
+	ILicenseTag,
+	LicenseEvents,
+	ILicenseV2,
+	ILicenseV3,
+	LicenseLimitKind,
+	BehaviorWithContext,
+	LicenseBehavior,
+	LicenseInfo,
+	LicenseModule,
+	LicenseValidationOptions,
+	LimitContext,
+} from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 
-import { type ILicenseTag } from './definition/ILicenseTag';
-import type { ILicenseV2 } from './definition/ILicenseV2';
-import type { ILicenseV3, LicenseLimitKind } from './definition/ILicenseV3';
-import type { BehaviorWithContext, LicenseBehavior } from './definition/LicenseBehavior';
-import type { LicenseInfo } from './definition/LicenseInfo';
-import type { LicenseModule } from './definition/LicenseModule';
-import type { LicenseValidationOptions } from './definition/LicenseValidationOptions';
-import type { LimitContext } from './definition/LimitContext';
-import type { LicenseEvents } from './definition/events';
 import { getLicenseLimit } from './deprecated';
 import { DuplicatedLicenseError } from './errors/DuplicatedLicenseError';
 import { InvalidLicenseError } from './errors/InvalidLicenseError';

diff --git a/ee/packages/license/src/modules.ts b/ee/packages/license/src/modules.ts
@@ -1,4 +1,5 @@
-import type { LicenseModule } from './definition/LicenseModule';
+import type { LicenseModule } from '@rocket.chat/core-typings';
+
 import { moduleRemoved, moduleValidated } from './events/emitter';
 import type { LicenseManager } from './license';
 

diff --git a/ee/packages/license/src/showLicense.ts b/ee/packages/license/src/showLicense.ts
@@ -1,4 +1,5 @@
-import type { ILicenseV3 } from './definition/ILicenseV3';
+import type { ILicenseV3 } from '@rocket.chat/core-typings';
+
 import type { LicenseManager } from './license';
 import { getModules } from './modules';
 

diff --git a/ee/packages/license/src/tags.ts b/ee/packages/license/src/tags.ts
@@ -1,4 +1,5 @@
-import type { ILicenseTag } from './definition/ILicenseTag';
+import type { ILicenseTag } from '@rocket.chat/core-typings';
+
 import { type LicenseManager } from './license';
 
 export function addTag(this: LicenseManager, tag: ILicenseTag) {

diff --git a/ee/packages/license/src/token.ts b/ee/packages/license/src/token.ts
@@ -1,9 +1,8 @@
 import crypto from 'crypto';
 
+import type { ILicenseV3 } from '@rocket.chat/core-typings';
 import { verify, sign, getPairs } from '@rocket.chat/jwt';
 
-import type { ILicenseV3 } from './definition/ILicenseV3';
-
 const PUBLIC_LICENSE_KEY_V2 =
 	'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFxV1Nza2Q5LzZ6Ung4a3lQY2ljcwpiMzJ3Mnd4VnV3N3lCVDk2clEvOEQreU1lQ01POXdTU3BIYS85bkZ5d293RXRpZ3B0L3dyb1BOK1ZHU3didHdQCkZYQmVxRWxCbmRHRkFsODZlNStFbGlIOEt6L2hHbkNtSk5tWHB4RUsyUkUwM1g0SXhzWVg3RERCN010eC9pcXMKY2pCL091dlNCa2ppU2xlUzdibE5JVC9kQTdLNC9DSjNvaXUwMmJMNEV4Y2xDSGVwenFOTWVQM3dVWmdweE9uZgpOT3VkOElYWUs3M3pTY3VFOEUxNTdZd3B6Q0twVmFIWDdaSmY4UXVOc09PNVcvYUlqS2wzTDYyNjkrZUlPRXJHCndPTm1hSG56Zmc5RkxwSmh6Z3BPMzhhVm43NnZENUtLakJhaldza1krNGEyZ1NRbUtOZUZxYXFPb3p5RUZNMGUKY0ZXWlZWWjNMZWg0dkVNb1lWUHlJeng5Nng4ZjIveW1QbmhJdXZRdjV3TjRmeWVwYTdFWTVVQ2NwNzF6OGtmUAo0RmNVelBBMElEV3lNaWhYUi9HNlhnUVFaNEdiL3FCQmh2cnZpSkNGemZZRGNKZ0w3RmVnRllIUDNQR0wwN1FnCnZMZXZNSytpUVpQcnhyYnh5U3FkUE9rZ3VyS2pWclhUVXI0QTlUZ2lMeUlYNVVsSnEzRS9SVjdtZk9xWm5MVGEKU0NWWEhCaHVQbG5DR1pSMDFUb1RDZktoTUcxdTBDRm5MMisxNWhDOWZxT21XdjlRa2U0M3FsSjBQZ0YzVkovWAp1eC9tVHBuazlnbmJHOUpIK21mSDM5Um9GdlROaW5Zd1NNdll6dXRWT242OXNPemR3aERsYTkwbDNBQ2g0eENWCks3Sk9YK3VIa29OdTNnMmlWeGlaVU0wQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=';
 

diff --git a/ee/packages/license/src/v2/bundles.ts b/ee/packages/license/src/v2/bundles.ts
@@ -1,4 +1,4 @@
-import type { LicenseModule } from '../definition/LicenseModule';
+import type { LicenseModule } from '@rocket.chat/core-typings';
 
 interface IBundle {
 	[key: string]: LicenseModule[];

diff --git a/ee/packages/license/src/v2/convertToV3.ts b/ee/packages/license/src/v2/convertToV3.ts
@@ -3,9 +3,8 @@
  * Transform a License V2 into a V3 representation.
  */
 
-import type { ILicenseV2 } from '../definition/ILicenseV2';
-import type { ILicenseV3 } from '../definition/ILicenseV3';
-import type { LicenseModule } from '../definition/LicenseModule';
+import type { ILicenseV2, ILicenseV3, LicenseModule } from '@rocket.chat/core-typings';
+
 import { isBundle, getBundleFromModule, getBundleModules } from './bundles';
 import { getTagColor } from './getTagColor';