Remove M.IM.Tokens.Experimental namespace - Graduate result-based validation API

src/Microsoft.IdentityModel.JsonWebTokens/Experimental/JsonWebTokenHandler.ClaimsIdentity.cs

@@ -5,7 +5,7 @@
 using System.Security.Claims;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using System.Collections.Generic;
 
 #nullable enable

src/Microsoft.IdentityModel.JsonWebTokens/Experimental/JsonWebTokenHandler.DecryptToken.cs

@@ -7,7 +7,7 @@
 using System.Text;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using TokenLogMessages = Microsoft.IdentityModel.Tokens.LogMessages;
 
 #nullable enable

src/Microsoft.IdentityModel.JsonWebTokens/Experimental/JsonWebTokenHandler.ReadToken.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 
 #nullable enable
 namespace Microsoft.IdentityModel.JsonWebTokens

src/Microsoft.IdentityModel.JsonWebTokens/Experimental/JsonWebTokenHandler.ValidateSignature.cs

@@ -6,7 +6,7 @@
 using System.Text;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using TokenLogMessages = Microsoft.IdentityModel.Tokens.LogMessages;
 
 #nullable enable

src/Microsoft.IdentityModel.JsonWebTokens/Experimental/JsonWebTokenHandler.ValidateToken.Internal.cs

@@ -7,16 +7,15 @@
 using System.Threading.Tasks;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.Tokens.Experimental;
 using TokenLogMessages = Microsoft.IdentityModel.Tokens.LogMessages;
 
 #nullable enable
 namespace Microsoft.IdentityModel.JsonWebTokens
 {
-    public partial class JsonWebTokenHandler : TokenHandler, IResultBasedValidation
+    public partial class JsonWebTokenHandler : TokenHandler
     {
         /// <inheritdoc/>
-        internal override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
+        public override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
             string token,
             ValidationParameters validationParameters,
             CallContext callContext,
@@ -67,7 +66,7 @@ internal override async Task<ValidationResult<ValidatedToken, ValidationError>>
         }
 
         /// <inheritdoc/>
-        internal override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
+        public override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
             SecurityToken token,
             ValidationParameters validationParameters,
             CallContext callContext,
@@ -370,58 +369,6 @@ await Validators.ValidateIssuerInternalAsync(
 
             return currentConfiguration;
         }
-
-        #region Explicit Interface Implementations
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            string token,
-            ValidationParameters validationParameters,
-            CallContext callContext)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                default).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            string token,
-            ValidationParameters validationParameters,
-            CallContext callContext,
-            CancellationToken cancellationToken)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                cancellationToken).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            SecurityToken token,
-            ValidationParameters validationParameters,
-            CallContext callContext)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                default).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            SecurityToken token,
-            ValidationParameters validationParameters,
-            CallContext callContext,
-            CancellationToken cancellationToken)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                cancellationToken).ConfigureAwait(false);
-        }
-        #endregion
     }
 }
 #nullable restore

src/Microsoft.IdentityModel.JsonWebTokens/Experimental/JwtTokenUtilities.DecryptTokenResult.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using TokenLogMessages = Microsoft.IdentityModel.Tokens.LogMessages;
 
 namespace Microsoft.IdentityModel.JsonWebTokens

src/Microsoft.IdentityModel.Tokens.Saml/Saml/Experimental/SamlSecurityTokenHandler.ClaimsIdentity.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Security.Claims;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 
 #nullable enable
 namespace Microsoft.IdentityModel.Tokens.Saml

src/Microsoft.IdentityModel.Tokens.Saml/Saml/Experimental/SamlSecurityTokenHandler.ReadToken.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Xml;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using TokenLogMessages = Microsoft.IdentityModel.Tokens.LogMessages;
 
 namespace Microsoft.IdentityModel.Tokens.Saml

src/Microsoft.IdentityModel.Tokens.Saml/Saml/Experimental/SamlSecurityTokenHandler.ValidateToken.Internal.cs

@@ -5,18 +5,18 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 
 #nullable enable
 namespace Microsoft.IdentityModel.Tokens.Saml
 {
     /// <summary>
     /// A <see cref="SecurityTokenHandler"/> designed for creating and validating Saml Tokens. See: http://docs.oasis-open.org/security/saml/v2.0/saml-core-2.0-os.pdf
     /// </summary>
-    public partial class SamlSecurityTokenHandler : SecurityTokenHandler, IResultBasedValidation
+    public partial class SamlSecurityTokenHandler : SecurityTokenHandler
     {
         /// <inheritdoc/>
-        internal override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
+        public override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
             string token,
             ValidationParameters validationParameters,
             CallContext callContext,
@@ -44,7 +44,7 @@ internal override async Task<ValidationResult<ValidatedToken, ValidationError>>
         }
 
         /// <inheritdoc/>
-        internal override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
+        public override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
             SecurityToken securityToken,
             ValidationParameters validationParameters,
             CallContext callContext,
@@ -194,58 +194,6 @@ await Validators.ValidateIssuerInternalAsync(
                 ValidatedSignatureKey = signatureResult.Result
             };
         }
-
-        #region Explicit Interface Implementations
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            string token,
-            ValidationParameters validationParameters,
-            CallContext callContext)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                default).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            string token,
-            ValidationParameters validationParameters,
-            CallContext callContext,
-            CancellationToken cancellationToken)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                cancellationToken).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            SecurityToken token,
-            ValidationParameters validationParameters,
-            CallContext callContext)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                default).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            SecurityToken token,
-            ValidationParameters validationParameters,
-            CallContext callContext,
-            CancellationToken cancellationToken)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                cancellationToken).ConfigureAwait(false);
-        }
-        #endregion
     }
 }
 #nullable restore

src/Microsoft.IdentityModel.Tokens.Saml/Saml/Experimental/SamlTokenUtilities.Experimental.cs

@@ -7,7 +7,7 @@
 using System.IO;
 using System.Text;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using Microsoft.IdentityModel.Xml;
 
 namespace Microsoft.IdentityModel.Tokens.Saml

src/Microsoft.IdentityModel.Tokens.Saml/Saml2/Experimental/Saml2SecurityTokenHandler.ClaimsIdentity.cs

@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 
 #nullable enable
 namespace Microsoft.IdentityModel.Tokens.Saml2

src/Microsoft.IdentityModel.Tokens.Saml/Saml2/Experimental/Saml2SecurityTokenHandler.ReadToken.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Xml;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using TokenLogMessages = Microsoft.IdentityModel.Tokens.LogMessages;
 
 namespace Microsoft.IdentityModel.Tokens.Saml2

src/Microsoft.IdentityModel.Tokens.Saml/Saml2/Experimental/Saml2SecurityTokenHandler.ValidateToken.Internal.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.IdentityModel.Tokens.Experimental;
+using Microsoft.IdentityModel.Tokens;
 using Microsoft.IdentityModel.Tokens.Saml;
 
 #nullable enable
@@ -14,10 +14,10 @@ namespace Microsoft.IdentityModel.Tokens.Saml2
     /// <summary>
     /// A <see cref="SecurityTokenHandler"/> designed for creating and validating Saml2 Tokens. See: http://docs.oasis-open.org/security/saml/v2.0/saml-core-2.0-os.pdf
     /// </summary>
-    public partial class Saml2SecurityTokenHandler : SecurityTokenHandler, IResultBasedValidation
+    public partial class Saml2SecurityTokenHandler : SecurityTokenHandler
     {
         /// <inheritdoc/>
-        internal override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
+        public override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
             string token,
             ValidationParameters validationParameters,
             CallContext callContext,
@@ -37,7 +37,7 @@ internal override async Task<ValidationResult<ValidatedToken, ValidationError>>
         }
 
         /// <inheritdoc/>
-        internal async override Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
+        public override async Task<ValidationResult<ValidatedToken, ValidationError>> ValidateTokenAsync(
             SecurityToken securityToken,
             ValidationParameters validationParameters,
             CallContext callContext,
@@ -217,58 +217,6 @@ await Validators.ValidateIssuerInternalAsync(
         {
             return null;
         }
-
-        #region Explicit Interface Implementations
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            string token,
-            ValidationParameters validationParameters,
-            CallContext callContext)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                default).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            string token,
-            ValidationParameters validationParameters,
-            CallContext callContext,
-            CancellationToken cancellationToken)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                cancellationToken).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            SecurityToken token,
-            ValidationParameters validationParameters,
-            CallContext callContext)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                default).ConfigureAwait(false);
-        }
-
-        async Task<ValidationResult<ValidatedToken, ValidationError>> IResultBasedValidation.ValidateTokenAsync(
-            SecurityToken token,
-            ValidationParameters validationParameters,
-            CallContext callContext,
-            CancellationToken cancellationToken)
-        {
-            return await ValidateTokenAsync(
-                token,
-                validationParameters,
-                callContext,
-                cancellationToken).ConfigureAwait(false);
-        }
-        #endregion
     }
 }
 #nullable restore