Allow passing in a promise that resolves with the connection token (microsoft#158586)

Author: alexdima

src/vs/platform/remote/browser/remoteAuthorityResolverService.ts

@@ -18,13 +18,13 @@ export class RemoteAuthorityResolverService extends Disposable implements IRemot
 	private readonly _onDidChangeConnectionData = this._register(new Emitter<void>());
 	public readonly onDidChangeConnectionData = this._onDidChangeConnectionData.event;
 
-	private readonly _cache: Map<string, ResolverResult>;
-	private readonly _connectionToken: string | undefined;
+	private readonly _promiseCache = new Map<string, Promise<ResolverResult>>();
+	private readonly _cache = new Map<string, ResolverResult>();
+	private readonly _connectionToken: Promise<string> | string | undefined;
 	private readonly _connectionTokens: Map<string, string>;
 
-	constructor(@IProductService productService: IProductService, connectionToken: string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined) {
+	constructor(@IProductService productService: IProductService, connectionToken: Promise<string> | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined) {
 		super();
-		this._cache = new Map<string, ResolverResult>();
 		this._connectionToken = connectionToken;
 		this._connectionTokens = new Map<string, string>();
 		if (resourceUriProvider) {
@@ -34,13 +34,12 @@ export class RemoteAuthorityResolverService extends Disposable implements IRemot
 	}
 
 	async resolveAuthority(authority: string): Promise<ResolverResult> {
-		if (!this._cache.has(authority)) {
-			const result = this._doResolveAuthority(authority);
-			RemoteAuthorities.set(authority, result.authority.host, result.authority.port);
-			this._cache.set(authority, result);
-			this._onDidChangeConnectionData.fire();
+		let result = this._promiseCache.get(authority);
+		if (!result) {
+			result = this._doResolveAuthority(authority);
+			this._promiseCache.set(authority, result);
 		}
-		return this._cache.get(authority)!;
+		return result;
 	}
 
 	async getCanonicalURI(uri: URI): Promise<URI> {
@@ -52,19 +51,23 @@ export class RemoteAuthorityResolverService extends Disposable implements IRemot
 			return null;
 		}
 		const resolverResult = this._cache.get(authority)!;
-		const connectionToken = this._connectionTokens.get(authority) || this._connectionToken;
+		const connectionToken = this._connectionTokens.get(authority) || resolverResult.authority.connectionToken;
 		return {
 			host: resolverResult.authority.host,
 			port: resolverResult.authority.port,
 			connectionToken: connectionToken
 		};
 	}
 
-	private _doResolveAuthority(authority: string): ResolverResult {
-		const connectionToken = this._connectionTokens.get(authority) || this._connectionToken;
+	private async _doResolveAuthority(authority: string): Promise<ResolverResult> {
+		const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken);
 		const defaultPort = (/^https:/.test(window.location.href) ? 443 : 80);
 		const { host, port } = parseAuthorityWithOptionalPort(authority, defaultPort);
-		return { authority: { authority, host: host, port: port, connectionToken } };
+		const result: ResolverResult = { authority: { authority, host: host, port: port, connectionToken } };
+		RemoteAuthorities.set(authority, result.authority.host, result.authority.port);
+		this._cache.set(authority, result);
+		this._onDidChangeConnectionData.fire();
+		return result;
 	}
 
 	_clearResolvedAuthority(authority: string): void {

src/vs/platform/sign/browser/signService.ts

@@ -9,11 +9,9 @@ export class SignService implements ISignService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _tkn: string | null;
-
-	constructor(token: string | undefined) {
-		this._tkn = token || null;
-	}
+	constructor(
+		private readonly _token: Promise<string> | string | undefined
+	) { }
 
 	async createNewMessage(value: string): Promise<IMessage> {
 		return { id: '', data: value };
@@ -22,6 +20,7 @@ export class SignService implements ISignService {
 		return true;
 	}
 	async sign(value: string): Promise<string> {
-		return this._tkn || '';
+		const token = await Promise.resolve(this._token);
+		return token || '';
 	}
 }

src/vs/workbench/browser/web.api.ts

@@ -137,7 +137,7 @@ export interface IWorkbenchConstructionOptions {
 	/**
 	 * The connection token to send to the server.
 	 */
-	readonly connectionToken?: string;
+	readonly connectionToken?: string | Promise<string>;
 
 	/**
 	 * An endpoint to serve iframe content ("webview") from. This is required