diff --git a/build/common.props b/build/common.props index 6953ae7b..55b58559 100644 --- a/build/common.props +++ b/build/common.props @@ -11,6 +11,9 @@ full pdbonly portable + $(MSBuildThisFileDirectory)key.snk + true + true diff --git a/build/packages.props b/build/packages.props index 9a83d5df..cc33384b 100644 --- a/build/packages.props +++ b/build/packages.props @@ -4,9 +4,6 @@ true - $(MSBuildThisFileDirectory)key.snk - true - true true true diff --git a/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs b/src/OpenIddict.Mvc/OpenIddictMvcBinder.cs similarity index 90% rename from src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs rename to src/OpenIddict.Mvc/OpenIddictMvcBinder.cs index 6b03ad90..ce125a58 100644 --- a/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs +++ b/src/OpenIddict.Mvc/OpenIddictMvcBinder.cs @@ -14,13 +14,11 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -namespace OpenIddict.Mvc.Internal +namespace OpenIddict.Mvc { /// /// Represents an ASP.NET Core MVC model binder that is able to bind /// and instances. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictMvcBinder : IModelBinder { @@ -29,8 +27,6 @@ namespace OpenIddict.Mvc.Internal /// /// Creates a new instance of the class. /// and instances. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public OpenIddictMvcBinder([NotNull] IOptionsMonitor options) => _options = options; diff --git a/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinderProvider.cs b/src/OpenIddict.Mvc/OpenIddictMvcBinderProvider.cs similarity index 87% rename from src/OpenIddict.Mvc/Internal/OpenIddictMvcBinderProvider.cs rename to src/OpenIddict.Mvc/OpenIddictMvcBinderProvider.cs index 8e2938d0..c5d1905b 100644 --- a/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinderProvider.cs +++ b/src/OpenIddict.Mvc/OpenIddictMvcBinderProvider.cs @@ -10,13 +10,11 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; -namespace OpenIddict.Mvc.Internal +namespace OpenIddict.Mvc { /// /// Represents an ASP.NET Core MVC model binder provider that is able to provide instances /// of for the OpenID Connect server primitives. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictMvcBinderProvider : IModelBinderProvider { diff --git a/src/OpenIddict.Mvc/Internal/OpenIddictMvcConfiguration.cs b/src/OpenIddict.Mvc/OpenIddictMvcConfiguration.cs similarity index 89% rename from src/OpenIddict.Mvc/Internal/OpenIddictMvcConfiguration.cs rename to src/OpenIddict.Mvc/OpenIddictMvcConfiguration.cs index 7f818655..8a344ab7 100644 --- a/src/OpenIddict.Mvc/Internal/OpenIddictMvcConfiguration.cs +++ b/src/OpenIddict.Mvc/OpenIddictMvcConfiguration.cs @@ -12,12 +12,10 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Microsoft.Extensions.Options; -namespace OpenIddict.Mvc.Internal +namespace OpenIddict.Mvc { /// /// Contains the methods required to ensure that the OpenIddict MVC configuration is valid. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictMvcConfiguration : IConfigureOptions { diff --git a/src/OpenIddict.Mvc/OpenIddictMvcExtensions.cs b/src/OpenIddict.Mvc/OpenIddictMvcExtensions.cs index 1ea2dda0..14089134 100644 --- a/src/OpenIddict.Mvc/OpenIddictMvcExtensions.cs +++ b/src/OpenIddict.Mvc/OpenIddictMvcExtensions.cs @@ -9,7 +9,7 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -using OpenIddict.Mvc.Internal; +using OpenIddict.Mvc; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerConfiguration.cs b/src/OpenIddict.Server/OpenIddictServerConfiguration.cs similarity index 98% rename from src/OpenIddict.Server/Internal/OpenIddictServerConfiguration.cs rename to src/OpenIddict.Server/OpenIddictServerConfiguration.cs index 397ee637..fd4e3b53 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerConfiguration.cs +++ b/src/OpenIddict.Server/OpenIddictServerConfiguration.cs @@ -16,12 +16,10 @@ using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Contains the methods required to ensure that the OpenIddict server configuration is valid. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictServerConfiguration : IConfigureOptions, IPostConfigureOptions, diff --git a/src/OpenIddict.Server/OpenIddictServerExtensions.cs b/src/OpenIddict.Server/OpenIddictServerExtensions.cs index cc10a75d..2260a937 100644 --- a/src/OpenIddict.Server/OpenIddictServerExtensions.cs +++ b/src/OpenIddict.Server/OpenIddictServerExtensions.cs @@ -14,7 +14,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using OpenIddict.Abstractions; using OpenIddict.Server; -using OpenIddict.Server.Internal; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerHandler.cs b/src/OpenIddict.Server/OpenIddictServerHandler.cs similarity index 73% rename from src/OpenIddict.Server/Internal/OpenIddictServerHandler.cs rename to src/OpenIddict.Server/OpenIddictServerHandler.cs index bd00bb36..c6061e73 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerHandler.cs +++ b/src/OpenIddict.Server/OpenIddictServerHandler.cs @@ -11,19 +11,15 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictServerHandler : OpenIdConnectServerHandler { /// /// Creates a new instance of the class. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public OpenIddictServerHandler( [NotNull] IOptionsMonitor options, diff --git a/src/OpenIddict.Server/OpenIddictServerOptions.cs b/src/OpenIddict.Server/OpenIddictServerOptions.cs index 5e2fcf0b..63b054c7 100644 --- a/src/OpenIddict.Server/OpenIddictServerOptions.cs +++ b/src/OpenIddict.Server/OpenIddictServerOptions.cs @@ -10,7 +10,6 @@ using System.Security.Cryptography; using AspNet.Security.OpenIdConnect.Server; using Microsoft.Extensions.Caching.Distributed; using OpenIddict.Abstractions; -using OpenIddict.Server.Internal; namespace OpenIddict.Server { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Authentication.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Authentication.cs similarity index 98% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Authentication.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Authentication.cs index 8781bc4d..5ba1f4a2 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Authentication.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Authentication.cs @@ -22,14 +22,12 @@ using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override async Task ExtractAuthorizationRequest([NotNull] ExtractAuthorizationRequestContext context) { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Discovery.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Discovery.cs similarity index 92% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Discovery.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Discovery.cs index f964238c..6ac05167 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Discovery.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Discovery.cs @@ -9,14 +9,12 @@ using AspNet.Security.OpenIdConnect.Primitives; using AspNet.Security.OpenIdConnect.Server; using JetBrains.Annotations; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override Task ExtractConfigurationRequest([NotNull] ExtractConfigurationRequestContext context) => _eventDispatcher.DispatchAsync(new OpenIddictServerEvents.ExtractConfigurationRequest(context)); diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Exchange.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Exchange.cs similarity index 98% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Exchange.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Exchange.cs index c657ad11..768dbfb9 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Exchange.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Exchange.cs @@ -16,14 +16,12 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override Task ExtractTokenRequest([NotNull] ExtractTokenRequestContext context) => _eventDispatcher.DispatchAsync(new OpenIddictServerEvents.ExtractTokenRequest(context)); diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Helpers.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Helpers.cs similarity index 98% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Helpers.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Helpers.cs index 51af4df1..5117ef84 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Helpers.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Helpers.cs @@ -19,14 +19,12 @@ using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json.Linq; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { private async Task CreateAuthorizationAsync([NotNull] AuthenticationTicket ticket, [NotNull] OpenIddictServerOptions options, [NotNull] OpenIdConnectRequest request) diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Introspection.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Introspection.cs similarity index 96% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Introspection.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Introspection.cs index 35f5629b..faec8357 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Introspection.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Introspection.cs @@ -12,14 +12,12 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override Task ExtractIntrospectionRequest([NotNull] ExtractIntrospectionRequestContext context) => _eventDispatcher.DispatchAsync(new OpenIddictServerEvents.ExtractIntrospectionRequest(context)); diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Revocation.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Revocation.cs similarity index 97% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Revocation.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Revocation.cs index bd582afa..4aa33697 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Revocation.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Revocation.cs @@ -14,14 +14,12 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override Task ExtractRevocationRequest([NotNull] ExtractRevocationRequestContext context) => _eventDispatcher.DispatchAsync(new OpenIddictServerEvents.ExtractRevocationRequest(context)); diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Serialization.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Serialization.cs similarity index 95% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Serialization.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Serialization.cs index 57201f69..30044732 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Serialization.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Serialization.cs @@ -10,14 +10,12 @@ using AspNet.Security.OpenIdConnect.Primitives; using AspNet.Security.OpenIdConnect.Server; using JetBrains.Annotations; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override async Task DeserializeAccessToken([NotNull] DeserializeAccessTokenContext context) { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Session.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Session.cs similarity index 97% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Session.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Session.cs index 8566589c..68b35109 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Session.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Session.cs @@ -19,14 +19,12 @@ using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override async Task ExtractLogoutRequest([NotNull] ExtractLogoutRequestContext context) { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Userinfo.cs b/src/OpenIddict.Server/OpenIddictServerProvider.Userinfo.cs similarity index 86% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.Userinfo.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.Userinfo.cs index 900126bd..0a7589d1 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.Userinfo.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.Userinfo.cs @@ -8,14 +8,12 @@ using System.Threading.Tasks; using AspNet.Security.OpenIdConnect.Server; using JetBrains.Annotations; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { public override Task ExtractUserinfoRequest([NotNull] ExtractUserinfoRequestContext context) { diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.cs b/src/OpenIddict.Server/OpenIddictServerProvider.cs similarity index 97% rename from src/OpenIddict.Server/Internal/OpenIddictServerProvider.cs rename to src/OpenIddict.Server/OpenIddictServerProvider.cs index 391e477d..a6c5c92f 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerProvider.cs +++ b/src/OpenIddict.Server/OpenIddictServerProvider.cs @@ -17,14 +17,12 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using OpenIddict.Abstractions; -namespace OpenIddict.Server.Internal +namespace OpenIddict.Server { /// /// Provides the logic necessary to extract, validate and handle OpenID Connect requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider + internal sealed partial class OpenIddictServerProvider : OpenIdConnectServerProvider { private readonly ILogger _logger; private readonly IOpenIddictServerEventDispatcher _eventDispatcher; diff --git a/src/OpenIddict.Server/Properties/AssemblyInfo.cs b/src/OpenIddict.Server/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..c05ea5c5 --- /dev/null +++ b/src/OpenIddict.Server/Properties/AssemblyInfo.cs @@ -0,0 +1,9 @@ +/* + * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) + * See https://github.com/openiddict/openiddict-core for more information concerning + * the license and the contributors participating to this project. + */ + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("OpenIddict.Server.Tests, PublicKey=0024000004800000140200000602000000240000525341310010000001000100613f2880fc9f71b5e8f968801c1a4923e1df760bd3f9d2d752f83c01cabc4853e7f32bba18e9e88ca1285d96655008148d60c43d28d82a292c6bf0c8a761fd5d345e45ec1c044b6eeca140593779e6c9e8b59eb1b1cc905dc81e559a9fdf24c77d333c53cc8c7f2d46a6df3a74c426e4afc97bab4117a87a882552c8f41e9f4757bb40a1255cf720f85ce50bac763a6104b03d6927ef05f5dcc316450eda528eae7f003af8c6463daa9505fae121d0c8294eb927995a4dd96b9397c16a479c865322af27c0f1b493a5dc03305bd5d46ac376de620cb050b40f9fb1cbb0a2004242ad30aff30e203fb68a104eed90d80def2e04f1c73e01937d9f1359108904d13d5226ac717880f51070066252ceb0b0acdb6705fb76515f3cebb2fc497572ab3c66718fbdb1306f39125a6cb6f40006db495a21a61b5273ddcbc83e983a2e59b04ebbcde41aad46ff4292080b1ede89878ac95b26d68227cd6077994b397255e91b09d25de64f0f7cf58cd3f96460561056eaf48ff1fb1d9f6faa3741bc756b930d761dfe0bde2d8d4c79351888688dd2d0c2939b8e0619a3f668816fbbab070c3139e3f3a5b2961f7d99f2af95fde9c52958644e575a3d0f2a1de8d5fef0b8c9766b415e7566eaba2ad0c775089c1f5148008509700fcebdd001f1b36a1db83be5b2b66c18342d3230e5f995f1283335dbee7388aa3584206fba97112775af")] \ No newline at end of file diff --git a/src/OpenIddict.Validation/Internal/OpenIddictValidationConfiguration.cs b/src/OpenIddict.Validation/OpenIddictValidationConfiguration.cs similarity index 93% rename from src/OpenIddict.Validation/Internal/OpenIddictValidationConfiguration.cs rename to src/OpenIddict.Validation/OpenIddictValidationConfiguration.cs index fc9e4e44..19c971e3 100644 --- a/src/OpenIddict.Validation/Internal/OpenIddictValidationConfiguration.cs +++ b/src/OpenIddict.Validation/OpenIddictValidationConfiguration.cs @@ -11,12 +11,10 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Options; -namespace OpenIddict.Validation.Internal +namespace OpenIddict.Validation { /// /// Contains the methods required to ensure that the OpenIddict validation configuration is valid. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictValidationConfiguration : IConfigureOptions, IPostConfigureOptions, @@ -26,8 +24,6 @@ namespace OpenIddict.Validation.Internal /// /// Creates a new instance of the class. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public OpenIddictValidationConfiguration([NotNull] IDataProtectionProvider dataProtectionProvider) => _dataProtectionProvider = dataProtectionProvider; diff --git a/src/OpenIddict.Validation/OpenIddictValidationExtensions.cs b/src/OpenIddict.Validation/OpenIddictValidationExtensions.cs index 818a8430..d3d4ca5e 100644 --- a/src/OpenIddict.Validation/OpenIddictValidationExtensions.cs +++ b/src/OpenIddict.Validation/OpenIddictValidationExtensions.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; using OpenIddict.Validation; -using OpenIddict.Validation.Internal; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/OpenIddict.Validation/Internal/OpenIddictValidationHandler.cs b/src/OpenIddict.Validation/OpenIddictValidationHandler.cs similarity index 73% rename from src/OpenIddict.Validation/Internal/OpenIddictValidationHandler.cs rename to src/OpenIddict.Validation/OpenIddictValidationHandler.cs index 0e604389..c31d2812 100644 --- a/src/OpenIddict.Validation/Internal/OpenIddictValidationHandler.cs +++ b/src/OpenIddict.Validation/OpenIddictValidationHandler.cs @@ -11,19 +11,15 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace OpenIddict.Validation.Internal +namespace OpenIddict.Validation { /// /// Provides the logic necessary to extract and validate tokens from HTTP requests. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public class OpenIddictValidationHandler : OAuthValidationHandler { /// /// Creates a new instance of the class. - /// Note: this API supports the OpenIddict infrastructure and is not intended to be used - /// directly from your code. This API may change or be removed in future minor releases. /// public OpenIddictValidationHandler( [NotNull] IOptionsMonitor options, diff --git a/src/OpenIddict.Validation/Internal/OpenIddictValidationHelpers.cs b/src/OpenIddict.Validation/OpenIddictValidationHelpers.cs similarity index 98% rename from src/OpenIddict.Validation/Internal/OpenIddictValidationHelpers.cs rename to src/OpenIddict.Validation/OpenIddictValidationHelpers.cs index 2078f358..2d239e14 100644 --- a/src/OpenIddict.Validation/Internal/OpenIddictValidationHelpers.cs +++ b/src/OpenIddict.Validation/OpenIddictValidationHelpers.cs @@ -8,7 +8,7 @@ using System; using JetBrains.Annotations; using Microsoft.AspNetCore.Authentication; -namespace OpenIddict.Validation.Internal +namespace OpenIddict.Validation { /// /// Defines a set of commonly used helpers. diff --git a/src/OpenIddict.Validation/OpenIddictValidationOptions.cs b/src/OpenIddict.Validation/OpenIddictValidationOptions.cs index 20a9d1bb..3b98216b 100644 --- a/src/OpenIddict.Validation/OpenIddictValidationOptions.cs +++ b/src/OpenIddict.Validation/OpenIddictValidationOptions.cs @@ -5,7 +5,6 @@ */ using AspNet.Security.OAuth.Validation; -using OpenIddict.Validation.Internal; namespace OpenIddict.Validation { diff --git a/src/OpenIddict.Validation/Internal/OpenIddictValidationProvider.cs b/src/OpenIddict.Validation/OpenIddictValidationProvider.cs similarity index 98% rename from src/OpenIddict.Validation/Internal/OpenIddictValidationProvider.cs rename to src/OpenIddict.Validation/OpenIddictValidationProvider.cs index 19eee078..8b9d961e 100644 --- a/src/OpenIddict.Validation/Internal/OpenIddictValidationProvider.cs +++ b/src/OpenIddict.Validation/OpenIddictValidationProvider.cs @@ -13,14 +13,14 @@ using JetBrains.Annotations; using Microsoft.Extensions.DependencyInjection; using OpenIddict.Abstractions; -namespace OpenIddict.Validation.Internal +namespace OpenIddict.Validation { /// /// Provides the logic necessary to extract and validate tokens from HTTP requests. /// Note: this API supports the OpenIddict infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future minor releases. /// - public sealed class OpenIddictValidationProvider : OAuthValidationEvents + internal sealed class OpenIddictValidationProvider : OAuthValidationEvents { private readonly IOpenIddictValidationEventDispatcher _eventDispatcher; diff --git a/src/OpenIddict.Validation/Properties/AssemblyInfo.cs b/src/OpenIddict.Validation/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..470d4598 --- /dev/null +++ b/src/OpenIddict.Validation/Properties/AssemblyInfo.cs @@ -0,0 +1,9 @@ +/* + * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) + * See https://github.com/openiddict/openiddict-core for more information concerning + * the license and the contributors participating to this project. + */ + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("OpenIddict.Validation.Tests, PublicKey=0024000004800000140200000602000000240000525341310010000001000100613f2880fc9f71b5e8f968801c1a4923e1df760bd3f9d2d752f83c01cabc4853e7f32bba18e9e88ca1285d96655008148d60c43d28d82a292c6bf0c8a761fd5d345e45ec1c044b6eeca140593779e6c9e8b59eb1b1cc905dc81e559a9fdf24c77d333c53cc8c7f2d46a6df3a74c426e4afc97bab4117a87a882552c8f41e9f4757bb40a1255cf720f85ce50bac763a6104b03d6927ef05f5dcc316450eda528eae7f003af8c6463daa9505fae121d0c8294eb927995a4dd96b9397c16a479c865322af27c0f1b493a5dc03305bd5d46ac376de620cb050b40f9fb1cbb0a2004242ad30aff30e203fb68a104eed90d80def2e04f1c73e01937d9f1359108904d13d5226ac717880f51070066252ceb0b0acdb6705fb76515f3cebb2fc497572ab3c66718fbdb1306f39125a6cb6f40006db495a21a61b5273ddcbc83e983a2e59b04ebbcde41aad46ff4292080b1ede89878ac95b26d68227cd6077994b397255e91b09d25de64f0f7cf58cd3f96460561056eaf48ff1fb1d9f6faa3741bc756b930d761dfe0bde2d8d4c79351888688dd2d0c2939b8e0619a3f668816fbbab070c3139e3f3a5b2961f7d99f2af95fde9c52958644e575a3d0f2a1de8d5fef0b8c9766b415e7566eaba2ad0c775089c1f5148008509700fcebdd001f1b36a1db83be5b2b66c18342d3230e5f995f1283335dbee7388aa3584206fba97112775af")] \ No newline at end of file diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj b/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj index dbf18a60..68766cdf 100644 --- a/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj +++ b/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj @@ -5,6 +5,8 @@ netcoreapp2.0;net461 netcoreapp2.0 + false + false diff --git a/test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcConfigurationTests.cs b/test/OpenIddict.Mvc.Tests/OpenIddictMvcConfigurationTests.cs similarity index 99% rename from test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcConfigurationTests.cs rename to test/OpenIddict.Mvc.Tests/OpenIddictMvcConfigurationTests.cs index cdd41876..3338ca42 100644 --- a/test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcConfigurationTests.cs +++ b/test/OpenIddict.Mvc.Tests/OpenIddictMvcConfigurationTests.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OpenIddict.Mvc.Internal; using Xunit; namespace OpenIddict.Mvc.Tests diff --git a/test/OpenIddict.Mvc.Tests/OpenIddictMvcExtensionsTests.cs b/test/OpenIddict.Mvc.Tests/OpenIddictMvcExtensionsTests.cs index 6421d311..f05362b1 100644 --- a/test/OpenIddict.Mvc.Tests/OpenIddictMvcExtensionsTests.cs +++ b/test/OpenIddict.Mvc.Tests/OpenIddictMvcExtensionsTests.cs @@ -8,7 +8,6 @@ using System; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OpenIddict.Mvc.Internal; using Xunit; namespace OpenIddict.Mvc.Tests diff --git a/test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcModelBinderProviderTests.cs b/test/OpenIddict.Mvc.Tests/OpenIddictMvcModelBinderProviderTests.cs similarity index 97% rename from test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcModelBinderProviderTests.cs rename to test/OpenIddict.Mvc.Tests/OpenIddictMvcModelBinderProviderTests.cs index 19ae03c6..750e4e20 100644 --- a/test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcModelBinderProviderTests.cs +++ b/test/OpenIddict.Mvc.Tests/OpenIddictMvcModelBinderProviderTests.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Moq; using Xunit; -namespace OpenIddict.Mvc.Internal.Tests +namespace OpenIddict.Mvc.Tests { public class OpenIddictMvcModelBinderProviderTests { diff --git a/test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcModelBinderTests.cs b/test/OpenIddict.Mvc.Tests/OpenIddictMvcModelBinderTests.cs similarity index 99% rename from test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcModelBinderTests.cs rename to test/OpenIddict.Mvc.Tests/OpenIddictMvcModelBinderTests.cs index 499cca9c..ae5de244 100644 --- a/test/OpenIddict.Mvc.Tests/Internal/OpenIddictMvcModelBinderTests.cs +++ b/test/OpenIddict.Mvc.Tests/OpenIddictMvcModelBinderTests.cs @@ -19,7 +19,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace OpenIddict.Mvc.Internal.Tests +namespace OpenIddict.Mvc.Tests { public class OpenIddictMvcModelBinderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerConfigurationTests.cs b/test/OpenIddict.Server.Tests/OpenIddictServerConfigurationTests.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerConfigurationTests.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerConfigurationTests.cs index b5d93355..8dd8d0f8 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerConfigurationTests.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerConfigurationTests.cs @@ -23,7 +23,7 @@ using Moq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public class OpenIddictServerConfigurationTests { diff --git a/test/OpenIddict.Server.Tests/OpenIddictServerExtensionsTests.cs b/test/OpenIddict.Server.Tests/OpenIddictServerExtensionsTests.cs index e890a351..ba878893 100644 --- a/test/OpenIddict.Server.Tests/OpenIddictServerExtensionsTests.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerExtensionsTests.cs @@ -13,7 +13,6 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using OpenIddict.Server.Internal; using Xunit; namespace OpenIddict.Server.Tests diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Authentication.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Authentication.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Authentication.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Authentication.cs index 27e48457..5f12541e 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Authentication.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Authentication.cs @@ -21,7 +21,7 @@ using Newtonsoft.Json.Bson; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Discovery.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Discovery.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Discovery.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Discovery.cs index 14a712eb..d25ebc4a 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Discovery.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Discovery.cs @@ -12,7 +12,7 @@ using Newtonsoft.Json.Linq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Exchange.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Exchange.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Exchange.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Exchange.cs index 09a43134..cf35ebbc 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Exchange.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Exchange.cs @@ -18,7 +18,7 @@ using Moq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Introspection.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Introspection.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Introspection.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Introspection.cs index 31b5c84c..10936a9b 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Introspection.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Introspection.cs @@ -16,7 +16,7 @@ using Moq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Revocation.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Revocation.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Revocation.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Revocation.cs index c922798a..541604eb 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Revocation.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Revocation.cs @@ -19,7 +19,7 @@ using Moq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Serialization.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Serialization.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Serialization.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Serialization.cs index 5ba03999..3b3735e8 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Serialization.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Serialization.cs @@ -18,7 +18,7 @@ using Moq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Session.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Session.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Session.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Session.cs index c8dab4e3..fd23e4bf 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Session.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Session.cs @@ -18,7 +18,7 @@ using Moq; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Userinfo.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Userinfo.cs similarity index 96% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Userinfo.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Userinfo.cs index 26a1a9c6..b4fad086 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.Userinfo.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.Userinfo.cs @@ -10,7 +10,7 @@ using AspNet.Security.OpenIdConnect.Primitives; using OpenIddict.Abstractions; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.cs b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.cs similarity index 99% rename from test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.cs rename to test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.cs index 54662aa6..7c4e7a26 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerProviderTests.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerProviderTests.cs @@ -33,7 +33,7 @@ using OpenIddict.Abstractions; using OpenIddict.Core; using Xunit; -namespace OpenIddict.Server.Internal.Tests +namespace OpenIddict.Server.Tests { public partial class OpenIddictServerProviderTests { diff --git a/test/OpenIddict.Validation.Tests/Internal/OpenIddictValidationConfigurationTests.cs b/test/OpenIddict.Validation.Tests/OpenIddictValidationConfigurationTests.cs similarity index 99% rename from test/OpenIddict.Validation.Tests/Internal/OpenIddictValidationConfigurationTests.cs rename to test/OpenIddict.Validation.Tests/OpenIddictValidationConfigurationTests.cs index 3b86357b..a45c691a 100644 --- a/test/OpenIddict.Validation.Tests/Internal/OpenIddictValidationConfigurationTests.cs +++ b/test/OpenIddict.Validation.Tests/OpenIddictValidationConfigurationTests.cs @@ -19,7 +19,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace OpenIddict.Validation.Internal.Tests +namespace OpenIddict.Validation.Tests { public class OpenIddictValidationConfigurationTests { diff --git a/test/OpenIddict.Validation.Tests/OpenIddictValidationExtensionsTests.cs b/test/OpenIddict.Validation.Tests/OpenIddictValidationExtensionsTests.cs index 99be6172..c6d7f250 100644 --- a/test/OpenIddict.Validation.Tests/OpenIddictValidationExtensionsTests.cs +++ b/test/OpenIddict.Validation.Tests/OpenIddictValidationExtensionsTests.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using OpenIddict.Validation.Internal; using Xunit; namespace OpenIddict.Validation.Tests diff --git a/test/OpenIddict.Validation.Tests/Internal/OpenIddictValidationProviderTests.cs b/test/OpenIddict.Validation.Tests/OpenIddictValidationProviderTests.cs similarity index 99% rename from test/OpenIddict.Validation.Tests/Internal/OpenIddictValidationProviderTests.cs rename to test/OpenIddict.Validation.Tests/OpenIddictValidationProviderTests.cs index 281de1c9..613fa625 100644 --- a/test/OpenIddict.Validation.Tests/Internal/OpenIddictValidationProviderTests.cs +++ b/test/OpenIddict.Validation.Tests/OpenIddictValidationProviderTests.cs @@ -33,7 +33,7 @@ using OpenIddict.Abstractions; using OpenIddict.Core; using Xunit; -namespace OpenIddict.Validation.Internal.Tests +namespace OpenIddict.Validation.Tests { public class OpenIddictValidationProviderTests {