From 13ecb9da57ef3ecc684a6c5d1365f691aa9f8be3 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 18 Sep 2023 11:52:59 -0300
Subject: [PATCH] Troubleshoot_Disable_Workspace_Sync

---
 apps/meteor/app/cloud/server/index.ts         | 26 +++++--------------
 .../rocketchat-i18n/i18n/en.i18n.json         |  2 --
 apps/meteor/server/settings/troubleshoot.ts   |  5 ----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/apps/meteor/app/cloud/server/index.ts b/apps/meteor/app/cloud/server/index.ts
index 4bb1f634978e2..c7e783d4d5aa4 100644
--- a/apps/meteor/app/cloud/server/index.ts
+++ b/apps/meteor/app/cloud/server/index.ts
@@ -2,7 +2,6 @@ import { cronJobs } from '@rocket.chat/cron';
 import { Meteor } from 'meteor/meteor';
 
 import { SystemLogger } from '../../../server/lib/logger/system';
-import { settings } from '../../settings/server';
 import { connectWorkspace } from './functions/connectWorkspace';
 import { getWorkspaceAccessToken } from './functions/getWorkspaceAccessToken';
 import { getWorkspaceAccessTokenWithScope } from './functions/getWorkspaceAccessTokenWithScope';
@@ -13,24 +12,6 @@ import './methods';
 const licenseCronName = 'Cloud Workspace Sync';
 
 Meteor.startup(async () => {
-	// run token/license sync if registered
-	let TroubleshootDisableWorkspaceSync: boolean;
-	settings.watch<boolean>('Troubleshoot_Disable_Workspace_Sync', async (value) => {
-		if (TroubleshootDisableWorkspaceSync === value) {
-			return;
-		}
-		TroubleshootDisableWorkspaceSync = value;
-
-		if (value) {
-			return cronJobs.remove(licenseCronName);
-		}
-
-		setImmediate(() => syncWorkspace());
-		await cronJobs.add(licenseCronName, '0 */12 * * *', async () => {
-			await syncWorkspace();
-		});
-	});
-
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
 	if (process.env.REG_TOKEN && process.env.REG_TOKEN !== '' && !workspaceRegistered) {
@@ -43,9 +24,14 @@ Meteor.startup(async () => {
 
 			console.log('Successfully registered with token provided by REG_TOKEN!');
 		} catch (e: any) {
-			SystemLogger.error('An error occured registering with token.', e.message);
+			SystemLogger.error('An error occurred registering with token.', e.message);
 		}
 	}
+
+	setImmediate(() => syncWorkspace());
+	await cronJobs.add(licenseCronName, '0 */12 * * *', async () => {
+		await syncWorkspace();
+	});
 });
 
 export { getWorkspaceAccessToken, getWorkspaceAccessTokenWithScope };
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 7e40f9f283a9a..c52640641a75b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -5174,8 +5174,6 @@
   "Troubleshoot_Disable_Presence_Broadcast_Alert": "This setting prevents all instances form sending the status changes of the users to their clients keeping all the users with their presence status from the first load!",
   "Troubleshoot_Disable_Sessions_Monitor": "Disable Sessions Monitor",
   "Troubleshoot_Disable_Sessions_Monitor_Alert": "This setting stops the processing of user sessions causing the statistics to stop working correctly!",
-  "Troubleshoot_Disable_Workspace_Sync": "Disable Workspace Sync",
-  "Troubleshoot_Disable_Workspace_Sync_Alert": "This setting stops the sync of this server with Rocket.Chat's cloud and may cause issues with marketplace and enteprise licenses!",
   "Troubleshoot_Disable_Teams_Mention": "Disable Teams mention",
   "Troubleshoot_Disable_Teams_Mention_Alert": "This setting disables the teams mention feature. User's won't be able to mention a Team by name in a message and get its members notified.",
   "True": "True",
diff --git a/apps/meteor/server/settings/troubleshoot.ts b/apps/meteor/server/settings/troubleshoot.ts
index a73cc2afd10f2..84dc2cffaba4a 100644
--- a/apps/meteor/server/settings/troubleshoot.ts
+++ b/apps/meteor/server/settings/troubleshoot.ts
@@ -36,11 +36,6 @@ export const createTroubleshootSettings = () =>
 			i18nDescription: 'Troubleshoot_Disable_Data_Exporter_Processor_Alert',
 		});
 
-		// await this.add('Troubleshoot_Disable_Workspace_Sync', false, {
-		// 	type: 'boolean',
-		// 	i18nDescription: 'Troubleshoot_Disable_Workspace_Sync_Alert',
-		// });
-
 		await this.add('Troubleshoot_Disable_Teams_Mention', false, {
 			type: 'boolean',
 			i18nDescription: 'Troubleshoot_Disable_Teams_Mention_Alert',