Remove local app logic (#97)

Author: jeanp413

package.json

@@ -34,7 +34,6 @@
 	"activationEvents": [
 		"onResolveRemoteAuthority:ssh-remote",
 		"onCommand:gitpod.exportLogs",
-		"onCommand:gitpod.api.autoTunnel",
 		"onCommand:gitpod.installLocalExtensions",
 		"onAuthenticationRequest:gitpod",
 		"onUri",
@@ -57,12 +56,6 @@
 						"default": "https://gitpod.io/",
 						"scope": "application"
 					},
-					"gitpod.remote.useLocalApp": {
-						"type": "boolean",
-						"description": "Use the local companion app to connect to a remote workspace.\nWarning: Connecting to a remote workspace using local companion app will be removed in the near future.",
-						"default": false,
-						"scope": "application"
-					},
 					"gitpod.lsshExtensionIpcPort": {
 						"type": "number",
 						"description": "The port to use for the local SSH ipc server.",

src/commands/workspaces.ts

@@ -350,7 +350,7 @@ export class ConnectInCurrentWindowCommand implements Command {
 
 	private async initializeLocalSSH(workspaceId: string) {
 		try {
-			await this.remoteService.updateRemoteSSHConfig(true, undefined);
+			await this.remoteService.updateRemoteSSHConfig();
 			await Promise.all([
 				this.remoteService.setupSSHProxy(),
 				this.remoteService.startLocalSSHServiceServer()

src/configuration.ts

@@ -13,10 +13,6 @@ function getGitpodHost() {
     return vscode.workspace.getConfiguration('gitpod').get<string>('host') || 'https://gitpod.io/';
 }
 
-function getUseLocalApp() {
-    return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp') || false;
-}
-
 function getLocalSshExtensionIpcPort() {
     let defaultPort = 43025;
     if (vscode.env.appName.includes('Insiders')) {
@@ -31,7 +27,6 @@ function getSSHProxyLogLevel() {
 
 export const Configuration = {
     getGitpodHost,
-    getUseLocalApp,
     getLocalSshExtensionIpcPort,
     getSSHProxyLogLevel
 };

src/experiments.ts

@@ -13,14 +13,13 @@ import { ILogService } from './services/logService';
 import { IHostService } from './services/hostService';
 import { Disposable } from './common/dispose';
 
-const EXPERIMENTAL_SETTINGS = [
-    'gitpod.remote.useLocalApp',
+const EXPERIMENTAL_SETTINGS: string[] = [
     // 'gitpod.remote.useLocalSSHServer',
 ];
 
 export interface IExperimentsService {
     getUseLocalSSHProxy(): Promise<boolean>;
-    getUsePublicAPI(gitpodHost: string): Promise<boolean>
+    getUsePublicAPI(gitpodHost: string): Promise<boolean>;
 }
 
 export class ExperimentalSettings extends Disposable implements IExperimentsService {

src/extension.ts

@@ -118,6 +118,8 @@ export async function activate(context: vscode.ExtensionContext) {
 		commandManager.register(new SignInCommand(sessionService));
 		commandManager.register(new InstallLocalExtensionsOnRemoteCommand(remoteService));
 		commandManager.register(new ExportLogsCommand(context, context.logUri, notificationService, telemetryService, logger, hostService));
+		// Backwards compatibility with older gitpod-remote extensions
+		commandManager.register({ id: 'gitpod.api.autoTunnel', execute: () => {} });
 
 		if (!context.globalState.get<boolean>(FIRST_INSTALL_KEY, false)) {
 			context.globalState.update(FIRST_INSTALL_KEY, true);
@@ -127,8 +129,6 @@ export async function activate(context: vscode.ExtensionContext) {
 		// Because auth provider implementation is in the same extension, we need to wait for it to activate first
 		sessionService.didFirstLoad.then(async () => {
 			if (remoteConnectionInfo) {
-				commandManager.register({ id: 'gitpod.api.autoTunnel', execute: () => remoteConnector.autoTunnelCommand });
-
 				remoteSession = new RemoteSession(remoteConnectionInfo.connectionInfo, context, remoteService, hostService, sessionService, experiments, logger!, telemetryService!, notificationService);
 				await remoteSession.initialize();
 			} else if (sessionService.isSignedIn()) {