diff --git a/samples/Mvc.Server/Controllers/AuthorizationController.cs b/samples/Mvc.Server/Controllers/AuthorizationController.cs index 669b07fb..be3877d9 100644 --- a/samples/Mvc.Server/Controllers/AuthorizationController.cs +++ b/samples/Mvc.Server/Controllers/AuthorizationController.cs @@ -50,7 +50,7 @@ namespace Mvc.Server { Debug.Assert(request.IsAuthorizationRequest(), "The OpenIddict binder for ASP.NET Core MVC is not registered. " + - "Make sure services.AddOpenIddict().AddMvcBinders() is correctly called."); + "Make sure services.AddOpenIddict().AddServer().UseMvc() is correctly called."); // Retrieve the application details from the database. var application = await _applicationManager.FindByClientIdAsync(request.ClientId); @@ -79,7 +79,7 @@ namespace Mvc.Server { Debug.Assert(request.IsAuthorizationRequest(), "The OpenIddict binder for ASP.NET Core MVC is not registered. " + - "Make sure services.AddOpenIddict().AddMvcBinders() is correctly called."); + "Make sure services.AddOpenIddict().AddServer().UseMvc() is correctly called."); // Retrieve the profile of the logged in user. var user = await _userManager.GetUserAsync(User); @@ -116,7 +116,7 @@ namespace Mvc.Server { Debug.Assert(request.IsLogoutRequest(), "The OpenIddict binder for ASP.NET Core MVC is not registered. " + - "Make sure services.AddOpenIddict().AddMvcBinders() is correctly called."); + "Make sure services.AddOpenIddict().AddServer().UseMvc() is correctly called."); // Flow the request_id to allow OpenIddict to restore // the original logout request from the distributed cache. diff --git a/src/OpenIddict.Core/OpenIddictCoreExtensions.cs b/src/OpenIddict.Core/OpenIddictCoreExtensions.cs index ceb11696..761d6e27 100644 --- a/src/OpenIddict.Core/OpenIddictCoreExtensions.cs +++ b/src/OpenIddict.Core/OpenIddictCoreExtensions.cs @@ -49,9 +49,10 @@ namespace Microsoft.Extensions.DependencyInjection if (options.DefaultApplicationType == null) { throw new InvalidOperationException(new StringBuilder() - .AppendLine("The default application type must be configured for the non-generic services to work correctly.") - .Append("To configure the entities, use either 'services.AddOpenIddict().AddCore().UseDefaultModels()' ") - .Append("or 'services.AddOpenIddict().AddCore().UseCustomModels()'.") + .Append("No default application entity type was configured in the OpenIddict core options, ") + .AppendLine("which generally indicates that no application store was registered in the DI container.") + .Append("To register the Entity Framework Core stores, reference the 'OpenIddict.EntityFrameworkCore' ") + .Append("package and call 'services.AddOpenIddict().AddCore().UseEntityFrameworkCore()'.") .ToString()); } @@ -65,9 +66,10 @@ namespace Microsoft.Extensions.DependencyInjection if (options.DefaultAuthorizationType == null) { throw new InvalidOperationException(new StringBuilder() - .AppendLine("The default authorization type must be configured for the non-generic services to work correctly.") - .Append("To configure the entities, use either 'services.AddOpenIddict().AddCore().UseDefaultModels()' ") - .Append("or 'services.AddOpenIddict().AddCore().UseCustomModels()'.") + .Append("No default authorization entity type was configured in the OpenIddict core options, ") + .AppendLine("which generally indicates that no authorization store was registered in the DI container.") + .Append("To register the Entity Framework Core stores, reference the 'OpenIddict.EntityFrameworkCore' ") + .Append("package and call 'services.AddOpenIddict().AddCore().UseEntityFrameworkCore()'.") .ToString()); } @@ -81,9 +83,10 @@ namespace Microsoft.Extensions.DependencyInjection if (options.DefaultScopeType == null) { throw new InvalidOperationException(new StringBuilder() - .AppendLine("The default scope type must be configured for the non-generic services to work correctly.") - .Append("To configure the entities, use either 'services.AddOpenIddict().AddCore().UseDefaultModels()' ") - .Append("or 'services.AddOpenIddict().AddCore().UseCustomModels()'.") + .Append("No default scope entity type was configured in the OpenIddict core options, ") + .AppendLine("which generally indicates that no scope store was registered in the DI container.") + .Append("To register the Entity Framework Core stores, reference the 'OpenIddict.EntityFrameworkCore' ") + .Append("package and call 'services.AddOpenIddict().AddCore().UseEntityFrameworkCore()'.") .ToString()); } @@ -97,9 +100,10 @@ namespace Microsoft.Extensions.DependencyInjection if (options.DefaultTokenType == null) { throw new InvalidOperationException(new StringBuilder() - .AppendLine("The default token type must be configured for the non-generic services to work correctly.") - .Append("To configure the entities, use either 'services.AddOpenIddict().AddCore().UseDefaultModels()' ") - .Append("or 'services.AddOpenIddict().AddCore().UseCustomModels()'.") + .Append("No default token entity type was configured in the OpenIddict core options, ") + .AppendLine("which generally indicates that no token store was registered in the DI container.") + .Append("To register the Entity Framework Core stores, reference the 'OpenIddict.EntityFrameworkCore' ") + .Append("package and call 'services.AddOpenIddict().AddCore().UseEntityFrameworkCore()'.") .ToString()); } diff --git a/src/OpenIddict.Server/Internal/OpenIddictServerInitializer.cs b/src/OpenIddict.Server/Internal/OpenIddictServerInitializer.cs index 273b1e03..1f908f0f 100644 --- a/src/OpenIddict.Server/Internal/OpenIddictServerInitializer.cs +++ b/src/OpenIddict.Server/Internal/OpenIddictServerInitializer.cs @@ -179,9 +179,9 @@ namespace OpenIddict.Server { throw new InvalidOperationException(new StringBuilder() .AppendLine("At least one signing key must be registered when using JWT as the access token format.") - .Append("Consider registering a X.509 certificate using 'services.AddOpenIddict().AddSigningCertificate()' ") - .Append("or 'services.AddOpenIddict().AddDevelopmentSigningCertificate()' or call ") - .Append("'services.AddOpenIddict().AddEphemeralSigningKey()' to use an ephemeral key.") + .Append("Consider registering a certificate using 'services.AddOpenIddict().AddServer().AddSigningCertificate()' ") + .Append("or 'services.AddOpenIddict().AddServer().AddDevelopmentSigningCertificate()' or call ") + .Append("'services.AddOpenIddict().AddServer().AddEphemeralSigningKey()' to use an ephemeral key.") .ToString()); } @@ -191,9 +191,9 @@ namespace OpenIddict.Server { throw new InvalidOperationException(new StringBuilder() .AppendLine("At least one asymmetric signing key must be registered when enabling the implicit flow.") - .Append("Consider registering a X.509 certificate using 'services.AddOpenIddict().AddSigningCertificate()' ") - .Append("or 'services.AddOpenIddict().AddDevelopmentSigningCertificate()' or call ") - .Append("'services.AddOpenIddict().AddEphemeralSigningKey()' to use an ephemeral key.") + .Append("Consider registering a certificate using 'services.AddOpenIddict().AddServer().AddSigningCertificate()' ") + .Append("or 'services.AddOpenIddict().AddServer().AddDevelopmentSigningCertificate()' or call ") + .Append("'services.AddOpenIddict().AddServer().AddEphemeralSigningKey()' to use an ephemeral key.") .ToString()); } diff --git a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerInitializerTests.cs b/test/OpenIddict.Server.Tests/Internal/OpenIddictServerInitializerTests.cs index 33f9e0bf..3ed140aa 100644 --- a/test/OpenIddict.Server.Tests/Internal/OpenIddictServerInitializerTests.cs +++ b/test/OpenIddict.Server.Tests/Internal/OpenIddictServerInitializerTests.cs @@ -272,9 +272,9 @@ namespace OpenIddict.Server.Tests Assert.Equal(new StringBuilder() .AppendLine("At least one signing key must be registered when using JWT as the access token format.") - .Append("Consider registering a X.509 certificate using 'services.AddOpenIddict().AddSigningCertificate()' ") - .Append("or 'services.AddOpenIddict().AddDevelopmentSigningCertificate()' or call ") - .Append("'services.AddOpenIddict().AddEphemeralSigningKey()' to use an ephemeral key.") + .Append("Consider registering a certificate using 'services.AddOpenIddict().AddServer().AddSigningCertificate()' ") + .Append("or 'services.AddOpenIddict().AddServer().AddDevelopmentSigningCertificate()' or call ") + .Append("'services.AddOpenIddict().AddServer().AddEphemeralSigningKey()' to use an ephemeral key.") .ToString(), exception.Message); } @@ -298,9 +298,9 @@ namespace OpenIddict.Server.Tests Assert.Equal(new StringBuilder() .AppendLine("At least one asymmetric signing key must be registered when enabling the implicit flow.") - .Append("Consider registering a X.509 certificate using 'services.AddOpenIddict().AddSigningCertificate()' ") - .Append("or 'services.AddOpenIddict().AddDevelopmentSigningCertificate()' or call ") - .Append("'services.AddOpenIddict().AddEphemeralSigningKey()' to use an ephemeral key.") + .Append("Consider registering a certificate using 'services.AddOpenIddict().AddServer().AddSigningCertificate()' ") + .Append("or 'services.AddOpenIddict().AddServer().AddDevelopmentSigningCertificate()' or call ") + .Append("'services.AddOpenIddict().AddServer().AddEphemeralSigningKey()' to use an ephemeral key.") .ToString(), exception.Message); }