remove connectToCloud

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;
 	}
 

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 = {

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();

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 '';
 	}
 

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;
 	}
 

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;
 	}
 

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'),

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;

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 '';
 	}
 

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;

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;
@@ -41,20 +40,20 @@ const RegisterWorkspace = () => {
 	};
 
 	const handleRegistrationTag = () => {
-		if (!isWorkspaceRegistered && !isConnectedToCloud) {
+		if (!isWorkspaceRegistered) {
 			return <Tag variant='secondary-danger'>{t('RegisterWorkspace_NotRegistered_Title')}</Tag>;
 		}
-		if (isWorkspaceRegistered && !isConnectedToCloud) {
+		if (isWorkspaceRegistered) {
 			return <Tag variant='secondary-danger'>{t('RegisterWorkspace_NotConnected_Title')}</Tag>;
 		}
 		return <Tag variant='primary'>{t('Workspace_registered')}</Tag>;
 	};
 
 	const handleCardsTitle = () => {
-		if (!isWorkspaceRegistered && !isConnectedToCloud) {
+		if (!isWorkspaceRegistered) {
 			return t('RegisterWorkspace_NotRegistered_Subtitle');
 		}
-		if (isWorkspaceRegistered && !isConnectedToCloud) {
+		if (isWorkspaceRegistered) {
 			return t('RegisterWorkspace_NotConnected_Subtitle');
 		}
 		return t('RegisterWorkspace_Registered_Description');
@@ -65,7 +64,6 @@ const RegisterWorkspace = () => {
 			<Page.Header title={t('Registration')}>
 				<RegisterWorkspaceMenu
 					isWorkspaceRegistered={isWorkspaceRegistered}
-					isConnectedToCloud={isConnectedToCloud}
 					onClick={handleRegisterWorkspaceClick}
 					onStatusChange={refetch}
 					onClickOfflineRegistration={handleManualWorkspaceRegistrationButton}

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>