Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 04:53:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #109609, auth dialog can't be shown again after cancel

Browse Source
This commit is contained in:
Rachel Macfarlane
2020-10-28 09:37:56 -07:00
parent 8ec3a3a9b5
commit 9a9de2ad8b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vs/workbench/api/common/extHostAuthentication.ts
View File

@@ -73,6 +73,17 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
inFlightRequests.push(inFlightRequest);
this._inFlightRequests.set(extensionId, inFlightRequests);
try {
await session;
} finally {
const requestIndex = inFlightRequests.findIndex(request => request.scopes === sortedScopes);
if (requestIndex > -1) {
inFlightRequests.splice(requestIndex);
this._inFlightRequests.set(extensionId, inFlightRequests);
}
}
return session;
}
}
@@ -117,12 +128,6 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
}
}
const inFlightRequests = this._inFlightRequests.get(extensionId) || [];
const requestIndex = inFlightRequests.findIndex(request => request.scopes === scopes.sort().join(' '));
if (requestIndex > -1) {
inFlightRequests.splice(requestIndex);
this._inFlightRequests.set(extensionId, inFlightRequests);
}
return session;
}