remove connectToCloud

RocketChat · Sep 13, 2023 · 27a98ab · 27a98ab
1 parent fb1bbf7
commit 27a98ab
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 151 deletions.
diff --git a/apps/meteor/app/cloud/server/functions/checkUserHasCloudLogin.ts b/apps/meteor/app/cloud/server/functions/checkUserHasCloudLogin.ts
@@ -3,9 +3,9 @@ import { Users } from '@rocket.chat/models';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 
 export async function checkUserHasCloudLogin(userId: string) {
-	const { connectToCloud, workspaceRegistered } = await retrieveRegistrationStatus();
+	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
-	if (!connectToCloud || !workspaceRegistered) {
+	if (!workspaceRegistered) {
 		return false;
 	}
 

diff --git a/apps/meteor/app/cloud/server/functions/connectWorkspace.ts b/apps/meteor/app/cloud/server/functions/connectWorkspace.ts
@@ -1,24 +1,11 @@
-import { Settings } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
 import { getRedirectUri } from './getRedirectUri';
-import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { saveRegistrationData } from './saveRegistrationData';
 
 export async function connectWorkspace(token: string) {
-	const { connectToCloud } = await retrieveRegistrationStatus();
-	if (!connectToCloud) {
-		await Settings.updateValueById('Register_Server', true);
-	}
-
-	// shouldn't get here due to checking this on the method
-	// but this is just to double check
-	if (!token) {
-		return new Error('Invalid token; the registration token is required.');
-	}
-
 	const redirectUri = getRedirectUri();
 
 	const regInfo = {

diff --git a/apps/meteor/app/cloud/server/functions/disconnectWorkspace.ts b/apps/meteor/app/cloud/server/functions/disconnectWorkspace.ts
@@ -1,14 +1,8 @@
 import { Settings } from '@rocket.chat/models';
 
-import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { syncWorkspace } from './syncWorkspace';
 
 export async function disconnectWorkspace() {
-	const { connectToCloud } = await retrieveRegistrationStatus();
-	if (!connectToCloud) {
-		return true;
-	}
-
 	await Settings.updateValueById('Register_Server', false);
 
 	await syncWorkspace();

diff --git a/apps/meteor/app/cloud/server/functions/getUserCloudAccessToken.ts b/apps/meteor/app/cloud/server/functions/getUserCloudAccessToken.ts
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
@@ -11,9 +11,9 @@ import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
  * @returns string
  */
 export async function getWorkspaceAccessToken(forceNew = false, scope = '', save = true): Promise<string> {
-	const { connectToCloud, workspaceRegistered } = await retrieveRegistrationStatus();
+	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
-	if (!connectToCloud || !workspaceRegistered) {
+	if (!workspaceRegistered) {
 		return '';
 	}
 

diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
@@ -8,11 +8,11 @@ import { removeWorkspaceRegistrationInfo } from './removeWorkspaceRegistrationIn
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 
 export async function getWorkspaceAccessTokenWithScope(scope = '') {
-	const { connectToCloud, workspaceRegistered } = await retrieveRegistrationStatus();
+	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
 	const tokenResponse = { token: '', expiresAt: new Date() };
 
-	if (!connectToCloud || !workspaceRegistered) {
+	if (!workspaceRegistered) {
 		return tokenResponse;
 	}
 

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

diff --git a/apps/meteor/app/cloud/server/functions/retrieveRegistrationStatus.ts b/apps/meteor/app/cloud/server/functions/retrieveRegistrationStatus.ts
@@ -3,15 +3,13 @@ import { Users } from '@rocket.chat/models';
 import { settings } from '../../../settings/server';
 
 export async function retrieveRegistrationStatus(): Promise<{
-	connectToCloud: boolean;
 	workspaceRegistered: boolean;
 	workspaceId: string;
 	uniqueId: string;
 	token: string;
 	email: string;
 }> {
 	const info = {
-		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
@@ -8,8 +8,8 @@ import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { syncWorkspace } from './syncWorkspace';
 
 export async function startRegisterWorkspace(resend = false) {
-	const { workspaceRegistered, connectToCloud } = await retrieveRegistrationStatus();
-	if ((workspaceRegistered && connectToCloud) || process.env.TEST_MODE) {
+	const { workspaceRegistered } = await retrieveRegistrationStatus();
+	if (workspaceRegistered || process.env.TEST_MODE) {
 		await syncWorkspace();
 
 		return true;

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
@@ -8,6 +8,7 @@ export async function syncWorkspace() {
 		await syncCloudData();
 		await getWorkspaceLicense();
 	} catch (error) {
+		console.error(error);
 		if (error instanceof CloudWorkspaceAccessTokenError) {
 			// TODO: Remove License if there is no access token
 		}

diff --git a/apps/meteor/app/cloud/server/functions/userLogout.ts b/apps/meteor/app/cloud/server/functions/userLogout.ts
@@ -7,9 +7,9 @@ import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { userLoggedOut } from './userLoggedOut';
 
 export async function userLogout(userId: string): Promise<string | boolean> {
-	const { connectToCloud, workspaceRegistered } = await retrieveRegistrationStatus();
+	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
-	if (!connectToCloud || !workspaceRegistered) {
+	if (!workspaceRegistered) {
 		return '';
 	}
 

diff --git a/apps/meteor/app/cloud/server/methods.ts b/apps/meteor/app/cloud/server/methods.ts
@@ -19,7 +19,6 @@ declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
 		'cloud:checkRegisterStatus': () => {
-			connectToCloud: boolean;
 			workspaceRegistered: boolean;
 			workspaceId: string;
 			uniqueId: string;

diff --git a/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx b/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx
@@ -16,7 +16,7 @@ const RegisterWorkspace = () => {
 
 	const { data: registrationStatusData, isLoading, isError, refetch } = useRegistrationStatus();
 	const isWorkspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;
-	const isConnectedToCloud = registrationStatusData?.registrationStatus?.connectToCloud ?? false;
+	const isConnectedToCloud = true;
 
 	if (isLoading || isError) {
 		return null;
@@ -27,9 +27,10 @@ const RegisterWorkspace = () => {
 			setModal(null);
 			refetch();
 		};
-		if (isWorkspaceRegistered) {
-			setModal(<ConnectWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
-		} else setModal(<RegisterWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
+		// if (isWorkspaceRegistered) {
+		// 	setModal(<ConnectWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
+		// } else
+		setModal(<RegisterWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
 	};
 
 	const handleManualWorkspaceRegistrationButton = (): void => {