Check if gitpod host got updated or not in case of remote window

Author: jeanp413

src/remoteConnector.ts

@@ -669,7 +669,7 @@ export class RemoteConnector extends Disposable {
 		}
 
 		await this.sessionService.signIn(params.gitpodHost);
-		if (!this.sessionService.isSignedIn()) {
+		if (!this.sessionService.isSignedIn() || new URL(this.hostService.gitpodHost).host !== new URL(params.gitpodHost).host /* remote window case so host didn't update*/) {
 			return;
 		}
 

src/remoteSession.ts

@@ -253,10 +253,13 @@ export class RemoteSession extends Disposable {
 
 	private async showRevertGitpodHostDialog() {
 		const flow: UserFlowTelemetryProperties = { ...this.connectionInfo, flow: 'remote_session' };
-		const revert = 'Revert change';
-		const action = await this.notificationService.showErrorMessage(`Cannot change 'gitpod.host' setting while connected to a remote workspace`, { id: 'switch_gitpod_host_remote', flow, modal: true }, revert);
+		const revert: vscode.MessageItem = { title: 'Revert change' };
+		const close: vscode.MessageItem = { title: 'Close window', isCloseAffordance: true };
+		const action = await this.notificationService.showErrorMessage(`Cannot change 'gitpod.host' setting while connected to a remote workspace`, { id: 'switch_gitpod_host_remote', flow, modal: true }, revert, close);
 		if (action === revert) {
 			await this.hostService.changeHost(this.connectionInfo.gitpodHost, true);
+		} else if (action === close) {
+			vscode.commands.executeCommand('workbench.action.remote.close');
 		}
 	}