add null protection.

scott.waye@hubse.net · bgavrilMS · commit eac383b549bb · 2026-01-27T18:19:37.000Z
diff --git a/src/client/Microsoft.Identity.Client/TokenResponseHelper.cs b/src/client/Microsoft.Identity.Client/TokenResponseHelper.cs
@@ -47,7 +47,7 @@ public static string GetUsernameFromIdToken(IdToken idToken)
         public static string GetHomeAccountId(AuthenticationRequestParameters requestParams, MsalTokenResponse response, IdToken idToken)
         {
             ClientInfo clientInfo = response.ClientInfo != null ? ClientInfo.CreateFromJson(response.ClientInfo) : null;
-            string homeAccountId = clientInfo?.ToAccountIdentifier() ?? idToken?.Subject ?? requestParams.Account.HomeAccountId.Identifier; // ADFS does not have client info, so we use subject
+            string homeAccountId = clientInfo?.ToAccountIdentifier() ?? idToken?.Subject ?? requestParams.Account?.HomeAccountId?.Identifier; // ADFS does not have client info, so we use subject
 
             if (homeAccountId == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static string GetUsernameFromIdToken(IdToken idToken)`
`47`	`47`	`public static string GetHomeAccountId(AuthenticationRequestParameters requestParams, MsalTokenResponse response, IdToken idToken)`
`48`	`48`	`{`
`49`	`49`	`ClientInfo clientInfo = response.ClientInfo != null ? ClientInfo.CreateFromJson(response.ClientInfo) : null;`
`50`		`- string homeAccountId = clientInfo?.ToAccountIdentifier() ?? idToken?.Subject ?? requestParams.Account.HomeAccountId.Identifier; // ADFS does not have client info, so we use subject`
	`50`	`+ string homeAccountId = clientInfo?.ToAccountIdentifier() ?? idToken?.Subject ?? requestParams.Account?.HomeAccountId?.Identifier; // ADFS does not have client info, so we use subject`
`51`	`51`
`52`	`52`	`if (homeAccountId == null)`
`53`	`53`	`{`