undo changes, wait on all delegates (#2524)

westin-m · web-flow · commit 987aeb1ce6e9 · 2023-10-17T11:14:32.000-07:00
diff --git a/src/Microsoft.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilder.cs b/src/Microsoft.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilder.cs
@@ -165,7 +165,8 @@ internal static void WebAppCallsWebApiImplementation(
                        };
 
                        // Handling the token validated to get the client_info for cases where tenantId is not present (example: B2C)
-                       options.Events.OnTokenValidated += async context =>
+                       var onTokenValidatedHandler = options.Events.OnTokenValidated;
+                       options.Events.OnTokenValidated = async context =>
                        {
                            string? clientInfo = context!.ProtocolMessage?.GetParameter(ClaimConstants.ClientInfo);
 
@@ -179,7 +180,7 @@ internal static void WebAppCallsWebApiImplementation(
                                    context!.Principal!.Identities.FirstOrDefault()?.AddClaim(new Claim(ClaimConstants.UniqueObjectIdentifier, clientInfoFromServer.UniqueObjectIdentifier));
                                }
                            }
-                           await Task.CompletedTask;
+                           await onTokenValidatedHandler(context).ConfigureAwait(false);
                        };
 
                        // Handling the sign-out: removing the account from MSAL.NET cache

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ internal static void WebAppCallsWebApiImplementation(`
`165`	`165`	`};`
`166`	`166`
`167`	`167`	`// Handling the token validated to get the client_info for cases where tenantId is not present (example: B2C)`
`168`		`- options.Events.OnTokenValidated += async context =>`
	`168`	`+ var onTokenValidatedHandler = options.Events.OnTokenValidated;`
	`169`	`+ options.Events.OnTokenValidated = async context =>`
`169`	`170`	`{`
`170`	`171`	`string? clientInfo = context!.ProtocolMessage?.GetParameter(ClaimConstants.ClientInfo);`
`171`	`172`
`@@ -179,7 +180,7 @@ internal static void WebAppCallsWebApiImplementation(`
`179`	`180`	`context!.Principal!.Identities.FirstOrDefault()?.AddClaim(new Claim(ClaimConstants.UniqueObjectIdentifier, clientInfoFromServer.UniqueObjectIdentifier));`
`180`	`181`	`}`
`181`	`182`	`}`
`182`		`- await Task.CompletedTask;`
	`183`	`+ await onTokenValidatedHandler(context).ConfigureAwait(false);`
`183`	`184`	`};`
`184`	`185`
`185`	`186`	`// Handling the sign-out: removing the account from MSAL.NET cache`