reinstate github-auth parameter that was accidentally removed (#191862

)

Fixes #191861

src/vs/code/browser/workbench/workbench.ts

@@ -17,6 +17,7 @@ import product from 'vs/platform/product/common/product';
 import { ISecretStorageProvider } from 'vs/platform/secrets/common/secrets';
 import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window';
 import type { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api';
+import { AuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
 import type { IWorkspace, IWorkspaceProvider } from 'vs/workbench/services/host/browser/browserHostService';
 import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
 import { create } from 'vs/workbench/workbench.web.main';
@@ -176,19 +177,56 @@ export class LocalStorageSecretStorageProvider implements ISecretStorageProvider
 	) { }
 
 	private async load(): Promise<Record<string, string>> {
+		const record = this.loadAuthSessionFromElement();
 		// Get the secrets from localStorage
 		const encrypted = window.localStorage.getItem(this._storageKey);
 		if (encrypted) {
 			try {
-				return JSON.parse(await this.crypto.unseal(encrypted));
+				const decrypted = JSON.parse(await this.crypto.unseal(encrypted));
+				return { ...record, ...decrypted };
 			} catch (err) {
 				// TODO: send telemetry
 				console.error('Failed to decrypt secrets from localStorage', err);
 				window.localStorage.removeItem(this._storageKey);
 			}
 		}
 
-		return {};
+		return record;
+	}
+
+	private loadAuthSessionFromElement(): Record<string, string> {
+		let authSessionInfo: (AuthenticationSessionInfo & { scopes: string[][] }) | undefined;
+		const authSessionElement = document.getElementById('vscode-workbench-auth-session');
+		const authSessionElementAttribute = authSessionElement ? authSessionElement.getAttribute('data-settings') : undefined;
+		if (authSessionElementAttribute) {
+			try {
+				authSessionInfo = JSON.parse(authSessionElementAttribute);
+			} catch (error) { /* Invalid session is passed. Ignore. */ }
+		}
+
+		if (!authSessionInfo) {
+			return {};
+		}
+
+		const record: Record<string, string> = {};
+
+		// Settings Sync Entry
+		record[`${product.urlProtocol}.loginAccount`] = JSON.stringify(authSessionInfo);
+
+		// Auth extension Entry
+		if (authSessionInfo.providerId !== 'github') {
+			console.error(`Unexpected auth provider: ${authSessionInfo.providerId}. Expected 'github'.`);
+			return record;
+		}
+
+		const authAccount = JSON.stringify({ extensionId: 'vscode.github-authentication', key: 'github.auth' });
+		record[authAccount] = JSON.stringify(authSessionInfo.scopes.map(scopes => ({
+			id: authSessionInfo!.id,
+			scopes,
+			accessToken: authSessionInfo!.accessToken
+		})));
+
+		return record;
 	}
 
 	async get(key: string): Promise<string | undefined> {