Add Gitpod to Settings sync

Author: filiptronicek

extensions/gitpod/extension-browser.webpack.config.js

@@ -3,7 +3,7 @@
 	"displayName": "%displayName%",
 	"description": "%description%",
 	"publisher": "gitpod",
-	"version": "0.0.25",
+	"version": "0.0.28",
 	"license": "MIT",
 	"preview": true,
 	"icon": "resources/gitpod.png",
@@ -27,17 +27,39 @@
 	"activationEvents": [
 		"*",
 		"onCommand:gitpod.api.autoTunnel",
-		"onCommand:gitpod.api.auth"
+		"onCommand:gitpod.api.auth",
+		"onAuthenticationRequest:gitpod"
 	],
 	"contributes": {
+		"authentication": [
+			{
+				"label": "Gitpod",
+				"id": "gitpod"
+			}
+		],
+		"configuration": {
+			"title": "Settings sync",
+			"properties": {
+				"configurationSync.store": {
+					"type": "object"
+				}
+			}
+		},
 		"commands": [
 			{
-				"command": "gitpod.api.auth",
-				"title": "Authenthicate with GitPod"
+				"command": "gitpod.auth.remove",
+				"category": "Gitpod",
+				"enablement": "gitpod.addedSyncProvider",
+				"title": "Turn off Settings Sync"
+			},
+			{
+				"command": "gitpod.auth.add",
+				"category": "Gitpod",
+				"enablement": "!gitpod.addedSyncProvider",
+				"title": "Turn on Settings Sync"
 			}
 		]
 	},
-	"browser": "./out/browser/extension.js",
 	"main": "./out/extension.js",
 	"scripts": {
 		"compile": "gulp compile-extension:gitpod",
@@ -50,9 +72,11 @@
 		"@types/tmp": "^0.2.1"
 	},
 	"dependencies": {
+		"@gitpod/gitpod-protocol": "main",
 		"@gitpod/local-app-api-grpcweb": "main",
 		"@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
 		"node-fetch": "^2.6.1",
+		"pkce": "^1.0.0-beta2",
 		"tmp": "^0.2.1",
 		"vscode-nls": "^5.0.0"
 	},

extensions/gitpod/package.json

@@ -16,6 +16,9 @@ import * as tmp from 'tmp';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { grpc } from '@improbable-eng/grpc-web';
+import { URLSearchParams } from 'url';
+
+import { registerAuth, authCompletePath, resolveAuthenticationSession, gitpodScopes } from './registerAuth';
 
 interface SSHConnectionParams {
 	workspaceId: string
@@ -48,6 +51,8 @@ export async function activate(context: vscode.ExtensionContext) {
 		output.appendLine(`[${new Date().toLocaleString()}] ${value}`);
 	}
 
+	registerAuth(context, log);
+
 	// TODO(ak) commands to show logs and stop local apps
 	// TODO(ak) auto stop local apps if not used for 3 hours
 
@@ -376,12 +381,26 @@ export async function activate(context: vscode.ExtensionContext) {
 		}
 	}
 
-	const authCompletePath = '/auth-complete';
 	context.subscriptions.push(vscode.window.registerUriHandler({
 		handleUri: async uri => {
 			if (uri.path === authCompletePath) {
 				log('auth completed');
 				return;
+			} else if (uri.path === '/complete-gitpod-auth') {
+				// Get the token from the URI
+				const token = new URLSearchParams(uri.query).get('code');
+				if (token !== null) {
+					const authSession = await resolveAuthenticationSession([...gitpodScopes], token);
+					const storedValue: vscode.AuthenticationSession = authSession;
+					const existingSessionsJSON = await context.secrets.get('gitpod.authSessions') || '[]';
+					const existingSessions: vscode.AuthenticationSession[] = JSON.parse(existingSessionsJSON);
+					existingSessions.push(storedValue);
+					await context.secrets.store('gitpod.authSessions', JSON.stringify(existingSessions));
+					log('auth completed');
+				} else {
+					vscode.window.showErrorMessage('Auth failed: missing token');
+				}
+				return;
 			}
 			log('open workspace window: ' + uri.toString());
 			const params: SSHConnectionParams = JSON.parse(uri.query);