Fix microsoft#153526 (microsoft#153766)

Author: joyceerhl

src/vs/workbench/contrib/sessionSync/browser/sessionSync.contribution.ts

@@ -290,8 +290,9 @@ export class SessionSyncContribution extends Disposable implements IWorkbenchCon
 				}
 			}
 
-			this.logService.info(`Edit Sessions: Deleting edit session with ref ${ref} after successfully applying it to current workspace.`);
+			this.logService.info(`Edit Sessions: Deleting edit session with ref ${ref} after successfully applying it to current workspace...`);
 			await this.sessionSyncWorkbenchService.delete(ref);
+			this.logService.info(`Edit Sessions: Deleted edit session with ref ${ref}.`);
 		} catch (ex) {
 			this.logService.error('Edit Sessions: Failed to apply edit session, reason: ', (ex as Error).toString());
 			this.notificationService.error(localize('apply failed', "Failed to apply your edit session."));

src/vs/workbench/services/sessionSync/browser/sessionSyncWorkbenchService.ts

@@ -120,6 +120,9 @@ export class SessionSyncWorkbenchService extends Disposable implements ISessionS
 	}
 
 	private async initialize() {
+		if (this.initialized) {
+			return;
+		}
 		this.initialized = await this.doInitialize();
 		this.signedInContext.set(this.initialized);
 	}
@@ -152,9 +155,12 @@ export class SessionSyncWorkbenchService extends Disposable implements ISessionS
 		}
 
 		// If the user signed in previously and the session is still available, reuse that without prompting the user again
-		if (this.existingSessionId) {
+		const existingSessionId = this.existingSessionId;
+		if (existingSessionId) {
+			this.logService.trace(`Edit Sessions: Searching for existing authentication session with ID ${existingSessionId}`);
 			const existing = await this.getExistingSession();
 			if (existing !== undefined) {
+				this.logService.trace(`Edit Sessions: Found existing authentication session with ID ${existingSessionId}`);
 				this.#authenticationInfo = { sessionId: existing.session.id, token: existing.session.accessToken, providerId: existing.session.providerId };
 				this.storeClient.setAuthToken(this.#authenticationInfo.token, this.#authenticationInfo.providerId);
 				return true;
@@ -167,6 +173,7 @@ export class SessionSyncWorkbenchService extends Disposable implements ISessionS
 			this.#authenticationInfo = { sessionId: session.id, token: session.accessToken, providerId: session.providerId };
 			this.storeClient.setAuthToken(this.#authenticationInfo.token, this.#authenticationInfo.providerId);
 			this.existingSessionId = session.id;
+			this.logService.trace(`Edit Sessions: Saving authentication session preference for ID ${session.id}.`);
 			return true;
 		}