Handle ws errors

Author: filiptronicek

extensions/gitpod/src/auth.ts

@@ -137,6 +137,34 @@ const newConfig = {
 	}
 };
 
+/**
+ * Returns a promise which waits until the secret store `gitpod.authSessions` item changes.
+ * @returns a promise that resolves with newest added `vscode.AuthenticationSession`, or if no session is found, `null`
+ */
+async function waitForAuthenticationSession(context: vscode.ExtensionContext): Promise<vscode.AuthenticationSession | null> {
+	console.log('Waiting for the onchange event');
+
+	// Wait until a session is added to the context's secret store
+	const authPromise = promiseFromEvent(context.secrets.onDidChange, (changeEvent: vscode.SecretStorageChangeEvent, resolve): void => {
+		if (changeEvent.key === 'gitpod.authSessions') {
+			resolve(changeEvent.key);
+		}
+	});
+	const data: any = await authPromise.promise;
+
+	console.log(data);
+
+	console.log('Retrieving the session');
+
+	const currentSessions = await getValidSessions(context);
+	if (currentSessions.length > 0) {
+		return currentSessions[currentSessions.length - 1];
+	} else {
+		vscode.window.showErrorMessage('Couldn\'t find any auth sessions');
+		return null;
+	}
+}
+
 /**
  * Checks all stored auth sessions and returns all valid ones
  * @param context the VS Code extension context from which to get the sessions from
@@ -249,30 +277,40 @@ async function createApiWebSocket(accessToken: string): Promise<{ gitpodService:
  * @param scopes the scopes the authentication session must have
  * @returns a promise that resolves with the authentication session
  */
-export async function resolveAuthenticationSession(scopes: readonly string[], accessToken: string): Promise<vscode.AuthenticationSession> {
-	const { gitpodService, pendignWebSocket } = await createApiWebSocket(accessToken);
-	const user = await gitpodService.server.getLoggedInUser();
-	(await pendignWebSocket).close();
-	return {
-		id: 'gitpod.user',
-		account: {
-			label: user.name!,
-			id: user.id
-		},
-		scopes: scopes,
-		accessToken: accessToken
-	};
+export async function resolveAuthenticationSession(scopes: readonly string[], accessToken: string): Promise<vscode.AuthenticationSession | null> {
+	try {
+		const { gitpodService, pendignWebSocket } = await createApiWebSocket(accessToken);
+		const user = await gitpodService.server.getLoggedInUser();
+		(await pendignWebSocket).close();
+		return {
+			id: 'gitpod.user',
+			account: {
+				label: user.name!,
+				id: user.id
+			},
+			scopes: scopes,
+			accessToken: accessToken
+		};
+	} catch (e) {
+		vscode.window.showErrorMessage(`Couldn't connect: ${e}`);
+		return null;
+	}
 }
 
 /**
  * @returns all of the scopes accessible for `accessToken`
  */
 export async function checkScopes(accessToken: string): Promise<string[]> {
-	const { gitpodService, pendignWebSocket } = await createApiWebSocket(accessToken);
-	const hash = crypto.createHash('sha256').update(accessToken, 'utf8').digest('hex');
-	const scopes = await gitpodService.server.getGitpodTokenScopes(hash);
-	(await pendignWebSocket).close();
-	return scopes;
+	try {
+		const { gitpodService, pendignWebSocket } = await createApiWebSocket(accessToken);
+		const hash = crypto.createHash('sha256').update(accessToken, 'utf8').digest('hex');
+		const scopes = await gitpodService.server.getGitpodTokenScopes(hash);
+		(await pendignWebSocket).close();
+		return scopes;
+	} catch (e) {
+		vscode.window.showErrorMessage(`Couldn't connect: ${e}`);
+		return [];
+	}
 }
 
 /**
@@ -306,7 +344,7 @@ function createOauth2URL(options: { authorizationURI: string, clientID: string,
  * @param context the extension context
  */
 async function askToEnable(context: vscode.ExtensionContext): Promise<void> {
-	if (!(await context.globalState.get('gitpod.syncPopupShown'))) {
+	if (!(await context.secrets.get('gitpod.syncPopupShown'))) {
 		vscode.window.showInformationMessage('Would you like to use Settings Sync with Gitpod?', 'Yes', 'No')
 			.then(async selectedAction => {
 				await context.globalState.update('gitpod.syncPopupShown', 'true');
@@ -323,35 +361,6 @@ async function askToEnable(context: vscode.ExtensionContext): Promise<void> {
  * @param logger a function used for logging outputs
  */
 export function registerAuth(context: vscode.ExtensionContext, logger: (value: string) => void): void {
-	/**
-	 * Returns a promise which waits until the secret store `gitpod.authSessions` item changes.
-	 * @returns a promise that resolves with newest added `vscode.AuthenticationSession`, or if no session is found, `null`
-	 */
-	const waitForAuthenticationSession = async (): Promise<vscode.AuthenticationSession | null> => {
-		logger('Waiting for the onchange event');
-
-		// Wait until a session is added to the context's secret store
-		const authPromise = promiseFromEvent(context.secrets.onDidChange, (changeEvent: vscode.SecretStorageChangeEvent, resolve, reject): void => {
-			if (changeEvent.key !== 'gitpod.authSessions') {
-				reject('Cancelled');
-			} else {
-				resolve(changeEvent.key);
-			}
-		});
-		const data: any = await authPromise.promise;
-
-		logger(data.toString());
-
-		logger('Retrieving the session');
-
-		const currentSessions = await getAuthSessions(context);
-		if (currentSessions.length > 0) {
-			return currentSessions[currentSessions.length - 1];
-		} else {
-			vscode.window.showErrorMessage('Couldn\'t find any auth sessions');
-			return null;
-		}
-	};
 
 	const removeCmd = vscode.commands.registerCommand('gitpod.auth.remove', () => {
 		setSettingsSync(false);
@@ -394,7 +403,7 @@ export function registerAuth(context: vscode.ExtensionContext, logger: (value: s
 				logger('Copied auth URL');
 			}
 		}
-		return Promise.race([timeoutPromise, (await waitForAuthenticationSession())!]);
+		return Promise.race([timeoutPromise, (await waitForAuthenticationSession(context))!]);
 	}
 
 	const onDidChangeSessionsEmitter = new vscode.EventEmitter<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent>();

extensions/gitpod/src/extension.ts

@@ -390,9 +390,11 @@ export async function activate(context: vscode.ExtensionContext) {
 				const token = new URLSearchParams(uri.query).get('code');
 				if (token !== null) {
 					const authSession = await resolveAuthenticationSession([...gitpodScopes], token);
-					const storedValue: vscode.AuthenticationSession = authSession;
 					const existingSessions = await getAuthSessions(context);
-					existingSessions.push(storedValue);
+					if (authSession === null) {
+						return;
+					}
+					existingSessions.push(authSession);
 					await storeAuthSessions(existingSessions, context);
 					log('auth completed');
 				} else {