Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 15:01:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable MSAL for now (#235048)

Browse Source 
Because of late breaking issues:

* https://github.com/microsoft/vscode/issues/234932
* https://github.com/microsoft/vscode/issues/234954

This also comments out the `_setupRefresh` logic since that is causing the high CPU load. I'd like to see what happens when we don't do this behavior.
This commit is contained in:
Tyler James Leonhardt
2024-12-02 17:39:32 -08:00
committed by GitHub
parent 0e9d949869
commit c0c6b07185
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
View File

@@ -15,7 +15,7 @@ import { ScopedAccountAccess } from '../common/accountAccess';
export class CachedPublicClientApplication implements ICachedPublicClientApplication {
private _pca: PublicClientApplication;
private _sequencer = new Sequencer();
private readonly _refreshDelayer = new DelayerByKey<AuthenticationResult>();
// private readonly _refreshDelayer = new DelayerByKey<AuthenticationResult>();
private _accounts: AccountInfo[] = [];
private readonly _disposable: Disposable;
@@ -92,7 +92,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] starting...`);
const result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(request));
this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got result`);
this._setupRefresh(result);
// this._setupRefresh(result);
if (result.account && !result.fromCache && this._verifyIfUsingBroker(result)) {
this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] firing event due to change`);
this._onDidAccountsChangeEmitter.fire({ added: [], changed: [result.account], deleted: [] });
@@ -114,7 +114,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
1000 * 60 * 5
)
);
this._setupRefresh(result);
// this._setupRefresh(result);
if (this._isBrokerAvailable) {
await this._accountAccess.setAllowedAccess(result.account!, true);
}
@@ -131,7 +131,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
this._logger.debug(`[acquireTokenByRefreshToken] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}]`);
const result = await this._sequencer.queue(() => this._pca.acquireTokenByRefreshToken(request));
if (result) {
this._setupRefresh(result);
// this._setupRefresh(result);
if (this._isBrokerAvailable && result.account) {
await this._accountAccess.setAllowedAccess(result.account, true);
}
@@ -202,23 +202,23 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update complete`);
}
private _setupRefresh(result: AuthenticationResult) {
const on = result.refreshOn || result.expiresOn;
if (!result.account || !on) {
return;
}
// private _setupRefresh(result: AuthenticationResult) {
// const on = result.refreshOn || result.expiresOn;
// if (!result.account || !on) {
// return;
// }
const account = result.account;
const scopes = result.scopes;
const timeToRefresh = on.getTime() - Date.now() - 5 * 60 * 1000; // 5 minutes before expiry
const key = JSON.stringify({ accountId: account.homeAccountId, scopes });
this._logger.debug(`[_setupRefresh] [${this._clientId}] [${this._authority}] [${scopes.join(' ')}] [${account.username}] timeToRefresh: ${timeToRefresh}`);
this._refreshDelayer.trigger(
key,
() => this.acquireTokenSilent({ account, scopes, redirectUri: 'https://vscode.dev/redirect', forceRefresh: true }),
timeToRefresh > 0 ? timeToRefresh : 0
);
}
// const account = result.account;
// const scopes = result.scopes;
// const timeToRefresh = on.getTime() - Date.now() - 5 * 60 * 1000; // 5 minutes before expiry
// const key = JSON.stringify({ accountId: account.homeAccountId, scopes });
// this._logger.debug(`[_setupRefresh] [${this._clientId}] [${this._authority}] [${scopes.join(' ')}] [${account.username}] timeToRefresh: ${timeToRefresh}`);
// this._refreshDelayer.trigger(
// key,
// () => this.acquireTokenSilent({ account, scopes, redirectUri: 'https://vscode.dev/redirect', forceRefresh: true }),
// timeToRefresh > 0 ? timeToRefresh : 0
// );
// }
}
export class Sequencer {
@@ -230,16 +230,16 @@ export class Sequencer {
}
}
class DelayerByKey<T> {
private _delayers = new Map<string, Delayer<T>>();
// class DelayerByKey<T> {
// private _delayers = new Map<string, Delayer<T>>();
trigger(key: string, fn: () => Promise<T>, delay: number): Promise<T> {
let delayer = this._delayers.get(key);
if (!delayer) {
delayer = new Delayer<T>(delay);
this._delayers.set(key, delayer);
}
// trigger(key: string, fn: () => Promise<T>, delay: number): Promise<T> {
// let delayer = this._delayers.get(key);
// if (!delayer) {
// delayer = new Delayer<T>(delay);
// this._delayers.set(key, delayer);
// }
return delayer.trigger(fn, delay);
}
}
// return delayer.trigger(fn, delay);
// }
// }