[refactoring] Remove unused in license 'light' and 'plugins' params

ONLYOFFICE · Jul 5, 2024 · c0fdce6 · c0fdce6
1 parent 045e1e6
commit c0fdce6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/Common/sources/license.js b/Common/sources/license.js
@@ -44,7 +44,6 @@ exports.readLicense = async function () {
 	return [{
 		count: 1,
 		type: c_LR.Success,
-		light: false,
 		packageType: constants.PACKAGE_TYPE_OS,
 		mode: constants.LICENSE_MODE.None,
 		branding: false,
@@ -56,7 +55,6 @@ exports.readLicense = async function () {
 		usersViewCount: 0,
 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
 		hasLicense: false,
-		plugins: false,
 		buildDate: oBuildDate,
 		startDate: startDate,
 		endDate: null,

diff --git a/Common/sources/tenantManager.js b/Common/sources/tenantManager.js
@@ -203,13 +203,8 @@ function fixTenantLicense(ctx, licenseInfo, licenseInfoTenant) {
     licenseInfoTenant.mode |= c_LM.Developer;
     errors.push('developer');
   }
-  //can not turn off
-  if (licenseInfo.light && !licenseInfoTenant.light) {
-    licenseInfoTenant.light = licenseInfo.light;
-    errors.push('light');
-  }
   //can not turn on
-  let flags = ['plugins', 'branding', 'customization'];
+  let flags = ['branding', 'customization'];
   flags.forEach((flag) => {
     if (!licenseInfo[flag] && licenseInfoTenant[flag]) {
       licenseInfoTenant[flag] = licenseInfo[flag];
@@ -321,12 +316,6 @@ async function readLicenseTenant(ctx, licenseFile, baseVerifiedLicense) {
     if (true === oLicense['developer']) {
       res.mode |= c_LM.Developer;
     }
-    if (oLicense.hasOwnProperty('light')) {
-      res.light = (true === oLicense['light'] || 'true' === oLicense['light'] || 'True' === oLicense['light']); // Someone who likes to put json string instead of bool
-    }
-    if (oLicense.hasOwnProperty('plugins')) {
-      res.plugins = true === oLicense['plugins'];
-    }
     if (oLicense.hasOwnProperty('branding')) {
       res.branding = (true === oLicense['branding'] || 'true' === oLicense['branding'] || 'True' === oLicense['branding']); // Someone who likes to put json string instead of bool
     }

diff --git a/Common/sources/utils.js b/Common/sources/utils.js
@@ -1140,11 +1140,9 @@ exports.convertLicenseInfoToFileParams = function(licenseInfo) {
   } else {
     license.mode = '';
   }
-  license.light = licenseInfo.light;
   license.branding = licenseInfo.branding;
   license.customization = licenseInfo.customization;
   license.advanced_api = licenseInfo.advancedApi;
-  license.plugins = licenseInfo.plugins;
   license.connections = licenseInfo.connections;
   license.connections_view = licenseInfo.connectionsView;
   license.users_count = licenseInfo.usersCount;

diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
@@ -166,7 +166,6 @@ let connections = []; // Active connections
 let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
 let pubsub;
 let queue;
-let f = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
 let shutdownFlag = false;
 let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
 
@@ -3416,7 +3415,7 @@ exports.install = function(server, callbackFunction) {
 				sendData(ctx, conn, {
 					type: 'license', license: {
 						type: licenseInfo.type,
-						light: licenseInfo.light,
+						light: false,//todo remove in sdk
 						mode: licenseInfo.mode,
 						rights: rights,
 						buildVersion: commonDefines.buildVersion,
@@ -3426,8 +3425,7 @@ exports.install = function(server, callbackFunction) {
 						liveViewerSupport: utils.isLiveViewerSupport(licenseInfo),
 						branding: licenseInfo.branding,
 						customization: licenseInfo.customization,
-						advancedApi: licenseInfo.advancedApi,
-						plugins: licenseInfo.plugins
+						advancedApi: licenseInfo.advancedApi
 					}
 				});
 				ctx.logger.info('_checkLicense end');