Fix auth validation (#6)

Author: jeanp413

src/authentication.ts

@@ -136,16 +136,15 @@ export default class GitpodAuthenticationProvider extends Disposable implements
 			const scopesStr = sortedScopes.join(' ');
 
 			let userInfo: { id: string; accountName: string } | undefined;
-			if (!session.account) {
-				try {
-					userInfo = await this._gitpodServer.getUserInfo(session.accessToken);
-					this._logger.info(`Verified session with the following scopes: ${scopesStr}`);
-				} catch (e) {
-					// Remove sessions that return unauthorized response
-					if (e.message === 'Unauthorized') {
-						return undefined;
-					}
+			try {
+				userInfo = await this._gitpodServer.getUserInfo(session.accessToken);
+				this._logger.info(`Verified session with the following scopes: ${scopesStr}`);
+			} catch (e) {
+				// Remove sessions that return unauthorized response
+				if (e.message === 'Unexpected server response: 401') {
+					return undefined;
 				}
+				this._logger.error(`Error while verifying session with the following scopes: ${scopesStr}`, e);
 			}
 
 			this._logger.trace(`Read the following session from the keychain with the following scopes: ${scopesStr}`);

src/internalApi.ts

@@ -6,7 +6,7 @@
 import { GitpodClient, GitpodServer, GitpodServiceImpl } from '@gitpod/gitpod-protocol/lib/gitpod-service';
 import { JsonRpcProxyFactory } from '@gitpod/gitpod-protocol/lib/messaging/proxy-factory';
 import { listen as doListen } from 'vscode-ws-jsonrpc';
-import WebSocket from 'ws';
+import WebSocket, { ErrorEvent } from 'ws';
 import ReconnectingWebSocket from 'reconnecting-websocket';
 import * as vscode from 'vscode';
 import Log from './common/logger';
@@ -22,9 +22,9 @@ export const unauthorizedErr = 'unauthorized';
 class GitpodServerApi extends vscode.Disposable {
 
 	readonly service: GitpodConnection;
-	private readonly webSocket: any;
-	private readonly onWillCloseEmitter = new vscode.EventEmitter<number | undefined>();
-	readonly onWillClose = this.onWillCloseEmitter.event;
+	private readonly webSocket: ReconnectingWebSocket;
+	private readonly onErrorEmitter = new vscode.EventEmitter<Error>();
+	readonly onError = this.onErrorEmitter.event;
 
 	constructor(accessToken: string, serviceUrl: string, private readonly logger: Log) {
 		super(() => this.internalDispose());
@@ -34,14 +34,12 @@ class GitpodServerApi extends vscode.Disposable {
 		const factory = new JsonRpcProxyFactory<GitpodServer>();
 		this.service = new GitpodServiceImpl<GitpodClient, GitpodServer>(factory.createProxy());
 
-		let retry = 1;
-		const maxRetries = 3;
 		const webSocket = new ReconnectingWebSocket(`${serviceUrl.replace('https', 'wss')}/api/v1`, undefined, {
 			maxReconnectionDelay: 10000,
 			minReconnectionDelay: 1000,
 			reconnectionDelayGrowFactor: 1.5,
 			connectionTimeout: 10000,
-			maxRetries: Infinity,
+			maxRetries: 3,
 			debug: false,
 			startClosed: false,
 			WebSocket: class extends WebSocket {
@@ -54,19 +52,10 @@ class GitpodServerApi extends vscode.Disposable {
 							'X-Client-Version': vscode.version
 						}
 					});
-					this.on('unexpected-response', (_, resp) => {
-						this.terminate();
-
-						// if mal-formed handshake request (unauthorized, forbidden) or client actions (redirect) are required then fail immediately
-						// otherwise try several times and fail, maybe temporarily unavailable, like server restart
-						if (retry++ >= maxRetries || (typeof resp.statusCode === 'number' && 300 <= resp.statusCode && resp.statusCode < 500)) {
-							webSocket.close(resp.statusCode);
-						}
-					});
 				}
 			}
 		});
-		webSocket.onerror = (e: any) => logger.error('internal server api: failed to open socket', e);
+		webSocket.onerror = (e: ErrorEvent) => this.onErrorEmitter.fire(e.error);
 
 		doListen({
 			webSocket: (webSocket as any),
@@ -76,31 +65,18 @@ class GitpodServerApi extends vscode.Disposable {
 		this.webSocket = webSocket;
 	}
 
-	private close(statusCode?: number): void {
-		this.onWillCloseEmitter.fire(statusCode);
-		try {
-			this.webSocket.close();
-		} catch (e) {
-			this.logger.error('internal server api: failed to close socket', e);
-		}
-	}
-
 	internalDispose() {
-		this.close();
-		this.onWillCloseEmitter.dispose();
+		this.webSocket.close();
+		this.onErrorEmitter.dispose();
 	}
 }
 
 export function withServerApi<T>(accessToken: string, serviceUrl: string, cb: (service: GitpodConnection) => Promise<T>, logger: Log): Promise<T> {
 	const api = new GitpodServerApi(accessToken, serviceUrl, logger);
 	return Promise.race([
 		cb(api.service),
-		new Promise<T>((_, reject) => api.onWillClose(statusCode => {
-			if (statusCode === 401) {
-				reject(new Error(unauthorizedErr));
-			} else {
-				reject(new Error('closed'));
-			}
+		new Promise<T>((_, reject) => api.onError(error => {
+			reject(error);
 		}))
 	]).finally(() => api.dispose());
 }