Skip to content

feat: use session token when syncing new profiles #249903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: use session token when syncing new profiles #249903

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec51f22
feat: use session token when syncing new profiles
rzhao271 May 23, 2025
07b1a8c
Merge branch 'main' into rzhao271/add-session-token
rzhao271 Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import { CancelablePromise, createCancelablePromise, timeout } from '../../../base/common/async.js';
import { VSBufferReadableStream } from '../../../base/common/buffer.js';
import { CancellationToken } from '../../../base/common/cancellation.js';
import { getErrorMessage, isCancellationError } from '../../../base/common/errors.js';
import { Emitter, Event } from '../../../base/common/event.js';
Expand All @@ -18,13 +19,12 @@ import { generateUuid } from '../../../base/common/uuid.js';
import { IHeaders, IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
import { IConfigurationService } from '../../configuration/common/configuration.js';
import { IEnvironmentService } from '../../environment/common/environment.js';
import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
import { IFileService } from '../../files/common/files.js';
import { IProductService } from '../../product/common/productService.js';
import { asJson, asText, asTextOrError, hasNoContent, IRequestService, isSuccess, isSuccess as isSuccessContext } from '../../request/common/request.js';
import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
import { HEADER_EXECUTION_ID, HEADER_OPERATION_ID, IAuthenticationProvider, IResourceRefHandle, IUserData, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncStore, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, ServerResource, SYNC_SERVICE_URL_TYPE, UserDataSyncErrorCode, UserDataSyncStoreError, UserDataSyncStoreType } from './userDataSync.js';
import { VSBufferReadableStream } from '../../../base/common/buffer.js';

const CONFIGURATION_SYNC_STORE_KEY = 'configurationSync.store';
const SYNC_PREVIOUS_STORE = 'sync.previous.store';
Expand Down Expand Up @@ -157,6 +157,9 @@ export class UserDataSyncStoreClient extends Disposable {
private _onTokenSucceed: Emitter<void> = this._register(new Emitter<void>());
readonly onTokenSucceed: Event<void> = this._onTokenSucceed.event;

private readonly SESSION_TOKEN_HEADER = 'x-ms-session-token';
private sessionToken: string | undefined;

private _donotMakeRequestsUntil: Date | undefined = undefined;
get donotMakeRequestsUntil() { return this._donotMakeRequestsUntil; }
private _onDidChangeDonotMakeRequestsUntil = this._register(new Emitter<void>());
Expand Down Expand Up @@ -263,6 +266,7 @@ export class UserDataSyncStoreClient extends Disposable {
if (!collectionId) {
throw new UserDataSyncStoreError('Server did not return the collection id', url, UserDataSyncErrorCode.NoCollection, context.res.statusCode, context.res.headers[HEADER_OPERATION_ID]);
}
this.sessionToken = context.res.headers[this.SESSION_TOKEN_HEADER] as string | undefined;
return collectionId;
}

Expand Down Expand Up @@ -343,6 +347,9 @@ export class UserDataSyncStoreClient extends Disposable {
if (oldValue) {
headers['If-None-Match'] = oldValue.ref;
}
if (this.sessionToken) {
headers[this.SESSION_TOKEN_HEADER] = this.sessionToken;
}

const context = await this.request(url, { type: 'GET', headers }, [304], CancellationToken.None);

Expand Down
Loading