Add upn as backup for username

AzureAD · tnorling · Aug 17, 2020 · May 15, 2020 · May 15, 2020 · May 27, 2020
commit 5197bc466db7dd1f392db3a2a32d16bc7923681c
diff --git a/lib/msal-common/src/account/Account.ts b/lib/msal-common/src/account/Account.ts
@@ -41,7 +41,7 @@ export class Account {
     constructor(accountIdentifier: string, homeAccountIdentifier: string, idTokenClaims: IdTokenClaims, rawIdToken: string) {
         this.accountIdentifier = accountIdentifier;
         this.homeAccountIdentifier = homeAccountIdentifier;
-        this.userName = idTokenClaims.preferred_username;
+        this.userName = idTokenClaims.preferred_username || idTokenClaims.upn;
         this.name = idTokenClaims.name;
         // will be deprecated soon
         this.idToken = rawIdToken;

diff --git a/lib/msal-common/src/unifiedCache/entities/AccountEntity.ts b/lib/msal-common/src/unifiedCache/entities/AccountEntity.ts
@@ -101,7 +101,7 @@ export class AccountEntity {
                 ? idToken.claims.oid
                 : idToken.claims.sid;
             account.localAccountId = localAccountId;
-            account.username = idToken.claims.preferred_username;
+            account.username = idToken.claims.preferred_username || idToken.claims.upn;
             account.name = idToken.claims.name;
         }