ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-04 17:23:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode dbe62be3266ffb6772a7f3db0bf61d63f4aa7f65 (#9337)

Browse Source
This commit is contained in:
Anthony Dresser
2020-02-26 00:23:48 -08:00
committed by GitHub
parent d2892ff78b
commit 067fcc8dfb
42 changed files with 384 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/vscode-account/src/AADHelper.ts
View File

@@ -295,8 +295,8 @@ export class AzureActiveDirectoryService {
private getCallbackEnvironment(callbackUri: vscode.Uri): string {
switch (callbackUri.authority) {
case 'online.visualstudio.com,':
return 'vso';
case 'online.visualstudio.com':
return 'vso,';
case 'online-ppe.core.vsengsaas.visualstudio.com':
return 'vsoppe,';
case 'online.dev.core.vsengsaas.visualstudio.com':
@@ -397,7 +397,7 @@ export class AzureActiveDirectoryService {
const claims = this.getTokenClaims(json.access_token);
return {
expiresIn: json.expires_in,
expiresAt: Date.now() + json.expires_in * 1000,
expiresAt: json.expires_in ? Date.now() + json.expires_in * 1000 : undefined,
accessToken: json.access_token,
refreshToken: json.refresh_token,
scope,