remove connectToCloud option

RocketChat · Sep 18, 2023 · f134dad · f134dad
1 parent b1c2a4c
commit f134dad
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 78 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,18 +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) {

diff --git a/apps/meteor/app/cloud/server/functions/disconnectWorkspace.ts b/apps/meteor/app/cloud/server/functions/disconnectWorkspace.ts
@@ -1,17 +1,4 @@
-import { Settings } from '@rocket.chat/models';
-
-import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
-import { syncWorkspace } from './syncWorkspace';
-
+/** @deprecated */
 export async function disconnectWorkspace() {
-	const { connectToCloud } = await retrieveRegistrationStatus();
-	if (!connectToCloud) {
-		return true;
-	}
-
-	await Settings.updateValueById('Register_Server', false);
-
-	await syncWorkspace(true);
-
-	return true;
+	throw new Error('Deprecated');
 }
diff --git a/apps/meteor/app/cloud/server/functions/getUserCloudAccessToken.ts b/apps/meteor/app/cloud/server/functions/getUserCloudAccessToken.ts
@@ -11,9 +11,9 @@ import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { userLoggedOut } from './userLoggedOut';
 
 export async function getUserCloudAccessToken(userId: string, forceNew = false, scope = '', save = true) {
-	const { connectToCloud, workspaceRegistered } = await retrieveRegistrationStatus();
+	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
-	if (!connectToCloud || !workspaceRegistered) {
+	if (!workspaceRegistered) {
 		return '';
 	}
 

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) {
-	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: 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(true);
 
 		return true;

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

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;
@@ -151,7 +150,9 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		return disconnectWorkspace();
+		await disconnectWorkspace();
+
+		return false;
 	},
 	async 'cloud:reconnectWorkspace'() {
 		const uid = Meteor.userId();

diff --git a/apps/meteor/client/startup/startup.ts b/apps/meteor/client/startup/startup.ts
@@ -72,11 +72,11 @@ Meteor.startup(() => {
 		}
 
 		const {
-			registrationStatus: { connectToCloud, workspaceRegistered },
+			registrationStatus: { workspaceRegistered },
 		} = await sdk.rest.get('/v1/cloud.registrationStatus');
 		c.stop();
 
-		if (connectToCloud === true && workspaceRegistered !== true) {
+		if (workspaceRegistered !== true) {
 			banners.open({
 				id: 'cloud-registration',
 				title: () => t('Cloud_registration_pending_title'),

diff --git a/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx b/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx
@@ -16,7 +16,6 @@ const RegisterWorkspace = () => {
 
 	const { data: registrationStatusData, isLoading, isError, refetch } = useRegistrationStatus();
 	const isWorkspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;
-	const isConnectedToCloud = registrationStatusData?.registrationStatus?.connectToCloud ?? false;
 
 	if (isLoading || isError) {
 		return null;
@@ -40,44 +39,27 @@ const RegisterWorkspace = () => {
 		setModal(<ManualWorkspaceRegistrationModal onClose={handleModalClose} />);
 	};
 
-	const handleRegistrationTag = () => {
-		if (!isWorkspaceRegistered && !isConnectedToCloud) {
-			return <Tag variant='secondary-danger'>{t('RegisterWorkspace_NotRegistered_Title')}</Tag>;
-		}
-		if (isWorkspaceRegistered && !isConnectedToCloud) {
-			return <Tag variant='secondary-danger'>{t('RegisterWorkspace_NotConnected_Title')}</Tag>;
-		}
-		return <Tag variant='primary'>{t('Workspace_registered')}</Tag>;
-	};
-
-	const handleCardsTitle = () => {
-		if (!isWorkspaceRegistered && !isConnectedToCloud) {
-			return t('RegisterWorkspace_NotRegistered_Subtitle');
-		}
-		if (isWorkspaceRegistered && !isConnectedToCloud) {
-			return t('RegisterWorkspace_NotConnected_Subtitle');
-		}
-		return t('RegisterWorkspace_Registered_Description');
-	};
-
 	return (
 		<Page background='tint'>
 			<Page.Header title={t('Registration')}>
 				<RegisterWorkspaceMenu
 					isWorkspaceRegistered={isWorkspaceRegistered}
-					isConnectedToCloud={isConnectedToCloud}
 					onClick={handleRegisterWorkspaceClick}
 					onStatusChange={refetch}
 					onClickOfflineRegistration={handleManualWorkspaceRegistrationButton}
 				/>
 			</Page.Header>
 
 			<Page.ScrollableContentWithShadow>
-				<Box display='flex'>{handleRegistrationTag()}</Box>
+				<Box display='flex'>
+					{!isWorkspaceRegistered && <Tag variant='secondary-danger'>{t('RegisterWorkspace_NotRegistered_Title')}</Tag>}
+					{isWorkspaceRegistered && <Tag variant='primary'>{t('Workspace_registered')}</Tag>}
+				</Box>
 
 				<Box pb={8}>
 					<Box fontSize='h3' fontWeight={700}>
-						{handleCardsTitle()}
+						{isWorkspaceRegistered && t('RegisterWorkspace_NotRegistered_Subtitle')}
+						{!isWorkspaceRegistered && t('RegisterWorkspace_Registered_Description')}
 					</Box>
 					<RegisterWorkspaceCards />
 				</Box>

diff --git a/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx b/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx
@@ -8,15 +8,13 @@ import RegisteredWorkspaceModal from '../modals/RegisteredWorkspaceModal';
 
 type RegisterWorkspaceMenuProps = {
 	isWorkspaceRegistered: boolean | string;
-	isConnectedToCloud: boolean | string;
 	onClick: () => void;
 	onClickOfflineRegistration: () => void;
 	onStatusChange?: () => void;
 };
 
 const RegisterWorkspaceMenu = ({
 	isWorkspaceRegistered,
-	isConnectedToCloud,
 	onClick,
 	onClickOfflineRegistration,
 	onStatusChange,
@@ -33,7 +31,7 @@ const RegisterWorkspaceMenu = ({
 
 	return (
 		<ButtonGroup>
-			{isWorkspaceRegistered && isConnectedToCloud && (
+			{isWorkspaceRegistered && (
 				<>
 					<Button icon='new-window' role='link' onClick={() => handleLinkClick(CLOUD_CONSOLE_URL)}>
 						{t('Cloud')}
@@ -44,11 +42,6 @@ const RegisterWorkspaceMenu = ({
 				</>
 			)}
 
-			{isWorkspaceRegistered && !isConnectedToCloud && (
-				<Button primary onClick={onClick}>
-					{t('ConnectWorkspace_Button')}
-				</Button>
-			)}
 			{!isWorkspaceRegistered && (
 				<>
 					<Button onClick={onClickOfflineRegistration}>{t('Cloud_Register_manually')}</Button>

diff --git a/packages/core-typings/src/ICloud.ts b/packages/core-typings/src/ICloud.ts
@@ -1,5 +1,4 @@
 export type CloudRegistrationStatus = {
-	connectToCloud: boolean;
 	email: string;
 	token: string;
 	uniqueId: string;