remove reconnectCheck from syncWorkspace

RocketChat · Sep 13, 2023 · f19b6b6 · f19b6b6
1 parent 952fcde
commit f19b6b6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/apps/meteor/app/cloud/server/functions/disconnectWorkspace.ts b/apps/meteor/app/cloud/server/functions/disconnectWorkspace.ts
@@ -11,7 +11,7 @@ export async function disconnectWorkspace() {
 
 	await Settings.updateValueById('Register_Server', false);
 
-	await syncWorkspace(true);
+	await syncWorkspace();
 
 	return true;
 }
diff --git a/apps/meteor/app/cloud/server/functions/reconnectWorkspace.ts b/apps/meteor/app/cloud/server/functions/reconnectWorkspace.ts
@@ -11,7 +11,7 @@ export async function reconnectWorkspace() {
 
 	await Settings.updateValueById('Register_Server', true);
 
-	await syncWorkspace(true);
+	await syncWorkspace();
 
 	return true;
 }
diff --git a/apps/meteor/app/cloud/server/functions/retrieveRegistrationStatus.ts b/apps/meteor/app/cloud/server/functions/retrieveRegistrationStatus.ts
@@ -11,7 +11,7 @@ export async function retrieveRegistrationStatus(): Promise<{
 	email: string;
 }> {
 	const info = {
-		connectToCloud: settings.get<boolean>('Register_Server'),
+		connectToCloud: true || settings.get<boolean>('Register_Server'),
 		workspaceRegistered: !!settings.get('Cloud_Workspace_Client_Id') && !!settings.get('Cloud_Workspace_Client_Secret'),
 		workspaceId: settings.get<string>('Cloud_Workspace_Id'),
 		uniqueId: settings.get<string>('uniqueID'),

diff --git a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
@@ -10,7 +10,7 @@ import { syncWorkspace } from './syncWorkspace';
 export async function startRegisterWorkspace(resend = false) {
 	const { workspaceRegistered, connectToCloud } = await retrieveRegistrationStatus();
 	if ((workspaceRegistered && connectToCloud) || process.env.TEST_MODE) {
-		await syncWorkspace(true);
+		await syncWorkspace();
 
 		return true;
 	}

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace.ts
@@ -11,9 +11,9 @@ import { getWorkspaceLicense } from './getWorkspaceLicense';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { getCachedSupportedVersionsToken } from './supportedVersionsToken/supportedVersionsToken';
 
-export async function syncWorkspace(reconnectCheck = false) {
+export async function syncWorkspace() {
 	const { workspaceRegistered, connectToCloud } = await retrieveRegistrationStatus();
-	if (!workspaceRegistered || (!connectToCloud && !reconnectCheck)) {
+	if (!workspaceRegistered || !connectToCloud) {
 		return false;
 	}