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

Special case personal accounts (#11538)

Browse Source 
* Special case personal accounts

* Add comments
This commit is contained in:
Amir Omidi
2020-07-27 15:36:20 -07:00
committed by GitHub
parent c7423efe14
commit 9d1587f008
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/azurecore/src/account-provider/auths/azureAuth.ts
View File

@@ -261,8 +261,16 @@ export abstract class AzureAuth implements vscode.Disposable {
} }
const tokenClaims: TokenClaims = this.getTokenClaims(accessTokenString); const tokenClaims: TokenClaims = this.getTokenClaims(accessTokenString);
let userKey: string;
const userKey = tokenClaims.home_oid ?? tokenClaims.oid ?? tokenClaims.unique_name ?? tokenClaims.sub; // Personal accounts don't have an oid when logging into the `common` tenant, but when logging into their home tenant they end up having an oid.
// This makes the key for the same account be different.
// We need to special case personal accounts.
if (tokenClaims.idp === 'live.com') { // Personal account
userKey = tokenClaims.unique_name ?? tokenClaims.email ?? tokenClaims.sub;
} else {
userKey = tokenClaims.home_oid ?? tokenClaims.oid ?? tokenClaims.unique_name ?? tokenClaims.email ?? tokenClaims.sub;
}
if (!userKey) { if (!userKey) {
const msg = localize('azure.noUniqueIdentifier', "The user had no unique identifier within AAD"); const msg = localize('azure.noUniqueIdentifier', "The user had no unique identifier within AAD");