diff --git a/src/Microsoft.Graph.Core/Extensions/ITokenValidableExtension.cs b/src/Microsoft.Graph.Core/Extensions/ITokenValidableExtension.cs
index 1fa8f63a1..2d2903905 100644
--- a/src/Microsoft.Graph.Core/Extensions/ITokenValidableExtension.cs
+++ b/src/Microsoft.Graph.Core/Extensions/ITokenValidableExtension.cs
@@ -7,6 +7,7 @@ namespace Microsoft.Graph
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using Microsoft.IdentityModel.Tokens;
using Microsoft.IdentityModel.Protocols;
+ using Microsoft.IdentityModel.Validators;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -65,7 +66,7 @@ private static bool IsTokenValid(string token, JwtSecurityTokenHandler handler,
{
try
{
- handler.ValidateToken(token, new TokenValidationParameters
+ var tokenValidationParameters = new TokenValidationParameters
{
ValidateIssuer = true,
ValidateAudience = true,
@@ -74,7 +75,9 @@ private static bool IsTokenValid(string token, JwtSecurityTokenHandler handler,
ValidIssuers = issuersToValidate,
ValidAudiences = appIds,
IssuerSigningKeys = openIdConfig.SigningKeys
- }, out _);
+ };
+ tokenValidationParameters.EnableAadSigningKeyIssuerValidation();
+ handler.ValidateToken(token, tokenValidationParameters, out _);
}
catch
{
diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj
index b71d52b3a..8867b41cc 100644
--- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj
+++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj
@@ -63,14 +63,15 @@
+
-
-
+
+
-
+