From d87803c4ec813f42e695987830e508b24e35fde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Tue, 25 Feb 2020 23:15:18 +0100 Subject: [PATCH] Rename the default entities --- .../Controllers/AuthorizationController.cs | 12 ++-- samples/Mvc.Server/Worker.cs | 4 +- ...> OpenIddictEntityFrameworkApplication.cs} | 6 +- ...OpenIddictEntityFrameworkAuthorization.cs} | 6 +- ...e.cs => OpenIddictEntityFrameworkScope.cs} | 6 +- ...n.cs => OpenIddictEntityFrameworkToken.cs} | 6 +- ...ntityFrameworkApplicationConfiguration.cs} | 16 ++--- ...ityFrameworkAuthorizationConfiguration.cs} | 13 ++-- ...ddictEntityFrameworkScopeConfiguration.cs} | 6 +- ...ddictEntityFrameworkTokenConfiguration.cs} | 10 +-- .../OpenIddictEntityFrameworkBuilder.cs | 8 +-- .../OpenIddictEntityFrameworkExtensions.cs | 32 +++++----- .../OpenIddictEntityFrameworkHelpers.cs | 24 +++---- ...ntityFrameworkApplicationStoreResolver.cs} | 12 ++-- ...ityFrameworkAuthorizationStoreResolver.cs} | 12 ++-- ...ddictEntityFrameworkScopeStoreResolver.cs} | 12 ++-- ...ddictEntityFrameworkTokenStoreResolver.cs} | 12 ++-- ...nIddictEntityFrameworkApplicationStore.cs} | 19 +++--- ...ddictEntityFrameworkAuthorizationStore.cs} | 19 +++--- ...=> OpenIddictEntityFrameworkScopeStore.cs} | 11 ++-- ...=> OpenIddictEntityFrameworkTokenStore.cs} | 19 +++--- ...enIddictEntityFrameworkCoreApplication.cs} | 11 ++-- ...IddictEntityFrameworkCoreAuthorization.cs} | 11 ++-- ... => OpenIddictEntityFrameworkCoreScope.cs} | 6 +- ... => OpenIddictEntityFrameworkCoreToken.cs} | 8 +-- ...yFrameworkCoreApplicationConfiguration.cs} | 15 ++--- ...rameworkCoreAuthorizationConfiguration.cs} | 19 +++--- ...tEntityFrameworkCoreScopeConfiguration.cs} | 6 +- ...tEntityFrameworkCoreTokenConfiguration.cs} | 18 +++--- .../OpenIddictEntityFrameworkCoreBuilder.cs | 16 ++--- ...OpenIddictEntityFrameworkCoreCustomizer.cs | 8 +-- ...OpenIddictEntityFrameworkCoreExtensions.cs | 32 +++++----- .../OpenIddictEntityFrameworkCoreHelpers.cs | 56 ++++++++--------- ...yFrameworkCoreApplicationStoreResolver.cs} | 12 ++-- ...rameworkCoreAuthorizationStoreResolver.cs} | 12 ++-- ...tEntityFrameworkCoreScopeStoreResolver.cs} | 12 ++-- ...tEntityFrameworkCoreTokenStoreResolver.cs} | 12 ++-- ...ictEntityFrameworkCoreApplicationStore.cs} | 28 +++++---- ...tEntityFrameworkCoreAuthorizationStore.cs} | 28 +++++---- ...penIddictEntityFrameworkCoreScopeStore.cs} | 14 ++--- ...penIddictEntityFrameworkCoreTokenStore.cs} | 28 +++++---- ...ion.cs => OpenIddictMongoDbApplication.cs} | 2 +- ...n.cs => OpenIddictMongoDbAuthorization.cs} | 2 +- ...dictScope.cs => OpenIddictMongoDbScope.cs} | 2 +- ...dictToken.cs => OpenIddictMongoDbToken.cs} | 2 +- .../OpenIddictMongoDbBuilder.cs | 8 +-- .../OpenIddictMongoDbContext.cs | 40 ++++++------ .../OpenIddictMongoDbExtensions.cs | 24 +++---- ...nIddictMongoDbApplicationStoreResolver.cs} | 14 ++--- ...ddictMongoDbAuthorizationStoreResolver.cs} | 14 ++--- ...=> OpenIddictMongoDbScopeStoreResolver.cs} | 14 ++--- ...=> OpenIddictMongoDbTokenStoreResolver.cs} | 14 ++--- ...s => OpenIddictMongoDbApplicationStore.cs} | 10 +-- ...=> OpenIddictMongoDbAuthorizationStore.cs} | 12 ++-- ...tore.cs => OpenIddictMongoDbScopeStore.cs} | 6 +- ...tore.cs => OpenIddictMongoDbTokenStore.cs} | 6 +- .../OpenIddictEntityFrameworkBuilderTests.cs | 8 +-- ...penIddictEntityFrameworkExtensionsTests.cs | 32 +++++----- ...FrameworkApplicationStoreResolverTests.cs} | 30 ++++----- ...ameworkAuthorizationStoreResolverTests.cs} | 30 ++++----- ...EntityFrameworkScopeStoreResolverTests.cs} | 30 ++++----- ...EntityFrameworkTokenStoreResolverTests.cs} | 30 ++++----- ...enIddictEntityFrameworkCoreBuilderTests.cs | 16 ++--- ...ddictEntityFrameworkCoreExtensionsTests.cs | 32 +++++----- ...enIddictEntityFrameworkCoreHelpersTests.cs | 48 +++++++------- ...eworkCoreApplicationStoreResolverTests.cs} | 30 ++++----- ...orkCoreAuthorizationStoreResolverTests.cs} | 30 ++++----- ...tyFrameworkCoreScopeStoreResolverTests.cs} | 30 ++++----- ...tyFrameworkCoreTokenStoreResolverTests.cs} | 30 ++++----- .../OpenIddictMongoDbBuilderTests.cs | 8 +-- .../OpenIddictMongoDbContextTests.cs | 62 +++++++++---------- .../OpenIddictMongoDbExtensionsTests.cs | 24 +++---- ...ctMongoDbApplicationStoreResolverTests.cs} | 20 +++--- ...MongoDbAuthorizationStoreResolverTests.cs} | 20 +++--- ...enIddictMongoDbScopeStoreResolverTests.cs} | 20 +++--- ...enIddictMongoDbTokenStoreResolverTests.cs} | 20 +++--- 76 files changed, 677 insertions(+), 660 deletions(-) rename src/OpenIddict.EntityFramework.Models/{OpenIddictApplication.cs => OpenIddictEntityFrameworkApplication.cs} (91%) rename src/OpenIddict.EntityFramework.Models/{OpenIddictAuthorization.cs => OpenIddictEntityFrameworkAuthorization.cs} (88%) rename src/OpenIddict.EntityFramework.Models/{OpenIddictScope.cs => OpenIddictEntityFrameworkScope.cs} (90%) rename src/OpenIddict.EntityFramework.Models/{OpenIddictToken.cs => OpenIddictEntityFrameworkToken.cs} (90%) rename src/OpenIddict.EntityFramework/Configurations/{OpenIddictApplicationConfiguration.cs => OpenIddictEntityFrameworkApplicationConfiguration.cs} (73%) rename src/OpenIddict.EntityFramework/Configurations/{OpenIddictAuthorizationConfiguration.cs => OpenIddictEntityFrameworkAuthorizationConfiguration.cs} (75%) rename src/OpenIddict.EntityFramework/Configurations/{OpenIddictScopeConfiguration.cs => OpenIddictEntityFrameworkScopeConfiguration.cs} (87%) rename src/OpenIddict.EntityFramework/Configurations/{OpenIddictTokenConfiguration.cs => OpenIddictEntityFrameworkTokenConfiguration.cs} (82%) rename src/OpenIddict.EntityFramework/Resolvers/{OpenIddictApplicationStoreResolver.cs => OpenIddictEntityFrameworkApplicationStoreResolver.cs} (88%) rename src/OpenIddict.EntityFramework/Resolvers/{OpenIddictAuthorizationStoreResolver.cs => OpenIddictEntityFrameworkAuthorizationStoreResolver.cs} (87%) rename src/OpenIddict.EntityFramework/Resolvers/{OpenIddictScopeStoreResolver.cs => OpenIddictEntityFrameworkScopeStoreResolver.cs} (88%) rename src/OpenIddict.EntityFramework/Resolvers/{OpenIddictTokenStoreResolver.cs => OpenIddictEntityFrameworkTokenStoreResolver.cs} (88%) rename src/OpenIddict.EntityFramework/Stores/{OpenIddictApplicationStore.cs => OpenIddictEntityFrameworkApplicationStore.cs} (98%) rename src/OpenIddict.EntityFramework/Stores/{OpenIddictAuthorizationStore.cs => OpenIddictEntityFrameworkAuthorizationStore.cs} (98%) rename src/OpenIddict.EntityFramework/Stores/{OpenIddictScopeStore.cs => OpenIddictEntityFrameworkScopeStore.cs} (98%) rename src/OpenIddict.EntityFramework/Stores/{OpenIddictTokenStore.cs => OpenIddictEntityFrameworkTokenStore.cs} (98%) rename src/OpenIddict.EntityFrameworkCore.Models/{OpenIddictApplication.cs => OpenIddictEntityFrameworkCoreApplication.cs} (87%) rename src/OpenIddict.EntityFrameworkCore.Models/{OpenIddictAuthorization.cs => OpenIddictEntityFrameworkCoreAuthorization.cs} (82%) rename src/OpenIddict.EntityFrameworkCore.Models/{OpenIddictScope.cs => OpenIddictEntityFrameworkCoreScope.cs} (89%) rename src/OpenIddict.EntityFrameworkCore.Models/{OpenIddictToken.cs => OpenIddictEntityFrameworkCoreToken.cs} (86%) rename src/OpenIddict.EntityFrameworkCore/Configurations/{OpenIddictApplicationConfiguration.cs => OpenIddictEntityFrameworkCoreApplicationConfiguration.cs} (76%) rename src/OpenIddict.EntityFrameworkCore/Configurations/{OpenIddictAuthorizationConfiguration.cs => OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs} (71%) rename src/OpenIddict.EntityFrameworkCore/Configurations/{OpenIddictScopeConfiguration.cs => OpenIddictEntityFrameworkCoreScopeConfiguration.cs} (89%) rename src/OpenIddict.EntityFrameworkCore/Configurations/{OpenIddictTokenConfiguration.cs => OpenIddictEntityFrameworkCoreTokenConfiguration.cs} (75%) rename src/OpenIddict.EntityFrameworkCore/Resolvers/{OpenIddictApplicationStoreResolver.cs => OpenIddictEntityFrameworkCoreApplicationStoreResolver.cs} (87%) rename src/OpenIddict.EntityFrameworkCore/Resolvers/{OpenIddictAuthorizationStoreResolver.cs => OpenIddictEntityFrameworkCoreAuthorizationStoreResolver.cs} (87%) rename src/OpenIddict.EntityFrameworkCore/Resolvers/{OpenIddictScopeStoreResolver.cs => OpenIddictEntityFrameworkCoreScopeStoreResolver.cs} (87%) rename src/OpenIddict.EntityFrameworkCore/Resolvers/{OpenIddictTokenStoreResolver.cs => OpenIddictEntityFrameworkCoreTokenStoreResolver.cs} (88%) rename src/OpenIddict.EntityFrameworkCore/Stores/{OpenIddictApplicationStore.cs => OpenIddictEntityFrameworkCoreApplicationStore.cs} (97%) rename src/OpenIddict.EntityFrameworkCore/Stores/{OpenIddictAuthorizationStore.cs => OpenIddictEntityFrameworkCoreAuthorizationStore.cs} (97%) rename src/OpenIddict.EntityFrameworkCore/Stores/{OpenIddictScopeStore.cs => OpenIddictEntityFrameworkCoreScopeStore.cs} (97%) rename src/OpenIddict.EntityFrameworkCore/Stores/{OpenIddictTokenStore.cs => OpenIddictEntityFrameworkCoreTokenStore.cs} (97%) rename src/OpenIddict.MongoDb.Models/{OpenIddictApplication.cs => OpenIddictMongoDbApplication.cs} (98%) rename src/OpenIddict.MongoDb.Models/{OpenIddictAuthorization.cs => OpenIddictMongoDbAuthorization.cs} (98%) rename src/OpenIddict.MongoDb.Models/{OpenIddictScope.cs => OpenIddictMongoDbScope.cs} (98%) rename src/OpenIddict.MongoDb.Models/{OpenIddictToken.cs => OpenIddictMongoDbToken.cs} (98%) rename src/OpenIddict.MongoDb/Resolvers/{OpenIddictApplicationStoreResolver.cs => OpenIddictMongoDbApplicationStoreResolver.cs} (77%) rename src/OpenIddict.MongoDb/Resolvers/{OpenIddictAuthorizationStoreResolver.cs => OpenIddictMongoDbAuthorizationStoreResolver.cs} (77%) rename src/OpenIddict.MongoDb/Resolvers/{OpenIddictScopeStoreResolver.cs => OpenIddictMongoDbScopeStoreResolver.cs} (78%) rename src/OpenIddict.MongoDb/Resolvers/{OpenIddictTokenStoreResolver.cs => OpenIddictMongoDbTokenStoreResolver.cs} (78%) rename src/OpenIddict.MongoDb/Stores/{OpenIddictApplicationStore.cs => OpenIddictMongoDbApplicationStore.cs} (98%) rename src/OpenIddict.MongoDb/Stores/{OpenIddictAuthorizationStore.cs => OpenIddictMongoDbAuthorizationStore.cs} (98%) rename src/OpenIddict.MongoDb/Stores/{OpenIddictScopeStore.cs => OpenIddictMongoDbScopeStore.cs} (99%) rename src/OpenIddict.MongoDb/Stores/{OpenIddictTokenStore.cs => OpenIddictMongoDbTokenStore.cs} (99%) rename test/OpenIddict.EntityFramework.Tests/Resolvers/{OpenIddictApplicationStoreResolverTests.cs => OpenIddictEntityFrameworkApplicationStoreResolverTests.cs} (70%) rename test/OpenIddict.EntityFramework.Tests/Resolvers/{OpenIddictAuthorizationStoreResolverTests.cs => OpenIddictEntityFrameworkAuthorizationStoreResolverTests.cs} (70%) rename test/OpenIddict.EntityFramework.Tests/Resolvers/{OpenIddictScopeStoreResolverTests.cs => OpenIddictEntityFrameworkScopeStoreResolverTests.cs} (72%) rename test/OpenIddict.EntityFramework.Tests/Resolvers/{OpenIddictTokenStoreResolverTests.cs => OpenIddictEntityFrameworkTokenStoreResolverTests.cs} (71%) rename test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/{OpenIddictApplicationStoreResolverTests.cs => OpenIddictEntityFrameworkCoreApplicationStoreResolverTests.cs} (70%) rename test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/{OpenIddictAuthorizationStoreResolverTests.cs => OpenIddictEntityFrameworkCoreAuthorizationStoreResolverTests.cs} (70%) rename test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/{OpenIddictScopeStoreResolverTests.cs => OpenIddictEntityFrameworkCoreScopeStoreResolverTests.cs} (71%) rename test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/{OpenIddictTokenStoreResolverTests.cs => OpenIddictEntityFrameworkCoreTokenStoreResolverTests.cs} (70%) rename test/OpenIddict.MongoDb.Tests/Resolvers/{OpenIddictApplicationStoreResolverTests.cs => OpenIddictMongoDbApplicationStoreResolverTests.cs} (75%) rename test/OpenIddict.MongoDb.Tests/Resolvers/{OpenIddictAuthorizationStoreResolverTests.cs => OpenIddictMongoDbAuthorizationStoreResolverTests.cs} (74%) rename test/OpenIddict.MongoDb.Tests/Resolvers/{OpenIddictScopeStoreResolverTests.cs => OpenIddictMongoDbScopeStoreResolverTests.cs} (76%) rename test/OpenIddict.MongoDb.Tests/Resolvers/{OpenIddictTokenStoreResolverTests.cs => OpenIddictMongoDbTokenStoreResolverTests.cs} (76%) diff --git a/samples/Mvc.Server/Controllers/AuthorizationController.cs b/samples/Mvc.Server/Controllers/AuthorizationController.cs index 28c57fa5..7623bd8f 100644 --- a/samples/Mvc.Server/Controllers/AuthorizationController.cs +++ b/samples/Mvc.Server/Controllers/AuthorizationController.cs @@ -29,16 +29,16 @@ namespace Mvc.Server { public class AuthorizationController : Controller { - private readonly OpenIddictApplicationManager _applicationManager; - private readonly OpenIddictAuthorizationManager _authorizationManager; - private readonly OpenIddictScopeManager _scopeManager; + private readonly OpenIddictApplicationManager _applicationManager; + private readonly OpenIddictAuthorizationManager _authorizationManager; + private readonly OpenIddictScopeManager _scopeManager; private readonly SignInManager _signInManager; private readonly UserManager _userManager; public AuthorizationController( - OpenIddictApplicationManager applicationManager, - OpenIddictAuthorizationManager authorizationManager, - OpenIddictScopeManager scopeManager, + OpenIddictApplicationManager applicationManager, + OpenIddictAuthorizationManager authorizationManager, + OpenIddictScopeManager scopeManager, SignInManager signInManager, UserManager userManager) { diff --git a/samples/Mvc.Server/Worker.cs b/samples/Mvc.Server/Worker.cs index f55d6d38..c9e99996 100644 --- a/samples/Mvc.Server/Worker.cs +++ b/samples/Mvc.Server/Worker.cs @@ -30,7 +30,7 @@ namespace Mvc.Server static async Task RegisterApplicationsAsync(IServiceProvider provider) { - var manager = provider.GetRequiredService>(); + var manager = provider.GetRequiredService>(); if (await manager.FindByClientIdAsync("mvc") == null) { @@ -106,7 +106,7 @@ namespace Mvc.Server static async Task RegisterScopesAsync(IServiceProvider provider) { - var manager = provider.GetRequiredService>(); + var manager = provider.GetRequiredService>(); if (await manager.FindByNameAsync("demo_api") == null) { diff --git a/src/OpenIddict.EntityFramework.Models/OpenIddictApplication.cs b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkApplication.cs similarity index 91% rename from src/OpenIddict.EntityFramework.Models/OpenIddictApplication.cs rename to src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkApplication.cs index 69b465c3..d8812432 100644 --- a/src/OpenIddict.EntityFramework.Models/OpenIddictApplication.cs +++ b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkApplication.cs @@ -13,9 +13,9 @@ namespace OpenIddict.EntityFramework.Models /// /// Represents an OpenIddict application. /// - public class OpenIddictApplication : OpenIddictApplication + public class OpenIddictEntityFrameworkApplication : OpenIddictEntityFrameworkApplication { - public OpenIddictApplication() + public OpenIddictEntityFrameworkApplication() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -26,7 +26,7 @@ namespace OpenIddict.EntityFramework.Models /// Represents an OpenIddict application. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; ClientId = {ClientId,nq} ; Type = {Type,nq}")] - public class OpenIddictApplication where TKey : IEquatable + public class OpenIddictEntityFrameworkApplication where TKey : IEquatable { /// /// Gets the list of the authorizations associated with this application. diff --git a/src/OpenIddict.EntityFramework.Models/OpenIddictAuthorization.cs b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkAuthorization.cs similarity index 88% rename from src/OpenIddict.EntityFramework.Models/OpenIddictAuthorization.cs rename to src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkAuthorization.cs index d7996a7e..a5a5ccc4 100644 --- a/src/OpenIddict.EntityFramework.Models/OpenIddictAuthorization.cs +++ b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkAuthorization.cs @@ -13,9 +13,9 @@ namespace OpenIddict.EntityFramework.Models /// /// Represents an OpenIddict authorization. /// - public class OpenIddictAuthorization : OpenIddictAuthorization + public class OpenIddictEntityFrameworkAuthorization : OpenIddictEntityFrameworkAuthorization { - public OpenIddictAuthorization() + public OpenIddictEntityFrameworkAuthorization() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -26,7 +26,7 @@ namespace OpenIddict.EntityFramework.Models /// Represents an OpenIddict authorization. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Subject = {Subject,nq} ; Type = {Type,nq} ; Status = {Status,nq}")] - public class OpenIddictAuthorization where TKey : IEquatable + public class OpenIddictEntityFrameworkAuthorization where TKey : IEquatable { /// /// Gets or sets the application associated with the current authorization. diff --git a/src/OpenIddict.EntityFramework.Models/OpenIddictScope.cs b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkScope.cs similarity index 90% rename from src/OpenIddict.EntityFramework.Models/OpenIddictScope.cs rename to src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkScope.cs index 91d487f3..b9c14066 100644 --- a/src/OpenIddict.EntityFramework.Models/OpenIddictScope.cs +++ b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkScope.cs @@ -12,9 +12,9 @@ namespace OpenIddict.EntityFramework.Models /// /// Represents an OpenIddict scope. /// - public class OpenIddictScope : OpenIddictScope + public class OpenIddictEntityFrameworkScope : OpenIddictEntityFrameworkScope { - public OpenIddictScope() + public OpenIddictEntityFrameworkScope() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -25,7 +25,7 @@ namespace OpenIddict.EntityFramework.Models /// Represents an OpenIddict scope. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Name = {Name,nq}")] - public class OpenIddictScope where TKey : IEquatable + public class OpenIddictEntityFrameworkScope where TKey : IEquatable { /// /// Gets or sets the concurrency token. diff --git a/src/OpenIddict.EntityFramework.Models/OpenIddictToken.cs b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkToken.cs similarity index 90% rename from src/OpenIddict.EntityFramework.Models/OpenIddictToken.cs rename to src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkToken.cs index 411b9f74..ba1226d5 100644 --- a/src/OpenIddict.EntityFramework.Models/OpenIddictToken.cs +++ b/src/OpenIddict.EntityFramework.Models/OpenIddictEntityFrameworkToken.cs @@ -12,9 +12,9 @@ namespace OpenIddict.EntityFramework.Models /// /// Represents an OpenIddict token. /// - public class OpenIddictToken : OpenIddictToken + public class OpenIddictEntityFrameworkToken : OpenIddictEntityFrameworkToken { - public OpenIddictToken() + public OpenIddictEntityFrameworkToken() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -25,7 +25,7 @@ namespace OpenIddict.EntityFramework.Models /// Represents an OpenIddict token. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Subject = {Subject,nq} ; Type = {Type,nq} ; Status = {Status,nq}")] - public class OpenIddictToken where TKey : IEquatable + public class OpenIddictEntityFrameworkToken where TKey : IEquatable { /// /// Gets or sets the application associated with the current token. diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictApplicationConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs similarity index 73% rename from src/OpenIddict.EntityFramework/Configurations/OpenIddictApplicationConfiguration.cs rename to src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs index b12f18b2..2e273e6a 100644 --- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictApplicationConfiguration.cs +++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs @@ -21,13 +21,13 @@ namespace OpenIddict.EntityFramework /// The type of the Token entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictApplicationConfiguration : EntityTypeConfiguration - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkApplicationConfiguration : EntityTypeConfiguration + where TApplication : OpenIddictEntityFrameworkApplication + where TAuthorization : OpenIddictEntityFrameworkAuthorization + where TToken : OpenIddictEntityFrameworkToken where TKey : IEquatable { - public OpenIddictApplicationConfiguration() + public OpenIddictEntityFrameworkApplicationConfiguration() { // Warning: optional foreign keys MUST NOT be added as CLR properties because // Entity Framework would throw an exception due to the TKey generic parameter @@ -55,14 +55,16 @@ namespace OpenIddict.EntityFramework .WithOptional(authorization => authorization.Application) .Map(association => { - association.MapKey(nameof(OpenIddictAuthorization.Application) + nameof(OpenIddictApplication.Id)); + association.MapKey(nameof(OpenIddictEntityFrameworkAuthorization.Application) + + nameof(OpenIddictEntityFrameworkApplication.Id)); }); HasMany(application => application.Tokens) .WithOptional(token => token.Application) .Map(association => { - association.MapKey(nameof(OpenIddictToken.Application) + nameof(OpenIddictApplication.Id)); + association.MapKey(nameof(OpenIddictEntityFrameworkToken.Application) + + nameof(OpenIddictEntityFrameworkApplication.Id)); }); ToTable("OpenIddictApplications"); diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictAuthorizationConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs similarity index 75% rename from src/OpenIddict.EntityFramework/Configurations/OpenIddictAuthorizationConfiguration.cs rename to src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs index b03c91d6..e8286635 100644 --- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictAuthorizationConfiguration.cs +++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFramework /// The type of the Token entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictAuthorizationConfiguration : EntityTypeConfiguration - where TAuthorization : OpenIddictAuthorization - where TApplication : OpenIddictApplication - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkAuthorizationConfiguration : EntityTypeConfiguration + where TAuthorization : OpenIddictEntityFrameworkAuthorization + where TApplication : OpenIddictEntityFrameworkApplication + where TToken : OpenIddictEntityFrameworkToken where TKey : IEquatable { - public OpenIddictAuthorizationConfiguration() + public OpenIddictEntityFrameworkAuthorizationConfiguration() { // Warning: optional foreign keys MUST NOT be added as CLR properties because // Entity Framework would throw an exception due to the TKey generic parameter @@ -50,7 +50,8 @@ namespace OpenIddict.EntityFramework HasMany(authorization => authorization.Tokens) .WithOptional(token => token.Authorization) - .Map(association => association.MapKey(nameof(OpenIddictToken.Authorization) + nameof(OpenIddictAuthorization.Id))) + .Map(association => association.MapKey(nameof(OpenIddictEntityFrameworkToken.Authorization) + + nameof(OpenIddictEntityFrameworkAuthorization.Id))) .WillCascadeOnDelete(); ToTable("OpenIddictAuthorizations"); diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictScopeConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs similarity index 87% rename from src/OpenIddict.EntityFramework/Configurations/OpenIddictScopeConfiguration.cs rename to src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs index 4da122f6..5ca05173 100644 --- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictScopeConfiguration.cs +++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs @@ -19,11 +19,11 @@ namespace OpenIddict.EntityFramework /// The type of the Scope entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictScopeConfiguration : EntityTypeConfiguration - where TScope : OpenIddictScope + public class OpenIddictEntityFrameworkScopeConfiguration : EntityTypeConfiguration + where TScope : OpenIddictEntityFrameworkScope where TKey : IEquatable { - public OpenIddictScopeConfiguration() + public OpenIddictEntityFrameworkScopeConfiguration() { // Warning: optional foreign keys MUST NOT be added as CLR properties because // Entity Framework would throw an exception due to the TKey generic parameter diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictTokenConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs similarity index 82% rename from src/OpenIddict.EntityFramework/Configurations/OpenIddictTokenConfiguration.cs rename to src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs index c4d86b93..cea5d127 100644 --- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictTokenConfiguration.cs +++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs @@ -21,13 +21,13 @@ namespace OpenIddict.EntityFramework /// The type of the Authorization entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictTokenConfiguration : EntityTypeConfiguration - where TToken : OpenIddictToken - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization + public class OpenIddictEntityFrameworkTokenConfiguration : EntityTypeConfiguration + where TToken : OpenIddictEntityFrameworkToken + where TApplication : OpenIddictEntityFrameworkApplication + where TAuthorization : OpenIddictEntityFrameworkAuthorization where TKey : IEquatable { - public OpenIddictTokenConfiguration() + public OpenIddictEntityFrameworkTokenConfiguration() { // Warning: optional foreign keys MUST NOT be added as CLR properties because // Entity Framework would throw an exception due to the TKey generic parameter diff --git a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkBuilder.cs b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkBuilder.cs index 4d00af61..4c88011c 100644 --- a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkBuilder.cs +++ b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkBuilder.cs @@ -58,10 +58,10 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . public OpenIddictEntityFrameworkBuilder ReplaceDefaultEntities() - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TScope : OpenIddictScope - where TToken : OpenIddictToken + where TApplication : OpenIddictEntityFrameworkApplication + where TAuthorization : OpenIddictEntityFrameworkAuthorization + where TScope : OpenIddictEntityFrameworkScope + where TToken : OpenIddictEntityFrameworkToken where TKey : IEquatable { // Note: unlike Entity Framework Core 1.x/2.x/3.x, Entity Framework 6.x diff --git a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs index f2ed4313..9b4e02a8 100644 --- a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs +++ b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs @@ -36,25 +36,25 @@ namespace Microsoft.Extensions.DependencyInjection // in case case-sensitive stores were registered before this extension was called. builder.Configure(options => options.DisableAdditionalFiltering = false); - builder.SetDefaultApplicationEntity() - .SetDefaultAuthorizationEntity() - .SetDefaultScopeEntity() - .SetDefaultTokenEntity(); + builder.SetDefaultApplicationEntity() + .SetDefaultAuthorizationEntity() + .SetDefaultScopeEntity() + .SetDefaultTokenEntity(); - builder.ReplaceApplicationStoreResolver() - .ReplaceAuthorizationStoreResolver() - .ReplaceScopeStoreResolver() - .ReplaceTokenStoreResolver(); + builder.ReplaceApplicationStoreResolver() + .ReplaceAuthorizationStoreResolver() + .ReplaceScopeStoreResolver() + .ReplaceTokenStoreResolver(); - builder.Services.TryAddSingleton(); - builder.Services.TryAddSingleton(); - builder.Services.TryAddSingleton(); - builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); - builder.Services.TryAddScoped(typeof(OpenIddictApplicationStore<,,,,>)); - builder.Services.TryAddScoped(typeof(OpenIddictAuthorizationStore<,,,,>)); - builder.Services.TryAddScoped(typeof(OpenIddictScopeStore<,,>)); - builder.Services.TryAddScoped(typeof(OpenIddictTokenStore<,,,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkApplicationStore<,,,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkAuthorizationStore<,,,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkScopeStore<,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkTokenStore<,,,,>)); return new OpenIddictEntityFrameworkBuilder(builder.Services); } diff --git a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkHelpers.cs b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkHelpers.cs index d302e2e7..8c95be2b 100644 --- a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkHelpers.cs +++ b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkHelpers.cs @@ -26,10 +26,10 @@ namespace System.Data.Entity /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static DbModelBuilder UseOpenIddict([NotNull] this DbModelBuilder builder) - => builder.UseOpenIddict(); + => builder.UseOpenIddict(); /// /// Registers the OpenIddict entity sets in the Entity Framework 6.x @@ -40,10 +40,10 @@ namespace System.Data.Entity /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static DbModelBuilder UseOpenIddict([NotNull] this DbModelBuilder builder) - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TScope : OpenIddictScope - where TToken : OpenIddictToken + where TApplication : OpenIddictEntityFrameworkApplication + where TAuthorization : OpenIddictEntityFrameworkAuthorization + where TScope : OpenIddictEntityFrameworkScope + where TToken : OpenIddictEntityFrameworkToken where TKey : IEquatable { if (builder == null) @@ -52,10 +52,10 @@ namespace System.Data.Entity } builder.Configurations - .Add(new OpenIddictApplicationConfiguration()) - .Add(new OpenIddictAuthorizationConfiguration()) - .Add(new OpenIddictScopeConfiguration()) - .Add(new OpenIddictTokenConfiguration()); + .Add(new OpenIddictEntityFrameworkApplicationConfiguration()) + .Add(new OpenIddictEntityFrameworkAuthorizationConfiguration()) + .Add(new OpenIddictEntityFrameworkScopeConfiguration()) + .Add(new OpenIddictEntityFrameworkTokenConfiguration()); return builder; } diff --git a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictApplicationStoreResolver.cs b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkApplicationStoreResolver.cs similarity index 88% rename from src/OpenIddict.EntityFramework/Resolvers/OpenIddictApplicationStoreResolver.cs rename to src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkApplicationStoreResolver.cs index 05f5491d..c97e407f 100644 --- a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictApplicationStoreResolver.cs +++ b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkApplicationStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFramework /// /// Exposes a method allowing to resolve an application store. /// - public class OpenIddictApplicationStoreResolver : IOpenIddictApplicationStoreResolver + public class OpenIddictEntityFrameworkApplicationStoreResolver : IOpenIddictApplicationStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictApplicationStoreResolver( + public OpenIddictEntityFrameworkApplicationStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFramework var type = _cache.GetOrAdd(typeof(TApplication), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictApplication<,,>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkApplication<,,>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified application type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictApplication' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictApplication' entity.") + .Append("'OpenIddictEntityFrameworkApplication' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkApplication' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFramework .ToString()); } - return typeof(OpenIddictApplicationStore<,,,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkApplicationStore<,,,,>).MakeGenericType( /* TApplication: */ key, /* TAuthorization: */ root.GenericTypeArguments[1], /* TToken: */ root.GenericTypeArguments[2], diff --git a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictAuthorizationStoreResolver.cs b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkAuthorizationStoreResolver.cs similarity index 87% rename from src/OpenIddict.EntityFramework/Resolvers/OpenIddictAuthorizationStoreResolver.cs rename to src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkAuthorizationStoreResolver.cs index a037d42b..75972584 100644 --- a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictAuthorizationStoreResolver.cs +++ b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkAuthorizationStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFramework /// /// Exposes a method allowing to resolve an authorization store. /// - public class OpenIddictAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver + public class OpenIddictEntityFrameworkAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictAuthorizationStoreResolver( + public OpenIddictEntityFrameworkAuthorizationStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFramework var type = _cache.GetOrAdd(typeof(TAuthorization), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictAuthorization<,,>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkAuthorization<,,>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified authorization type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictAuthorization' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictAuthorization' entity.") + .Append("'OpenIddictEntityFrameworkAuthorization' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkAuthorization' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFramework .ToString()); } - return typeof(OpenIddictAuthorizationStore<,,,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkAuthorizationStore<,,,,>).MakeGenericType( /* TAuthorization: */ key, /* TApplication: */ root.GenericTypeArguments[1], /* TToken: */ root.GenericTypeArguments[2], diff --git a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictScopeStoreResolver.cs b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkScopeStoreResolver.cs similarity index 88% rename from src/OpenIddict.EntityFramework/Resolvers/OpenIddictScopeStoreResolver.cs rename to src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkScopeStoreResolver.cs index 74ffc732..2a381b08 100644 --- a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictScopeStoreResolver.cs +++ b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkScopeStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFramework /// /// Exposes a method allowing to resolve a scope store. /// - public class OpenIddictScopeStoreResolver : IOpenIddictScopeStoreResolver + public class OpenIddictEntityFrameworkScopeStoreResolver : IOpenIddictScopeStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictScopeStoreResolver( + public OpenIddictEntityFrameworkScopeStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFramework var type = _cache.GetOrAdd(typeof(TScope), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictScope<>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkScope<>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified scope type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictScope' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictScope' entity.") + .Append("'OpenIddictEntityFrameworkScope' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkScope' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFramework .ToString()); } - return typeof(OpenIddictScopeStore<,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkScopeStore<,,>).MakeGenericType( /* TScope: */ key, /* TContext: */ context, /* TKey: */ root.GenericTypeArguments[0]); diff --git a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictTokenStoreResolver.cs b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkTokenStoreResolver.cs similarity index 88% rename from src/OpenIddict.EntityFramework/Resolvers/OpenIddictTokenStoreResolver.cs rename to src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkTokenStoreResolver.cs index 7bd07398..80a8ce75 100644 --- a/src/OpenIddict.EntityFramework/Resolvers/OpenIddictTokenStoreResolver.cs +++ b/src/OpenIddict.EntityFramework/Resolvers/OpenIddictEntityFrameworkTokenStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFramework /// /// Exposes a method allowing to resolve a token store. /// - public class OpenIddictTokenStoreResolver : IOpenIddictTokenStoreResolver + public class OpenIddictEntityFrameworkTokenStoreResolver : IOpenIddictTokenStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictTokenStoreResolver( + public OpenIddictEntityFrameworkTokenStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFramework var type = _cache.GetOrAdd(typeof(TToken), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictToken<,,>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkToken<,,>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified token type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictToken' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictToken' entity.") + .Append("'OpenIddictEntityFrameworkToken' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkToken' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFramework .ToString()); } - return typeof(OpenIddictTokenStore<,,,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkTokenStore<,,,,>).MakeGenericType( /* TToken: */ key, /* TApplication: */ root.GenericTypeArguments[1], /* TAuthorization: */ root.GenericTypeArguments[2], diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs similarity index 98% rename from src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs rename to src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs index c0e62319..eca958f8 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs @@ -29,12 +29,13 @@ namespace OpenIddict.EntityFramework /// Provides methods allowing to manage the applications stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictApplicationStore : OpenIddictApplicationStore + public class OpenIddictEntityFrameworkApplicationStore : + OpenIddictEntityFrameworkApplicationStore where TContext : DbContext { - public OpenIddictApplicationStore( + public OpenIddictEntityFrameworkApplicationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -51,14 +52,14 @@ namespace OpenIddict.EntityFramework /// The type of the Token entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictApplicationStore : IOpenIddictApplicationStore - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkApplicationStore : IOpenIddictApplicationStore + where TApplication : OpenIddictEntityFrameworkApplication + where TAuthorization : OpenIddictEntityFrameworkAuthorization + where TToken : OpenIddictEntityFrameworkToken where TContext : DbContext where TKey : IEquatable { - public OpenIddictApplicationStore( + public OpenIddictEntityFrameworkApplicationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs similarity index 98% rename from src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs rename to src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs index 81d3122d..b2ef3062 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs @@ -29,12 +29,13 @@ namespace OpenIddict.EntityFramework /// Provides methods allowing to manage the authorizations stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictAuthorizationStore : OpenIddictAuthorizationStore + public class OpenIddictEntityFrameworkAuthorizationStore : + OpenIddictEntityFrameworkAuthorizationStore where TContext : DbContext { - public OpenIddictAuthorizationStore( + public OpenIddictEntityFrameworkAuthorizationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -51,14 +52,14 @@ namespace OpenIddict.EntityFramework /// The type of the Token entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictAuthorizationStore : IOpenIddictAuthorizationStore - where TAuthorization : OpenIddictAuthorization - where TApplication : OpenIddictApplication - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkAuthorizationStore : IOpenIddictAuthorizationStore + where TAuthorization : OpenIddictEntityFrameworkAuthorization + where TApplication : OpenIddictEntityFrameworkApplication + where TToken : OpenIddictEntityFrameworkToken where TContext : DbContext where TKey : IEquatable { - public OpenIddictAuthorizationStore( + public OpenIddictEntityFrameworkAuthorizationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkScopeStore.cs similarity index 98% rename from src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs rename to src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkScopeStore.cs index b58fc75a..3aa2aa7b 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkScopeStore.cs @@ -28,10 +28,11 @@ namespace OpenIddict.EntityFramework /// Provides methods allowing to manage the scopes stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictScopeStore : OpenIddictScopeStore + public class OpenIddictEntityFrameworkScopeStore : + OpenIddictEntityFrameworkScopeStore where TContext : DbContext { - public OpenIddictScopeStore( + public OpenIddictEntityFrameworkScopeStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -46,12 +47,12 @@ namespace OpenIddict.EntityFramework /// The type of the Scope entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictScopeStore : IOpenIddictScopeStore - where TScope : OpenIddictScope + public class OpenIddictEntityFrameworkScopeStore : IOpenIddictScopeStore + where TScope : OpenIddictEntityFrameworkScope where TContext : DbContext where TKey : IEquatable { - public OpenIddictScopeStore( + public OpenIddictEntityFrameworkScopeStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs similarity index 98% rename from src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs rename to src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs index f05efdba..826cd8bd 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs @@ -29,12 +29,13 @@ namespace OpenIddict.EntityFramework /// Provides methods allowing to manage the tokens stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictTokenStore : OpenIddictTokenStore + public class OpenIddictEntityFrameworkTokenStore : + OpenIddictEntityFrameworkTokenStore where TContext : DbContext { - public OpenIddictTokenStore( + public OpenIddictEntityFrameworkTokenStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -51,14 +52,14 @@ namespace OpenIddict.EntityFramework /// The type of the Authorization entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictTokenStore : IOpenIddictTokenStore - where TToken : OpenIddictToken - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization + public class OpenIddictEntityFrameworkTokenStore : IOpenIddictTokenStore + where TToken : OpenIddictEntityFrameworkToken + where TApplication : OpenIddictEntityFrameworkApplication + where TAuthorization : OpenIddictEntityFrameworkAuthorization where TContext : DbContext where TKey : IEquatable { - public OpenIddictTokenStore( + public OpenIddictEntityFrameworkTokenStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictApplication.cs b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreApplication.cs similarity index 87% rename from src/OpenIddict.EntityFrameworkCore.Models/OpenIddictApplication.cs rename to src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreApplication.cs index 77580530..45e86c23 100644 --- a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictApplication.cs +++ b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreApplication.cs @@ -13,9 +13,9 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict application. /// - public class OpenIddictApplication : OpenIddictApplication + public class OpenIddictEntityFrameworkCoreApplication : OpenIddictEntityFrameworkCoreApplication { - public OpenIddictApplication() + public OpenIddictEntityFrameworkCoreApplication() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -25,15 +25,16 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict application. /// - public class OpenIddictApplication : OpenIddictApplication, OpenIddictToken> + public class OpenIddictEntityFrameworkCoreApplication : OpenIddictEntityFrameworkCoreApplication, OpenIddictEntityFrameworkCoreToken> where TKey : IEquatable - { } + { + } /// /// Represents an OpenIddict application. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; ClientId = {ClientId,nq} ; Type = {Type,nq}")] - public class OpenIddictApplication where TKey : IEquatable + public class OpenIddictEntityFrameworkCoreApplication where TKey : IEquatable { /// /// Gets the list of the authorizations associated with this application. diff --git a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictAuthorization.cs b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreAuthorization.cs similarity index 82% rename from src/OpenIddict.EntityFrameworkCore.Models/OpenIddictAuthorization.cs rename to src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreAuthorization.cs index 6f4f210e..6e09f432 100644 --- a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictAuthorization.cs +++ b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreAuthorization.cs @@ -13,9 +13,9 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict authorization. /// - public class OpenIddictAuthorization : OpenIddictAuthorization + public class OpenIddictEntityFrameworkCoreAuthorization : OpenIddictEntityFrameworkCoreAuthorization { - public OpenIddictAuthorization() + public OpenIddictEntityFrameworkCoreAuthorization() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -25,15 +25,16 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict authorization. /// - public class OpenIddictAuthorization : OpenIddictAuthorization, OpenIddictToken> + public class OpenIddictEntityFrameworkCoreAuthorization : OpenIddictEntityFrameworkCoreAuthorization, OpenIddictEntityFrameworkCoreToken> where TKey : IEquatable - { } + { + } /// /// Represents an OpenIddict authorization. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Subject = {Subject,nq} ; Type = {Type,nq} ; Status = {Status,nq}")] - public class OpenIddictAuthorization where TKey : IEquatable + public class OpenIddictEntityFrameworkCoreAuthorization where TKey : IEquatable { /// /// Gets or sets the application associated with the current authorization. diff --git a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictScope.cs b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreScope.cs similarity index 89% rename from src/OpenIddict.EntityFrameworkCore.Models/OpenIddictScope.cs rename to src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreScope.cs index 0c739c04..2acac51e 100644 --- a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictScope.cs +++ b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreScope.cs @@ -12,9 +12,9 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict scope. /// - public class OpenIddictScope : OpenIddictScope + public class OpenIddictEntityFrameworkCoreScope : OpenIddictEntityFrameworkCoreScope { - public OpenIddictScope() + public OpenIddictEntityFrameworkCoreScope() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -25,7 +25,7 @@ namespace OpenIddict.EntityFrameworkCore.Models /// Represents an OpenIddict scope. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Name = {Name,nq}")] - public class OpenIddictScope where TKey : IEquatable + public class OpenIddictEntityFrameworkCoreScope where TKey : IEquatable { /// /// Gets or sets the concurrency token. diff --git a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictToken.cs b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreToken.cs similarity index 86% rename from src/OpenIddict.EntityFrameworkCore.Models/OpenIddictToken.cs rename to src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreToken.cs index 5dc84464..27114888 100644 --- a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictToken.cs +++ b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddictEntityFrameworkCoreToken.cs @@ -12,9 +12,9 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict token. /// - public class OpenIddictToken : OpenIddictToken + public class OpenIddictEntityFrameworkCoreToken : OpenIddictEntityFrameworkCoreToken { - public OpenIddictToken() + public OpenIddictEntityFrameworkCoreToken() { // Generate a new string identifier. Id = Guid.NewGuid().ToString(); @@ -24,7 +24,7 @@ namespace OpenIddict.EntityFrameworkCore.Models /// /// Represents an OpenIddict token. /// - public class OpenIddictToken : OpenIddictToken, OpenIddictAuthorization> + public class OpenIddictEntityFrameworkCoreToken : OpenIddictEntityFrameworkCoreToken, OpenIddictEntityFrameworkCoreAuthorization> where TKey : IEquatable { } @@ -33,7 +33,7 @@ namespace OpenIddict.EntityFrameworkCore.Models /// Represents an OpenIddict token. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Subject = {Subject,nq} ; Type = {Type,nq} ; Status = {Status,nq}")] - public class OpenIddictToken where TKey : IEquatable + public class OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { /// /// Gets or sets the application associated with the current token. diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictApplicationConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs similarity index 76% rename from src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictApplicationConfiguration.cs rename to src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs index fed8a7c2..84292082 100644 --- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictApplicationConfiguration.cs +++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs @@ -21,10 +21,10 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Token entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictApplicationConfiguration : IEntityTypeConfiguration - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkCoreApplicationConfiguration : IEntityTypeConfiguration + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TToken : OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { public void Configure([NotNull] EntityTypeBuilder builder) @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFrameworkCore // Warning: the non-generic overlord is deliberately used to work around // a breaking change introduced in Entity Framework Core 3.x (where a // generic entity type builder is now returned by the HasIndex() method). - builder.HasIndex(nameof(OpenIddictApplication.ClientId)) + builder.HasIndex(nameof(OpenIddictEntityFrameworkCoreApplication.ClientId)) .IsUnique(); builder.Property(application => application.ClientId) @@ -63,12 +63,13 @@ namespace OpenIddict.EntityFrameworkCore builder.HasMany(application => application.Authorizations) .WithOne(authorization => authorization.Application) - .HasForeignKey(nameof(OpenIddictAuthorization.Application) + nameof(OpenIddictApplication.Id)) + .HasForeignKey(nameof(OpenIddictEntityFrameworkCoreAuthorization.Application) + + nameof(OpenIddictEntityFrameworkCoreApplication.Id)) .IsRequired(required: false); builder.HasMany(application => application.Tokens) .WithOne(token => token.Application) - .HasForeignKey(nameof(OpenIddictToken.Application) + nameof(OpenIddictApplication.Id)) + .HasForeignKey(nameof(OpenIddictEntityFrameworkCoreToken.Application) + nameof(OpenIddictEntityFrameworkCoreApplication.Id)) .IsRequired(required: false); builder.ToTable("OpenIddictApplications"); diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictAuthorizationConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs similarity index 71% rename from src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictAuthorizationConfiguration.cs rename to src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs index 1c1ad38b..7d221db7 100644 --- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictAuthorizationConfiguration.cs +++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs @@ -21,10 +21,10 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Token entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictAuthorizationConfiguration : IEntityTypeConfiguration - where TAuthorization : OpenIddictAuthorization - where TApplication : OpenIddictApplication - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkCoreAuthorizationConfiguration : IEntityTypeConfiguration + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TToken : OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { public void Configure([NotNull] EntityTypeBuilder builder) @@ -41,10 +41,10 @@ namespace OpenIddict.EntityFrameworkCore builder.HasKey(authorization => authorization.Id); builder.HasIndex( - nameof(OpenIddictAuthorization.Application) + nameof(OpenIddictApplication.Id), - nameof(OpenIddictAuthorization.Status), - nameof(OpenIddictAuthorization.Subject), - nameof(OpenIddictAuthorization.Type)); + nameof(OpenIddictEntityFrameworkCoreAuthorization.Application) + nameof(OpenIddictEntityFrameworkCoreApplication.Id), + nameof(OpenIddictEntityFrameworkCoreAuthorization.Status), + nameof(OpenIddictEntityFrameworkCoreAuthorization.Subject), + nameof(OpenIddictEntityFrameworkCoreAuthorization.Type)); builder.Property(authorization => authorization.ConcurrencyToken) .HasMaxLength(50) @@ -66,7 +66,8 @@ namespace OpenIddict.EntityFrameworkCore builder.HasMany(authorization => authorization.Tokens) .WithOne(token => token.Authorization) - .HasForeignKey(nameof(OpenIddictToken.Authorization) + nameof(OpenIddictAuthorization.Id)) + .HasForeignKey(nameof(OpenIddictEntityFrameworkCoreToken.Authorization) + + nameof(OpenIddictEntityFrameworkCoreAuthorization.Id)) .IsRequired(required: false); builder.ToTable("OpenIddictAuthorizations"); diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictScopeConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs similarity index 89% rename from src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictScopeConfiguration.cs rename to src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs index b972d552..f44bdaa0 100644 --- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictScopeConfiguration.cs +++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs @@ -19,8 +19,8 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Scope entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictScopeConfiguration : IEntityTypeConfiguration - where TScope : OpenIddictScope + public class OpenIddictEntityFrameworkCoreScopeConfiguration : IEntityTypeConfiguration + where TScope : OpenIddictEntityFrameworkCoreScope where TKey : IEquatable { public void Configure([NotNull] EntityTypeBuilder builder) @@ -39,7 +39,7 @@ namespace OpenIddict.EntityFrameworkCore // Warning: the non-generic overlord is deliberately used to work around // a breaking change introduced in Entity Framework Core 3.x (where a // generic entity type builder is now returned by the HasIndex() method). - builder.HasIndex(nameof(OpenIddictScope.Name)) + builder.HasIndex(nameof(OpenIddictEntityFrameworkCoreScope.Name)) .IsUnique(); builder.Property(scope => scope.ConcurrencyToken) diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictTokenConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs similarity index 75% rename from src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictTokenConfiguration.cs rename to src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs index 594b1bbb..891d648a 100644 --- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictTokenConfiguration.cs +++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs @@ -21,10 +21,10 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Authorization entity. /// The type of the Key entity. [EditorBrowsable(EditorBrowsableState.Never)] - public class OpenIddictTokenConfiguration : IEntityTypeConfiguration - where TToken : OpenIddictToken - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization + public class OpenIddictEntityFrameworkCoreTokenConfiguration : IEntityTypeConfiguration + where TToken : OpenIddictEntityFrameworkCoreToken + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization where TKey : IEquatable { public void Configure([NotNull] EntityTypeBuilder builder) @@ -43,14 +43,14 @@ namespace OpenIddict.EntityFrameworkCore // Warning: the non-generic overlord is deliberately used to work around // a breaking change introduced in Entity Framework Core 3.x (where a // generic entity type builder is now returned by the HasIndex() method). - builder.HasIndex(nameof(OpenIddictToken.ReferenceId)) + builder.HasIndex(nameof(OpenIddictEntityFrameworkCoreToken.ReferenceId)) .IsUnique(); builder.HasIndex( - nameof(OpenIddictToken.Application) + nameof(OpenIddictApplication.Id), - nameof(OpenIddictToken.Status), - nameof(OpenIddictToken.Subject), - nameof(OpenIddictToken.Type)); + nameof(OpenIddictEntityFrameworkCoreToken.Application) + nameof(OpenIddictEntityFrameworkCoreApplication.Id), + nameof(OpenIddictEntityFrameworkCoreToken.Status), + nameof(OpenIddictEntityFrameworkCoreToken.Subject), + nameof(OpenIddictEntityFrameworkCoreToken.Type)); builder.Property(token => token.ConcurrencyToken) .HasMaxLength(50) diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreBuilder.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreBuilder.cs index f3f1144e..6acc5a6b 100644 --- a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreBuilder.cs +++ b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreBuilder.cs @@ -57,10 +57,10 @@ namespace Microsoft.Extensions.DependencyInjection /// The . public OpenIddictEntityFrameworkCoreBuilder ReplaceDefaultEntities() where TKey : IEquatable - => ReplaceDefaultEntities, - OpenIddictAuthorization, - OpenIddictScope, - OpenIddictToken, TKey>(); + => ReplaceDefaultEntities, + OpenIddictEntityFrameworkCoreAuthorization, + OpenIddictEntityFrameworkCoreScope, + OpenIddictEntityFrameworkCoreToken, TKey>(); /// /// Configures OpenIddict to use the specified entities, derived @@ -68,10 +68,10 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . public OpenIddictEntityFrameworkCoreBuilder ReplaceDefaultEntities() - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TScope : OpenIddictScope - where TToken : OpenIddictToken + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TScope : OpenIddictEntityFrameworkCoreScope + where TToken : OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { Services.Configure(options => diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreCustomizer.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreCustomizer.cs index d899cd30..d35a9a5a 100644 --- a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreCustomizer.cs +++ b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreCustomizer.cs @@ -17,10 +17,10 @@ namespace OpenIddict.EntityFrameworkCore /// required by the OpenIddict stack in an Entity Framework Core context. /// public class OpenIddictEntityFrameworkCoreCustomizer : RelationalModelCustomizer - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TScope : OpenIddictScope - where TToken : OpenIddictToken + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TScope : OpenIddictEntityFrameworkCoreScope + where TToken : OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { public OpenIddictEntityFrameworkCoreCustomizer([NotNull] ModelCustomizerDependencies dependencies) diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs index 90d3d156..7c9a64b2 100644 --- a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs +++ b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs @@ -36,25 +36,25 @@ namespace Microsoft.Extensions.DependencyInjection // in case case-sensitive stores were registered before this extension was called. builder.Configure(options => options.DisableAdditionalFiltering = false); - builder.SetDefaultApplicationEntity() - .SetDefaultAuthorizationEntity() - .SetDefaultScopeEntity() - .SetDefaultTokenEntity(); + builder.SetDefaultApplicationEntity() + .SetDefaultAuthorizationEntity() + .SetDefaultScopeEntity() + .SetDefaultTokenEntity(); - builder.ReplaceApplicationStoreResolver() - .ReplaceAuthorizationStoreResolver() - .ReplaceScopeStoreResolver() - .ReplaceTokenStoreResolver(); + builder.ReplaceApplicationStoreResolver() + .ReplaceAuthorizationStoreResolver() + .ReplaceScopeStoreResolver() + .ReplaceTokenStoreResolver(); - builder.Services.TryAddSingleton(); - builder.Services.TryAddSingleton(); - builder.Services.TryAddSingleton(); - builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); + builder.Services.TryAddSingleton(); - builder.Services.TryAddScoped(typeof(OpenIddictApplicationStore<,,,,>)); - builder.Services.TryAddScoped(typeof(OpenIddictAuthorizationStore<,,,,>)); - builder.Services.TryAddScoped(typeof(OpenIddictScopeStore<,,>)); - builder.Services.TryAddScoped(typeof(OpenIddictTokenStore<,,,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkCoreApplicationStore<,,,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkCoreAuthorizationStore<,,,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkCoreScopeStore<,,>)); + builder.Services.TryAddScoped(typeof(OpenIddictEntityFrameworkCoreTokenStore<,,,,>)); return new OpenIddictEntityFrameworkCoreBuilder(builder.Services); } diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreHelpers.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreHelpers.cs index 8acbe973..fd599f1f 100644 --- a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreHelpers.cs +++ b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreHelpers.cs @@ -28,10 +28,10 @@ namespace Microsoft.EntityFrameworkCore /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static DbContextOptionsBuilder UseOpenIddict([NotNull] this DbContextOptionsBuilder builder) - => builder.UseOpenIddict(); + => builder.UseOpenIddict(); /// /// Registers the OpenIddict entity sets in the Entity Framework Core @@ -41,10 +41,10 @@ namespace Microsoft.EntityFrameworkCore /// The Entity Framework context builder. public static DbContextOptionsBuilder UseOpenIddict([NotNull] this DbContextOptionsBuilder builder) where TKey : IEquatable - => builder.UseOpenIddict, - OpenIddictAuthorization, - OpenIddictScope, - OpenIddictToken, TKey>(); + => builder.UseOpenIddict, + OpenIddictEntityFrameworkCoreAuthorization, + OpenIddictEntityFrameworkCoreScope, + OpenIddictEntityFrameworkCoreToken, TKey>(); /// /// Registers the OpenIddict entity sets in the Entity Framework Core @@ -53,10 +53,10 @@ namespace Microsoft.EntityFrameworkCore /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static DbContextOptionsBuilder UseOpenIddict([NotNull] this DbContextOptionsBuilder builder) - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TScope : OpenIddictScope - where TToken : OpenIddictToken + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TScope : OpenIddictEntityFrameworkCoreScope + where TToken : OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { if (builder == null) @@ -75,10 +75,10 @@ namespace Microsoft.EntityFrameworkCore /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static ModelBuilder UseOpenIddict([NotNull] this ModelBuilder builder) - => builder.UseOpenIddict(); + => builder.UseOpenIddict(); /// /// Registers the OpenIddict entity sets in the Entity Framework Core @@ -87,10 +87,10 @@ namespace Microsoft.EntityFrameworkCore /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static ModelBuilder UseOpenIddict([NotNull] this ModelBuilder builder) where TKey : IEquatable - => builder.UseOpenIddict, - OpenIddictAuthorization, - OpenIddictScope, - OpenIddictToken, TKey>(); + => builder.UseOpenIddict, + OpenIddictEntityFrameworkCoreAuthorization, + OpenIddictEntityFrameworkCoreScope, + OpenIddictEntityFrameworkCoreToken, TKey>(); /// /// Registers the OpenIddict entity sets in the Entity Framework Core @@ -99,10 +99,10 @@ namespace Microsoft.EntityFrameworkCore /// The builder used to configure the Entity Framework context. /// The Entity Framework context builder. public static ModelBuilder UseOpenIddict([NotNull] this ModelBuilder builder) - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TScope : OpenIddictScope - where TToken : OpenIddictToken + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TScope : OpenIddictEntityFrameworkCoreScope + where TToken : OpenIddictEntityFrameworkCoreToken where TKey : IEquatable { if (builder == null) @@ -111,10 +111,10 @@ namespace Microsoft.EntityFrameworkCore } return builder - .ApplyConfiguration(new OpenIddictApplicationConfiguration()) - .ApplyConfiguration(new OpenIddictAuthorizationConfiguration()) - .ApplyConfiguration(new OpenIddictScopeConfiguration()) - .ApplyConfiguration(new OpenIddictTokenConfiguration()); + .ApplyConfiguration(new OpenIddictEntityFrameworkCoreApplicationConfiguration()) + .ApplyConfiguration(new OpenIddictEntityFrameworkCoreAuthorizationConfiguration()) + .ApplyConfiguration(new OpenIddictEntityFrameworkCoreScopeConfiguration()) + .ApplyConfiguration(new OpenIddictEntityFrameworkCoreTokenConfiguration()); } #if !SUPPORTS_BCL_ASYNC_ENUMERABLE diff --git a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictApplicationStoreResolver.cs b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreApplicationStoreResolver.cs similarity index 87% rename from src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictApplicationStoreResolver.cs rename to src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreApplicationStoreResolver.cs index 4441aafb..4086f0b7 100644 --- a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictApplicationStoreResolver.cs +++ b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreApplicationStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFrameworkCore /// /// Exposes a method allowing to resolve an application store. /// - public class OpenIddictApplicationStoreResolver : IOpenIddictApplicationStoreResolver + public class OpenIddictEntityFrameworkCoreApplicationStoreResolver : IOpenIddictApplicationStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictApplicationStoreResolver( + public OpenIddictEntityFrameworkCoreApplicationStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFrameworkCore var type = _cache.GetOrAdd(typeof(TApplication), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictApplication<,,>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkCoreApplication<,,>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified application type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictApplication' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictApplication' entity.") + .Append("'OpenIddictEntityFrameworkCoreApplication' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreApplication' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFrameworkCore .ToString()); } - return typeof(OpenIddictApplicationStore<,,,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkCoreApplicationStore<,,,,>).MakeGenericType( /* TApplication: */ key, /* TAuthorization: */ root.GenericTypeArguments[1], /* TToken: */ root.GenericTypeArguments[2], diff --git a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictAuthorizationStoreResolver.cs b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreAuthorizationStoreResolver.cs similarity index 87% rename from src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictAuthorizationStoreResolver.cs rename to src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreAuthorizationStoreResolver.cs index eda0e4d8..8039ee01 100644 --- a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictAuthorizationStoreResolver.cs +++ b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreAuthorizationStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFrameworkCore /// /// Exposes a method allowing to resolve an authorization store. /// - public class OpenIddictAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver + public class OpenIddictEntityFrameworkCoreAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictAuthorizationStoreResolver( + public OpenIddictEntityFrameworkCoreAuthorizationStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFrameworkCore var type = _cache.GetOrAdd(typeof(TAuthorization), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictAuthorization<,,>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkCoreAuthorization<,,>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified authorization type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictAuthorization' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictAuthorization' entity.") + .Append("'OpenIddictEntityFrameworkCoreAuthorization' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreAuthorization' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFrameworkCore .ToString()); } - return typeof(OpenIddictAuthorizationStore<,,,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkCoreAuthorizationStore<,,,,>).MakeGenericType( /* TAuthorization: */ key, /* TApplication: */ root.GenericTypeArguments[1], /* TToken: */ root.GenericTypeArguments[2], diff --git a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictScopeStoreResolver.cs b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreScopeStoreResolver.cs similarity index 87% rename from src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictScopeStoreResolver.cs rename to src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreScopeStoreResolver.cs index ed65f16a..1a5fcf61 100644 --- a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictScopeStoreResolver.cs +++ b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreScopeStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFrameworkCore /// /// Exposes a method allowing to resolve a scope store. /// - public class OpenIddictScopeStoreResolver : IOpenIddictScopeStoreResolver + public class OpenIddictEntityFrameworkCoreScopeStoreResolver : IOpenIddictScopeStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictScopeStoreResolver( + public OpenIddictEntityFrameworkCoreScopeStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFrameworkCore var type = _cache.GetOrAdd(typeof(TScope), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictScope<>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkCoreScope<>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified scope type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictScope' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictScope' entity.") + .Append("'OpenIddictEntityFrameworkCoreScope' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreScope' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFrameworkCore .ToString()); } - return typeof(OpenIddictScopeStore<,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkCoreScopeStore<,,>).MakeGenericType( /* TScope: */ key, /* TContext: */ context, /* TKey: */ root.GenericTypeArguments[0]); diff --git a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictTokenStoreResolver.cs b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreTokenStoreResolver.cs similarity index 88% rename from src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictTokenStoreResolver.cs rename to src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreTokenStoreResolver.cs index 07c3304a..e1cfa2a0 100644 --- a/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictTokenStoreResolver.cs +++ b/src/OpenIddict.EntityFrameworkCore/Resolvers/OpenIddictEntityFrameworkCoreTokenStoreResolver.cs @@ -19,13 +19,13 @@ namespace OpenIddict.EntityFrameworkCore /// /// Exposes a method allowing to resolve a token store. /// - public class OpenIddictTokenStoreResolver : IOpenIddictTokenStoreResolver + public class OpenIddictEntityFrameworkCoreTokenStoreResolver : IOpenIddictTokenStoreResolver { private readonly TypeResolutionCache _cache; private readonly IOptionsMonitor _options; private readonly IServiceProvider _provider; - public OpenIddictTokenStoreResolver( + public OpenIddictEntityFrameworkCoreTokenStoreResolver( [NotNull] TypeResolutionCache cache, [NotNull] IOptionsMonitor options, [NotNull] IServiceProvider provider) @@ -51,14 +51,14 @@ namespace OpenIddict.EntityFrameworkCore var type = _cache.GetOrAdd(typeof(TToken), key => { - var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictToken<,,>)); + var root = OpenIddictHelpers.FindGenericBaseType(key, typeof(OpenIddictEntityFrameworkCoreToken<,,>)); if (root == null) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified token type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictToken' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictToken' entity.") + .Append("'OpenIddictEntityFrameworkCoreToken' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreToken' entity.") .ToString()); } @@ -72,7 +72,7 @@ namespace OpenIddict.EntityFrameworkCore .ToString()); } - return typeof(OpenIddictTokenStore<,,,,>).MakeGenericType( + return typeof(OpenIddictEntityFrameworkCoreTokenStore<,,,,>).MakeGenericType( /* TToken: */ key, /* TApplication: */ root.GenericTypeArguments[1], /* TAuthorization: */ root.GenericTypeArguments[2], diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs similarity index 97% rename from src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs rename to src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs index b2996ac6..14b974eb 100644 --- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs +++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs @@ -30,12 +30,13 @@ namespace OpenIddict.EntityFrameworkCore /// Provides methods allowing to manage the applications stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictApplicationStore : OpenIddictApplicationStore + public class OpenIddictEntityFrameworkCoreApplicationStore : + OpenIddictEntityFrameworkCoreApplicationStore where TContext : DbContext { - public OpenIddictApplicationStore( + public OpenIddictEntityFrameworkCoreApplicationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -49,13 +50,14 @@ namespace OpenIddict.EntityFrameworkCore /// /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictApplicationStore : OpenIddictApplicationStore, - OpenIddictAuthorization, - OpenIddictToken, TContext, TKey> + public class OpenIddictEntityFrameworkCoreApplicationStore : + OpenIddictEntityFrameworkCoreApplicationStore, + OpenIddictEntityFrameworkCoreAuthorization, + OpenIddictEntityFrameworkCoreToken, TContext, TKey> where TContext : DbContext where TKey : IEquatable { - public OpenIddictApplicationStore( + public OpenIddictEntityFrameworkCoreApplicationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -72,14 +74,14 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Token entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictApplicationStore : IOpenIddictApplicationStore - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkCoreApplicationStore : IOpenIddictApplicationStore + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TToken : OpenIddictEntityFrameworkCoreToken where TContext : DbContext where TKey : IEquatable { - public OpenIddictApplicationStore( + public OpenIddictEntityFrameworkCoreApplicationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs similarity index 97% rename from src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs rename to src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs index bbe00c50..1dc7043e 100644 --- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs +++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs @@ -30,12 +30,13 @@ namespace OpenIddict.EntityFrameworkCore /// Provides methods allowing to manage the authorizations stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictAuthorizationStore : OpenIddictAuthorizationStore + public class OpenIddictEntityFrameworkCoreAuthorizationStore : + OpenIddictEntityFrameworkCoreAuthorizationStore where TContext : DbContext { - public OpenIddictAuthorizationStore( + public OpenIddictEntityFrameworkCoreAuthorizationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -49,13 +50,14 @@ namespace OpenIddict.EntityFrameworkCore /// /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictAuthorizationStore : OpenIddictAuthorizationStore, - OpenIddictApplication, - OpenIddictToken, TContext, TKey> + public class OpenIddictEntityFrameworkCoreAuthorizationStore : + OpenIddictEntityFrameworkCoreAuthorizationStore, + OpenIddictEntityFrameworkCoreApplication, + OpenIddictEntityFrameworkCoreToken, TContext, TKey> where TContext : DbContext where TKey : IEquatable { - public OpenIddictAuthorizationStore( + public OpenIddictEntityFrameworkCoreAuthorizationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -72,14 +74,14 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Token entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictAuthorizationStore : IOpenIddictAuthorizationStore - where TAuthorization : OpenIddictAuthorization - where TApplication : OpenIddictApplication - where TToken : OpenIddictToken + public class OpenIddictEntityFrameworkCoreAuthorizationStore : IOpenIddictAuthorizationStore + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TToken : OpenIddictEntityFrameworkCoreToken where TContext : DbContext where TKey : IEquatable { - public OpenIddictAuthorizationStore( + public OpenIddictEntityFrameworkCoreAuthorizationStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreScopeStore.cs similarity index 97% rename from src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs rename to src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreScopeStore.cs index 1489511a..ba081f04 100644 --- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs +++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreScopeStore.cs @@ -27,10 +27,10 @@ namespace OpenIddict.EntityFrameworkCore /// Provides methods allowing to manage the scopes stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictScopeStore : OpenIddictScopeStore + public class OpenIddictEntityFrameworkCoreScopeStore : OpenIddictEntityFrameworkCoreScopeStore where TContext : DbContext { - public OpenIddictScopeStore( + public OpenIddictEntityFrameworkCoreScopeStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -44,11 +44,11 @@ namespace OpenIddict.EntityFrameworkCore /// /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictScopeStore : OpenIddictScopeStore, TContext, TKey> + public class OpenIddictEntityFrameworkCoreScopeStore : OpenIddictEntityFrameworkCoreScopeStore, TContext, TKey> where TContext : DbContext where TKey : IEquatable { - public OpenIddictScopeStore( + public OpenIddictEntityFrameworkCoreScopeStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -63,12 +63,12 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Scope entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictScopeStore : IOpenIddictScopeStore - where TScope : OpenIddictScope + public class OpenIddictEntityFrameworkCoreScopeStore : IOpenIddictScopeStore + where TScope : OpenIddictEntityFrameworkCoreScope where TContext : DbContext where TKey : IEquatable { - public OpenIddictScopeStore( + public OpenIddictEntityFrameworkCoreScopeStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs similarity index 97% rename from src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs rename to src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs index 12c10f13..5d8b9659 100644 --- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs +++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs @@ -30,12 +30,13 @@ namespace OpenIddict.EntityFrameworkCore /// Provides methods allowing to manage the tokens stored in a database. /// /// The type of the Entity Framework database context. - public class OpenIddictTokenStore : OpenIddictTokenStore + public class OpenIddictEntityFrameworkCoreTokenStore : + OpenIddictEntityFrameworkCoreTokenStore where TContext : DbContext { - public OpenIddictTokenStore( + public OpenIddictEntityFrameworkCoreTokenStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -49,13 +50,14 @@ namespace OpenIddict.EntityFrameworkCore /// /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictTokenStore : OpenIddictTokenStore, - OpenIddictApplication, - OpenIddictAuthorization, TContext, TKey> + public class OpenIddictEntityFrameworkCoreTokenStore : + OpenIddictEntityFrameworkCoreTokenStore, + OpenIddictEntityFrameworkCoreApplication, + OpenIddictEntityFrameworkCoreAuthorization, TContext, TKey> where TContext : DbContext where TKey : IEquatable { - public OpenIddictTokenStore( + public OpenIddictEntityFrameworkCoreTokenStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) @@ -72,14 +74,14 @@ namespace OpenIddict.EntityFrameworkCore /// The type of the Authorization entity. /// The type of the Entity Framework database context. /// The type of the entity primary keys. - public class OpenIddictTokenStore : IOpenIddictTokenStore - where TToken : OpenIddictToken - where TApplication : OpenIddictApplication - where TAuthorization : OpenIddictAuthorization + public class OpenIddictEntityFrameworkCoreTokenStore : IOpenIddictTokenStore + where TToken : OpenIddictEntityFrameworkCoreToken + where TApplication : OpenIddictEntityFrameworkCoreApplication + where TAuthorization : OpenIddictEntityFrameworkCoreAuthorization where TContext : DbContext where TKey : IEquatable { - public OpenIddictTokenStore( + public OpenIddictEntityFrameworkCoreTokenStore( [NotNull] IMemoryCache cache, [NotNull] TContext context, [NotNull] IOptionsMonitor options) diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictApplication.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs similarity index 98% rename from src/OpenIddict.MongoDb.Models/OpenIddictApplication.cs rename to src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs index d5e44628..e885c4a5 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictApplication.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs @@ -15,7 +15,7 @@ namespace OpenIddict.MongoDb.Models /// Represents an OpenIddict application. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; ClientId = {ClientId,nq} ; Type = {Type,nq}")] - public class OpenIddictApplication + public class OpenIddictMongoDbApplication { /// /// Gets or sets the client identifier diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictAuthorization.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs similarity index 98% rename from src/OpenIddict.MongoDb.Models/OpenIddictAuthorization.cs rename to src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs index 6eba16fa..9a6be32b 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictAuthorization.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs @@ -15,7 +15,7 @@ namespace OpenIddict.MongoDb.Models /// Represents an OpenIddict authorization. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Subject = {Subject,nq} ; Type = {Type,nq} ; Status = {Status,nq}")] - public class OpenIddictAuthorization + public class OpenIddictMongoDbAuthorization { /// /// Gets or sets the identifier of the application diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictScope.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs similarity index 98% rename from src/OpenIddict.MongoDb.Models/OpenIddictScope.cs rename to src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs index c1cb4939..413e50fd 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictScope.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs @@ -15,7 +15,7 @@ namespace OpenIddict.MongoDb.Models /// Represents an OpenIddict scope. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Name = {Name,nq}")] - public class OpenIddictScope + public class OpenIddictMongoDbScope { /// /// Gets or sets the concurrency token. diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictToken.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbToken.cs similarity index 98% rename from src/OpenIddict.MongoDb.Models/OpenIddictToken.cs rename to src/OpenIddict.MongoDb.Models/OpenIddictMongoDbToken.cs index 65ed4398..c99dd550 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictToken.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbToken.cs @@ -15,7 +15,7 @@ namespace OpenIddict.MongoDb.Models /// Represents an OpenIddict token. /// [DebuggerDisplay("Id = {Id.ToString(),nq} ; Subject = {Subject,nq} ; Type = {Type,nq} ; Status = {Status,nq}")] - public class OpenIddictToken + public class OpenIddictMongoDbToken { /// /// Gets or sets the identifier of the application associated with the current token. diff --git a/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs b/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs index d944d860..ce1a896a 100644 --- a/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs +++ b/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs @@ -63,7 +63,7 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . public OpenIddictMongoDbBuilder ReplaceDefaultApplicationEntity() - where TApplication : OpenIddictApplication + where TApplication : OpenIddictMongoDbApplication { Services.Configure(options => options.DefaultApplicationType = typeof(TApplication)); @@ -75,7 +75,7 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . public OpenIddictMongoDbBuilder ReplaceDefaultAuthorizationEntity() - where TAuthorization : OpenIddictAuthorization + where TAuthorization : OpenIddictMongoDbAuthorization { Services.Configure(options => options.DefaultAuthorizationType = typeof(TAuthorization)); @@ -87,7 +87,7 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . public OpenIddictMongoDbBuilder ReplaceDefaultScopeEntity() - where TScope : OpenIddictScope + where TScope : OpenIddictMongoDbScope { Services.Configure(options => options.DefaultScopeType = typeof(TScope)); @@ -99,7 +99,7 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . public OpenIddictMongoDbBuilder ReplaceDefaultTokenEntity() - where TToken : OpenIddictToken + where TToken : OpenIddictMongoDbToken { Services.Configure(options => options.DefaultTokenType = typeof(TToken)); diff --git a/src/OpenIddict.MongoDb/OpenIddictMongoDbContext.cs b/src/OpenIddict.MongoDb/OpenIddictMongoDbContext.cs index 9e987266..2cb654df 100644 --- a/src/OpenIddict.MongoDb/OpenIddictMongoDbContext.cs +++ b/src/OpenIddict.MongoDb/OpenIddictMongoDbContext.cs @@ -98,34 +98,34 @@ namespace OpenIddict.MongoDb { // Note: the cancellation token passed as a parameter is deliberately not used here to ensure // the cancellation of a single store operation doesn't prevent the indexes from being created. - var applications = database.GetCollection(options.ApplicationsCollectionName); + var applications = database.GetCollection(options.ApplicationsCollectionName); await applications.Indexes.CreateManyAsync(new[] { - new CreateIndexModel( - Builders.IndexKeys.Ascending(application => application.ClientId), + new CreateIndexModel( + Builders.IndexKeys.Ascending(application => application.ClientId), new CreateIndexOptions { Unique = true }), - new CreateIndexModel( - Builders.IndexKeys.Ascending(application => application.PostLogoutRedirectUris), + new CreateIndexModel( + Builders.IndexKeys.Ascending(application => application.PostLogoutRedirectUris), new CreateIndexOptions { Background = true }), - new CreateIndexModel( - Builders.IndexKeys.Ascending(application => application.RedirectUris), + new CreateIndexModel( + Builders.IndexKeys.Ascending(application => application.RedirectUris), new CreateIndexOptions { Background = true }) }); - var authorizations = database.GetCollection(options.AuthorizationsCollectionName); - await authorizations.Indexes.CreateOneAsync(new CreateIndexModel( - Builders.IndexKeys + var authorizations = database.GetCollection(options.AuthorizationsCollectionName); + await authorizations.Indexes.CreateOneAsync(new CreateIndexModel( + Builders.IndexKeys .Ascending(authorization => authorization.ApplicationId) .Ascending(authorization => authorization.Scopes) .Ascending(authorization => authorization.Status) @@ -136,27 +136,27 @@ namespace OpenIddict.MongoDb Background = true })); - var scopes = database.GetCollection(options.ScopesCollectionName); - await scopes.Indexes.CreateOneAsync(new CreateIndexModel( - Builders.IndexKeys.Ascending(scope => scope.Name), + var scopes = database.GetCollection(options.ScopesCollectionName); + await scopes.Indexes.CreateOneAsync(new CreateIndexModel( + Builders.IndexKeys.Ascending(scope => scope.Name), new CreateIndexOptions { Unique = true })); - var tokens = database.GetCollection(options.TokensCollectionName); + var tokens = database.GetCollection(options.TokensCollectionName); await tokens.Indexes.CreateManyAsync(new[] { - new CreateIndexModel( - Builders.IndexKeys.Ascending(token => token.ReferenceId), - new CreateIndexOptions + new CreateIndexModel( + Builders.IndexKeys.Ascending(token => token.ReferenceId), + new CreateIndexOptions { - PartialFilterExpression = Builders.Filter.Exists(token => token.ReferenceId), + PartialFilterExpression = Builders.Filter.Exists(token => token.ReferenceId), Unique = true }), - new CreateIndexModel( - Builders.IndexKeys + new CreateIndexModel( + Builders.IndexKeys .Ascending(token => token.ApplicationId) .Ascending(token => token.Status) .Ascending(token => token.Subject) diff --git a/src/OpenIddict.MongoDb/OpenIddictMongoDbExtensions.cs b/src/OpenIddict.MongoDb/OpenIddictMongoDbExtensions.cs index 2cba60c4..fb60a184 100644 --- a/src/OpenIddict.MongoDb/OpenIddictMongoDbExtensions.cs +++ b/src/OpenIddict.MongoDb/OpenIddictMongoDbExtensions.cs @@ -35,22 +35,22 @@ namespace Microsoft.Extensions.DependencyInjection // query filtering applied by the default OpenIddict managers can be safely disabled. builder.DisableAdditionalFiltering(); - builder.SetDefaultApplicationEntity() - .SetDefaultAuthorizationEntity() - .SetDefaultScopeEntity() - .SetDefaultTokenEntity(); + builder.SetDefaultApplicationEntity() + .SetDefaultAuthorizationEntity() + .SetDefaultScopeEntity() + .SetDefaultTokenEntity(); // Note: the Mongo stores/resolvers don't depend on scoped/transient services and thus // can be safely registered as singleton services and shared/reused across requests. - builder.ReplaceApplicationStoreResolver(ServiceLifetime.Singleton) - .ReplaceAuthorizationStoreResolver(ServiceLifetime.Singleton) - .ReplaceScopeStoreResolver(ServiceLifetime.Singleton) - .ReplaceTokenStoreResolver(ServiceLifetime.Singleton); + builder.ReplaceApplicationStoreResolver(ServiceLifetime.Singleton) + .ReplaceAuthorizationStoreResolver(ServiceLifetime.Singleton) + .ReplaceScopeStoreResolver(ServiceLifetime.Singleton) + .ReplaceTokenStoreResolver(ServiceLifetime.Singleton); - builder.Services.TryAddSingleton(typeof(OpenIddictApplicationStore<>)); - builder.Services.TryAddSingleton(typeof(OpenIddictAuthorizationStore<>)); - builder.Services.TryAddSingleton(typeof(OpenIddictScopeStore<>)); - builder.Services.TryAddSingleton(typeof(OpenIddictTokenStore<>)); + builder.Services.TryAddSingleton(typeof(OpenIddictMongoDbApplicationStore<>)); + builder.Services.TryAddSingleton(typeof(OpenIddictMongoDbAuthorizationStore<>)); + builder.Services.TryAddSingleton(typeof(OpenIddictMongoDbScopeStore<>)); + builder.Services.TryAddSingleton(typeof(OpenIddictMongoDbTokenStore<>)); builder.Services.TryAddSingleton(); diff --git a/src/OpenIddict.MongoDb/Resolvers/OpenIddictApplicationStoreResolver.cs b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbApplicationStoreResolver.cs similarity index 77% rename from src/OpenIddict.MongoDb/Resolvers/OpenIddictApplicationStoreResolver.cs rename to src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbApplicationStoreResolver.cs index 65bf330e..0d0a7cf9 100644 --- a/src/OpenIddict.MongoDb/Resolvers/OpenIddictApplicationStoreResolver.cs +++ b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbApplicationStoreResolver.cs @@ -17,12 +17,12 @@ namespace OpenIddict.MongoDb /// /// Exposes a method allowing to resolve an application store. /// - public class OpenIddictApplicationStoreResolver : IOpenIddictApplicationStoreResolver + public class OpenIddictMongoDbApplicationStoreResolver : IOpenIddictApplicationStoreResolver { private readonly ConcurrentDictionary _cache = new ConcurrentDictionary(); private readonly IServiceProvider _provider; - public OpenIddictApplicationStoreResolver([NotNull] IServiceProvider provider) + public OpenIddictMongoDbApplicationStoreResolver([NotNull] IServiceProvider provider) => _provider = provider; /// @@ -41,17 +41,17 @@ namespace OpenIddict.MongoDb var type = _cache.GetOrAdd(typeof(TApplication), key => { - if (!typeof(OpenIddictApplication).IsAssignableFrom(key)) + if (!typeof(OpenIddictMongoDbApplication).IsAssignableFrom(key)) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified application type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictApplication' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictApplication' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbApplication' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbApplication' entity.") .ToString()); } - return typeof(OpenIddictApplicationStore<>).MakeGenericType(key); + return typeof(OpenIddictMongoDbApplicationStore<>).MakeGenericType(key); }); return (IOpenIddictApplicationStore) _provider.GetRequiredService(type); diff --git a/src/OpenIddict.MongoDb/Resolvers/OpenIddictAuthorizationStoreResolver.cs b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbAuthorizationStoreResolver.cs similarity index 77% rename from src/OpenIddict.MongoDb/Resolvers/OpenIddictAuthorizationStoreResolver.cs rename to src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbAuthorizationStoreResolver.cs index 2ea3773e..f4668025 100644 --- a/src/OpenIddict.MongoDb/Resolvers/OpenIddictAuthorizationStoreResolver.cs +++ b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbAuthorizationStoreResolver.cs @@ -17,12 +17,12 @@ namespace OpenIddict.MongoDb /// /// Exposes a method allowing to resolve an authorization store. /// - public class OpenIddictAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver + public class OpenIddictMongoDbAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver { private readonly ConcurrentDictionary _cache = new ConcurrentDictionary(); private readonly IServiceProvider _provider; - public OpenIddictAuthorizationStoreResolver([NotNull] IServiceProvider provider) + public OpenIddictMongoDbAuthorizationStoreResolver([NotNull] IServiceProvider provider) => _provider = provider; /// @@ -41,17 +41,17 @@ namespace OpenIddict.MongoDb var type = _cache.GetOrAdd(typeof(TAuthorization), key => { - if (!typeof(OpenIddictAuthorization).IsAssignableFrom(key)) + if (!typeof(OpenIddictMongoDbAuthorization).IsAssignableFrom(key)) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified authorization type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictAuthorization' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictAuthorization' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbAuthorization' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbAuthorization' entity.") .ToString()); } - return typeof(OpenIddictAuthorizationStore<>).MakeGenericType(key); + return typeof(OpenIddictMongoDbAuthorizationStore<>).MakeGenericType(key); }); return (IOpenIddictAuthorizationStore) _provider.GetRequiredService(type); diff --git a/src/OpenIddict.MongoDb/Resolvers/OpenIddictScopeStoreResolver.cs b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbScopeStoreResolver.cs similarity index 78% rename from src/OpenIddict.MongoDb/Resolvers/OpenIddictScopeStoreResolver.cs rename to src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbScopeStoreResolver.cs index 557725f4..59df8e04 100644 --- a/src/OpenIddict.MongoDb/Resolvers/OpenIddictScopeStoreResolver.cs +++ b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbScopeStoreResolver.cs @@ -17,12 +17,12 @@ namespace OpenIddict.MongoDb /// /// Exposes a method allowing to resolve a scope store. /// - public class OpenIddictScopeStoreResolver : IOpenIddictScopeStoreResolver + public class OpenIddictMongoDbScopeStoreResolver : IOpenIddictScopeStoreResolver { private readonly ConcurrentDictionary _cache = new ConcurrentDictionary(); private readonly IServiceProvider _provider; - public OpenIddictScopeStoreResolver([NotNull] IServiceProvider provider) + public OpenIddictMongoDbScopeStoreResolver([NotNull] IServiceProvider provider) => _provider = provider; /// @@ -41,17 +41,17 @@ namespace OpenIddict.MongoDb var type = _cache.GetOrAdd(typeof(TScope), key => { - if (!typeof(OpenIddictScope).IsAssignableFrom(key)) + if (!typeof(OpenIddictMongoDbScope).IsAssignableFrom(key)) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified scope type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictScope' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictScope' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbScope' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbScope' entity.") .ToString()); } - return typeof(OpenIddictScopeStore<>).MakeGenericType(key); + return typeof(OpenIddictMongoDbScopeStore<>).MakeGenericType(key); }); return (IOpenIddictScopeStore) _provider.GetRequiredService(type); diff --git a/src/OpenIddict.MongoDb/Resolvers/OpenIddictTokenStoreResolver.cs b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbTokenStoreResolver.cs similarity index 78% rename from src/OpenIddict.MongoDb/Resolvers/OpenIddictTokenStoreResolver.cs rename to src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbTokenStoreResolver.cs index 8ee68132..24273380 100644 --- a/src/OpenIddict.MongoDb/Resolvers/OpenIddictTokenStoreResolver.cs +++ b/src/OpenIddict.MongoDb/Resolvers/OpenIddictMongoDbTokenStoreResolver.cs @@ -17,12 +17,12 @@ namespace OpenIddict.MongoDb /// /// Exposes a method allowing to resolve a token store. /// - public class OpenIddictTokenStoreResolver : IOpenIddictTokenStoreResolver + public class OpenIddictMongoDbTokenStoreResolver : IOpenIddictTokenStoreResolver { private readonly ConcurrentDictionary _cache = new ConcurrentDictionary(); private readonly IServiceProvider _provider; - public OpenIddictTokenStoreResolver([NotNull] IServiceProvider provider) + public OpenIddictMongoDbTokenStoreResolver([NotNull] IServiceProvider provider) => _provider = provider; /// @@ -41,17 +41,17 @@ namespace OpenIddict.MongoDb var type = _cache.GetOrAdd(typeof(TToken), key => { - if (!typeof(OpenIddictToken).IsAssignableFrom(key)) + if (!typeof(OpenIddictMongoDbToken).IsAssignableFrom(key)) { throw new InvalidOperationException(new StringBuilder() .AppendLine("The specified token type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictToken' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictToken' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbToken' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbToken' entity.") .ToString()); } - return typeof(OpenIddictTokenStore<>).MakeGenericType(key); + return typeof(OpenIddictMongoDbTokenStore<>).MakeGenericType(key); }); return (IOpenIddictTokenStore) _provider.GetRequiredService(type); diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs similarity index 98% rename from src/OpenIddict.MongoDb/Stores/OpenIddictApplicationStore.cs rename to src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs index 90589a33..2a43f1d4 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictApplicationStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs @@ -28,10 +28,10 @@ namespace OpenIddict.MongoDb /// Provides methods allowing to manage the applications stored in a database. /// /// The type of the Application entity. - public class OpenIddictApplicationStore : IOpenIddictApplicationStore - where TApplication : OpenIddictApplication + public class OpenIddictMongoDbApplicationStore : IOpenIddictApplicationStore + where TApplication : OpenIddictMongoDbApplication { - public OpenIddictApplicationStore( + public OpenIddictMongoDbApplicationStore( [NotNull] IOpenIddictMongoDbContext context, [NotNull] IOptionsMonitor options) { @@ -135,11 +135,11 @@ namespace OpenIddict.MongoDb } // Delete the authorizations associated with the application. - await database.GetCollection(Options.CurrentValue.AuthorizationsCollectionName) + await database.GetCollection(Options.CurrentValue.AuthorizationsCollectionName) .DeleteManyAsync(authorization => authorization.ApplicationId == application.Id, cancellationToken); // Delete the tokens associated with the application. - await database.GetCollection(Options.CurrentValue.TokensCollectionName) + await database.GetCollection(Options.CurrentValue.TokensCollectionName) .DeleteManyAsync(token => token.ApplicationId == application.Id, cancellationToken); } diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs similarity index 98% rename from src/OpenIddict.MongoDb/Stores/OpenIddictAuthorizationStore.cs rename to src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs index 51d17a60..32fa2262 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictAuthorizationStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs @@ -28,10 +28,10 @@ namespace OpenIddict.MongoDb /// Provides methods allowing to manage the authorizations stored in a database. /// /// The type of the Authorization entity. - public class OpenIddictAuthorizationStore : IOpenIddictAuthorizationStore - where TAuthorization : OpenIddictAuthorization + public class OpenIddictMongoDbAuthorizationStore : IOpenIddictAuthorizationStore + where TAuthorization : OpenIddictMongoDbAuthorization { - public OpenIddictAuthorizationStore( + public OpenIddictMongoDbAuthorizationStore( [NotNull] IOpenIddictMongoDbContext context, [NotNull] IOptionsMonitor options) { @@ -135,7 +135,7 @@ namespace OpenIddict.MongoDb } // Delete the tokens associated with the authorization. - await database.GetCollection(Options.CurrentValue.TokensCollectionName) + await database.GetCollection(Options.CurrentValue.TokensCollectionName) .DeleteManyAsync(token => token.AuthorizationId == authorization.Id, cancellationToken); } @@ -685,7 +685,7 @@ namespace OpenIddict.MongoDb var identifiers = await (from authorization in collection.AsQueryable() - join token in database.GetCollection(Options.CurrentValue.TokensCollectionName).AsQueryable() + join token in database.GetCollection(Options.CurrentValue.TokensCollectionName).AsQueryable() on authorization.Id equals token.AuthorizationId into tokens where authorization.Status != OpenIddictConstants.Statuses.Valid || (authorization.Type == OpenIddictConstants.AuthorizationTypes.AdHoc && @@ -700,7 +700,7 @@ namespace OpenIddict.MongoDb await collection.DeleteManyAsync(authorization => buffer.Contains(authorization.Id)); // Delete the tokens associated with the pruned authorizations. - await database.GetCollection(Options.CurrentValue.TokensCollectionName) + await database.GetCollection(Options.CurrentValue.TokensCollectionName) .DeleteManyAsync(token => buffer.Contains(token.AuthorizationId), cancellationToken); } diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs similarity index 99% rename from src/OpenIddict.MongoDb/Stores/OpenIddictScopeStore.cs rename to src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs index 80c25a0e..39320f18 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictScopeStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs @@ -28,10 +28,10 @@ namespace OpenIddict.MongoDb /// Provides methods allowing to manage the scopes stored in a database. /// /// The type of the Scope entity. - public class OpenIddictScopeStore : IOpenIddictScopeStore - where TScope : OpenIddictScope + public class OpenIddictMongoDbScopeStore : IOpenIddictScopeStore + where TScope : OpenIddictMongoDbScope { - public OpenIddictScopeStore( + public OpenIddictMongoDbScopeStore( [NotNull] IOpenIddictMongoDbContext context, [NotNull] IOptionsMonitor options) { diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbTokenStore.cs similarity index 99% rename from src/OpenIddict.MongoDb/Stores/OpenIddictTokenStore.cs rename to src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbTokenStore.cs index 7fa9aca2..2f72b41e 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictTokenStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbTokenStore.cs @@ -28,10 +28,10 @@ namespace OpenIddict.MongoDb /// Provides methods allowing to manage the tokens stored in a database. /// /// The type of the Token entity. - public class OpenIddictTokenStore : IOpenIddictTokenStore - where TToken : OpenIddictToken + public class OpenIddictMongoDbTokenStore : IOpenIddictTokenStore + where TToken : OpenIddictMongoDbToken { - public OpenIddictTokenStore( + public OpenIddictMongoDbTokenStore( [NotNull] IOpenIddictMongoDbContext context, [NotNull] IOptionsMonitor options) { diff --git a/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkBuilderTests.cs b/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkBuilderTests.cs index 254ff436..85447019 100644 --- a/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkBuilderTests.cs +++ b/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkBuilderTests.cs @@ -125,10 +125,10 @@ namespace OpenIddict.EntityFramework.Tests return services; } - public class CustomApplication : OpenIddictApplication { } - public class CustomAuthorization : OpenIddictAuthorization { } - public class CustomScope : OpenIddictScope { } - public class CustomToken : OpenIddictToken { } + public class CustomApplication : OpenIddictEntityFrameworkApplication { } + public class CustomAuthorization : OpenIddictEntityFrameworkAuthorization { } + public class CustomScope : OpenIddictEntityFrameworkScope { } + public class CustomToken : OpenIddictEntityFrameworkToken { } public class CustomDbContext : DbContext { diff --git a/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkExtensionsTests.cs b/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkExtensionsTests.cs index 3e893833..eb3f8c25 100644 --- a/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkExtensionsTests.cs +++ b/test/OpenIddict.EntityFramework.Tests/OpenIddictEntityFrameworkExtensionsTests.cs @@ -55,17 +55,17 @@ namespace OpenIddict.EntityFramework.Tests var provider = services.BuildServiceProvider(); var options = provider.GetRequiredService>().CurrentValue; - Assert.Equal(typeof(OpenIddictApplication), options.DefaultApplicationType); - Assert.Equal(typeof(OpenIddictAuthorization), options.DefaultAuthorizationType); - Assert.Equal(typeof(OpenIddictScope), options.DefaultScopeType); - Assert.Equal(typeof(OpenIddictToken), options.DefaultTokenType); + Assert.Equal(typeof(OpenIddictEntityFrameworkApplication), options.DefaultApplicationType); + Assert.Equal(typeof(OpenIddictEntityFrameworkAuthorization), options.DefaultAuthorizationType); + Assert.Equal(typeof(OpenIddictEntityFrameworkScope), options.DefaultScopeType); + Assert.Equal(typeof(OpenIddictEntityFrameworkToken), options.DefaultTokenType); } [Theory] - [InlineData(typeof(IOpenIddictApplicationStoreResolver), typeof(OpenIddictApplicationStoreResolver))] - [InlineData(typeof(IOpenIddictAuthorizationStoreResolver), typeof(OpenIddictAuthorizationStoreResolver))] - [InlineData(typeof(IOpenIddictScopeStoreResolver), typeof(OpenIddictScopeStoreResolver))] - [InlineData(typeof(IOpenIddictTokenStoreResolver), typeof(OpenIddictTokenStoreResolver))] + [InlineData(typeof(IOpenIddictApplicationStoreResolver), typeof(OpenIddictEntityFrameworkApplicationStoreResolver))] + [InlineData(typeof(IOpenIddictAuthorizationStoreResolver), typeof(OpenIddictEntityFrameworkAuthorizationStoreResolver))] + [InlineData(typeof(IOpenIddictScopeStoreResolver), typeof(OpenIddictEntityFrameworkScopeStoreResolver))] + [InlineData(typeof(IOpenIddictTokenStoreResolver), typeof(OpenIddictEntityFrameworkTokenStoreResolver))] public void UseEntityFramework_RegistersEntityFrameworkStoreResolvers(Type serviceType, Type implementationType) { // Arrange @@ -81,10 +81,10 @@ namespace OpenIddict.EntityFramework.Tests } [Theory] - [InlineData(typeof(OpenIddictApplicationStoreResolver.TypeResolutionCache))] - [InlineData(typeof(OpenIddictAuthorizationStoreResolver.TypeResolutionCache))] - [InlineData(typeof(OpenIddictScopeStoreResolver.TypeResolutionCache))] - [InlineData(typeof(OpenIddictTokenStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkApplicationStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkAuthorizationStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkScopeStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkTokenStoreResolver.TypeResolutionCache))] public void UseEntityFramework_RegistersEntityFrameworkStoreResolverCaches(Type type) { // Arrange @@ -100,10 +100,10 @@ namespace OpenIddict.EntityFramework.Tests } [Theory] - [InlineData(typeof(OpenIddictApplicationStore<,,,,>))] - [InlineData(typeof(OpenIddictAuthorizationStore<,,,,>))] - [InlineData(typeof(OpenIddictScopeStore<,,>))] - [InlineData(typeof(OpenIddictTokenStore<,,,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkApplicationStore<,,,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkAuthorizationStore<,,,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkScopeStore<,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkTokenStore<,,,,>))] public void UseEntityFramework_RegistersEntityFrameworkStore(Type type) { // Arrange diff --git a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkApplicationStoreResolverTests.cs similarity index 70% rename from test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs rename to test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkApplicationStoreResolverTests.cs index f623d3c1..b748a960 100644 --- a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs +++ b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkApplicationStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFramework.Models; using Xunit; -using static OpenIddict.EntityFramework.OpenIddictApplicationStoreResolver; +using static OpenIddict.EntityFramework.OpenIddictEntityFrameworkApplicationStoreResolver; namespace OpenIddict.EntityFramework.Tests { - public class OpenIddictApplicationStoreResolverTests + public class OpenIddictEntityFrameworkApplicationStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFramework.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified application type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictApplication' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictApplication' entity.") + .Append("'OpenIddictEntityFrameworkApplication' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkApplication' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework 6.x context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictApplicationStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkApplicationStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomApplication { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkAuthorization { } + public class MyScope : OpenIddictEntityFrameworkScope { } + public class MyToken : OpenIddictEntityFrameworkToken { } } } diff --git a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkAuthorizationStoreResolverTests.cs similarity index 70% rename from test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs rename to test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkAuthorizationStoreResolverTests.cs index 329dd09e..0da4a977 100644 --- a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs +++ b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkAuthorizationStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFramework.Models; using Xunit; -using static OpenIddict.EntityFramework.OpenIddictAuthorizationStoreResolver; +using static OpenIddict.EntityFramework.OpenIddictEntityFrameworkAuthorizationStoreResolver; namespace OpenIddict.EntityFramework.Tests { - public class OpenIddictAuthorizationStoreResolverTests + public class OpenIddictEntityFrameworkAuthorizationStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFramework.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified authorization type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictAuthorization' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictAuthorization' entity.") + .Append("'OpenIddictEntityFrameworkAuthorization' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkAuthorization' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework 6.x context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictAuthorizationStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkAuthorizationStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomAuthorization { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkAuthorization { } + public class MyScope : OpenIddictEntityFrameworkScope { } + public class MyToken : OpenIddictEntityFrameworkToken { } } } diff --git a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkScopeStoreResolverTests.cs similarity index 72% rename from test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs rename to test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkScopeStoreResolverTests.cs index 8d3db847..5edf1293 100644 --- a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs +++ b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkScopeStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFramework.Models; using Xunit; -using static OpenIddict.EntityFramework.OpenIddictScopeStoreResolver; +using static OpenIddict.EntityFramework.OpenIddictEntityFrameworkScopeStoreResolver; namespace OpenIddict.EntityFramework.Tests { - public class OpenIddictScopeStoreResolverTests + public class OpenIddictEntityFrameworkScopeStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFramework.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified scope type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictScope' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictScope' entity.") + .Append("'OpenIddictEntityFrameworkScope' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkScope' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework 6.x context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictScopeStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkScopeStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomScope { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkAuthorization { } + public class MyScope : OpenIddictEntityFrameworkScope { } + public class MyToken : OpenIddictEntityFrameworkToken { } } } diff --git a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkTokenStoreResolverTests.cs similarity index 71% rename from test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs rename to test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkTokenStoreResolverTests.cs index 6903d605..e1b3044f 100644 --- a/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs +++ b/test/OpenIddict.EntityFramework.Tests/Resolvers/OpenIddictEntityFrameworkTokenStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFramework.Models; using Xunit; -using static OpenIddict.EntityFramework.OpenIddictTokenStoreResolver; +using static OpenIddict.EntityFramework.OpenIddictEntityFrameworkTokenStoreResolver; namespace OpenIddict.EntityFramework.Tests { - public class OpenIddictTokenStoreResolverTests + public class OpenIddictEntityFrameworkTokenStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFramework.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFramework.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified token type is not compatible with the Entity Framework 6.x stores.") .Append("When enabling the Entity Framework 6.x stores, make sure you use the built-in ") - .Append("'OpenIddictToken' entity (from the 'OpenIddict.EntityFramework.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictToken' entity.") + .Append("'OpenIddictEntityFrameworkToken' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkToken' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework 6.x context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFramework.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictTokenStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkTokenStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomToken { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkAuthorization { } + public class MyScope : OpenIddictEntityFrameworkScope { } + public class MyToken : OpenIddictEntityFrameworkToken { } } } diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreBuilderTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreBuilderTests.cs index e14cbb39..5bf55021 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreBuilderTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreBuilderTests.cs @@ -62,10 +62,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests var provider = services.BuildServiceProvider(); var options = provider.GetRequiredService>().CurrentValue; - Assert.Equal(typeof(OpenIddictApplication), options.DefaultApplicationType); - Assert.Equal(typeof(OpenIddictAuthorization), options.DefaultAuthorizationType); - Assert.Equal(typeof(OpenIddictScope), options.DefaultScopeType); - Assert.Equal(typeof(OpenIddictToken), options.DefaultTokenType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreApplication), options.DefaultApplicationType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreAuthorization), options.DefaultAuthorizationType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreScope), options.DefaultScopeType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreToken), options.DefaultTokenType); } [Fact] @@ -129,10 +129,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests return services; } - public class CustomApplication : OpenIddictApplication { } - public class CustomAuthorization : OpenIddictAuthorization { } - public class CustomScope : OpenIddictScope { } - public class CustomToken : OpenIddictToken { } + public class CustomApplication : OpenIddictEntityFrameworkCoreApplication { } + public class CustomAuthorization : OpenIddictEntityFrameworkCoreAuthorization { } + public class CustomScope : OpenIddictEntityFrameworkCoreScope { } + public class CustomToken : OpenIddictEntityFrameworkCoreToken { } public class CustomDbContext : DbContext { diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreExtensionsTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreExtensionsTests.cs index 6b2222b6..92b75956 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreExtensionsTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreExtensionsTests.cs @@ -55,17 +55,17 @@ namespace OpenIddict.EntityFrameworkCore.Tests var provider = services.BuildServiceProvider(); var options = provider.GetRequiredService>().CurrentValue; - Assert.Equal(typeof(OpenIddictApplication), options.DefaultApplicationType); - Assert.Equal(typeof(OpenIddictAuthorization), options.DefaultAuthorizationType); - Assert.Equal(typeof(OpenIddictScope), options.DefaultScopeType); - Assert.Equal(typeof(OpenIddictToken), options.DefaultTokenType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreApplication), options.DefaultApplicationType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreAuthorization), options.DefaultAuthorizationType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreScope), options.DefaultScopeType); + Assert.Equal(typeof(OpenIddictEntityFrameworkCoreToken), options.DefaultTokenType); } [Theory] - [InlineData(typeof(IOpenIddictApplicationStoreResolver), typeof(OpenIddictApplicationStoreResolver))] - [InlineData(typeof(IOpenIddictAuthorizationStoreResolver), typeof(OpenIddictAuthorizationStoreResolver))] - [InlineData(typeof(IOpenIddictScopeStoreResolver), typeof(OpenIddictScopeStoreResolver))] - [InlineData(typeof(IOpenIddictTokenStoreResolver), typeof(OpenIddictTokenStoreResolver))] + [InlineData(typeof(IOpenIddictApplicationStoreResolver), typeof(OpenIddictEntityFrameworkCoreApplicationStoreResolver))] + [InlineData(typeof(IOpenIddictAuthorizationStoreResolver), typeof(OpenIddictEntityFrameworkCoreAuthorizationStoreResolver))] + [InlineData(typeof(IOpenIddictScopeStoreResolver), typeof(OpenIddictEntityFrameworkCoreScopeStoreResolver))] + [InlineData(typeof(IOpenIddictTokenStoreResolver), typeof(OpenIddictEntityFrameworkCoreTokenStoreResolver))] public void UseEntityFrameworkCore_RegistersEntityFrameworkCoreStoreResolvers(Type serviceType, Type implementationType) { // Arrange @@ -81,10 +81,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests } [Theory] - [InlineData(typeof(OpenIddictApplicationStoreResolver.TypeResolutionCache))] - [InlineData(typeof(OpenIddictAuthorizationStoreResolver.TypeResolutionCache))] - [InlineData(typeof(OpenIddictScopeStoreResolver.TypeResolutionCache))] - [InlineData(typeof(OpenIddictTokenStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreApplicationStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreAuthorizationStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreScopeStoreResolver.TypeResolutionCache))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreTokenStoreResolver.TypeResolutionCache))] public void UseEntityFrameworkCore_RegistersEntityFrameworkCoreStoreResolverCaches(Type type) { // Arrange @@ -100,10 +100,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests } [Theory] - [InlineData(typeof(OpenIddictApplicationStore<,,,,>))] - [InlineData(typeof(OpenIddictAuthorizationStore<,,,,>))] - [InlineData(typeof(OpenIddictScopeStore<,,>))] - [InlineData(typeof(OpenIddictTokenStore<,,,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreApplicationStore<,,,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreAuthorizationStore<,,,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreScopeStore<,,>))] + [InlineData(typeof(OpenIddictEntityFrameworkCoreTokenStore<,,,,>))] public void UseEntityFrameworkCore_RegistersEntityFrameworkCoreStore(Type type) { // Arrange diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreHelpersTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreHelpersTests.cs index 4b02396a..8424e22f 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreHelpersTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictEntityFrameworkCoreHelpersTests.cs @@ -20,13 +20,13 @@ namespace OpenIddict.EntityFrameworkCore.Tests { // Arrange var builder = new Mock(new ConventionSet()); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) .Returns(builder.Object); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) .Returns(builder.Object); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) .Returns(builder.Object); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>())) .Returns(builder.Object); // Act @@ -34,13 +34,13 @@ namespace OpenIddict.EntityFrameworkCore.Tests // Assert builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); } [Fact] @@ -48,13 +48,13 @@ namespace OpenIddict.EntityFrameworkCore.Tests { // Arrange var builder = new Mock(new ConventionSet()); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) .Returns(builder.Object); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) .Returns(builder.Object); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) .Returns(builder.Object); - builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) + builder.Setup(mock => mock.ApplyConfiguration(It.IsAny>>())) .Returns(builder.Object); // Act @@ -62,13 +62,13 @@ namespace OpenIddict.EntityFrameworkCore.Tests // Assert builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny, OpenIddictAuthorization, OpenIddictToken, long>>()), Times.Once()); + It.IsAny, OpenIddictEntityFrameworkCoreAuthorization, OpenIddictEntityFrameworkCoreToken, long>>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny, OpenIddictApplication, OpenIddictToken, long>>()), Times.Once()); + It.IsAny, OpenIddictEntityFrameworkCoreApplication, OpenIddictEntityFrameworkCoreToken, long>>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny, long>>()), Times.Once()); + It.IsAny, long>>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny, OpenIddictApplication, OpenIddictAuthorization, long>>()), Times.Once()); + It.IsAny, OpenIddictEntityFrameworkCoreApplication, OpenIddictEntityFrameworkCoreAuthorization, long>>()), Times.Once()); } [Fact] @@ -90,18 +90,18 @@ namespace OpenIddict.EntityFrameworkCore.Tests // Assert builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); builder.Verify(mock => mock.ApplyConfiguration( - It.IsAny>()), Times.Once()); + It.IsAny>()), Times.Once()); } - public class CustomApplication : OpenIddictApplication { } - public class CustomAuthorization : OpenIddictAuthorization { } - public class CustomScope : OpenIddictScope { } - public class CustomToken : OpenIddictToken { } + public class CustomApplication : OpenIddictEntityFrameworkCoreApplication { } + public class CustomAuthorization : OpenIddictEntityFrameworkCoreAuthorization { } + public class CustomScope : OpenIddictEntityFrameworkCoreScope { } + public class CustomToken : OpenIddictEntityFrameworkCoreToken { } } } diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreApplicationStoreResolverTests.cs similarity index 70% rename from test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs rename to test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreApplicationStoreResolverTests.cs index 2fefb1b1..6015c205 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreApplicationStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFrameworkCore.Models; using Xunit; -using static OpenIddict.EntityFrameworkCore.OpenIddictApplicationStoreResolver; +using static OpenIddict.EntityFrameworkCore.OpenIddictEntityFrameworkCoreApplicationStoreResolver; namespace OpenIddict.EntityFrameworkCore.Tests { - public class OpenIddictApplicationStoreResolverTests + public class OpenIddictEntityFrameworkCoreApplicationStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFrameworkCore.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified application type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictApplication' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictApplication' entity.") + .Append("'OpenIddictEntityFrameworkCoreApplication' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreApplication' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework Core context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreApplicationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictApplicationStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkCoreApplicationStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomApplication { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkCoreApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkCoreAuthorization { } + public class MyScope : OpenIddictEntityFrameworkCoreScope { } + public class MyToken : OpenIddictEntityFrameworkCoreToken { } } } diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreAuthorizationStoreResolverTests.cs similarity index 70% rename from test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs rename to test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreAuthorizationStoreResolverTests.cs index e58821fc..ceaa108e 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreAuthorizationStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFrameworkCore.Models; using Xunit; -using static OpenIddict.EntityFrameworkCore.OpenIddictAuthorizationStoreResolver; +using static OpenIddict.EntityFrameworkCore.OpenIddictEntityFrameworkCoreAuthorizationStoreResolver; namespace OpenIddict.EntityFrameworkCore.Tests { - public class OpenIddictAuthorizationStoreResolverTests + public class OpenIddictEntityFrameworkCoreAuthorizationStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFrameworkCore.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified authorization type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictAuthorization' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictAuthorization' entity.") + .Append("'OpenIddictEntityFrameworkCoreAuthorization' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreAuthorization' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework Core context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreAuthorizationStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictAuthorizationStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkCoreAuthorizationStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomAuthorization { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkCoreApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkCoreAuthorization { } + public class MyScope : OpenIddictEntityFrameworkCoreScope { } + public class MyToken : OpenIddictEntityFrameworkCoreToken { } } } diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreScopeStoreResolverTests.cs similarity index 71% rename from test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs rename to test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreScopeStoreResolverTests.cs index 89fea545..f4c0c8a7 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreScopeStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFrameworkCore.Models; using Xunit; -using static OpenIddict.EntityFrameworkCore.OpenIddictScopeStoreResolver; +using static OpenIddict.EntityFrameworkCore.OpenIddictEntityFrameworkCoreScopeStoreResolver; namespace OpenIddict.EntityFrameworkCore.Tests { - public class OpenIddictScopeStoreResolverTests + public class OpenIddictEntityFrameworkCoreScopeStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFrameworkCore.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified scope type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictScope' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictScope' entity.") + .Append("'OpenIddictEntityFrameworkCoreScope' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreScope' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework Core context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreScopeStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictScopeStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkCoreScopeStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomScope { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkCoreApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkCoreAuthorization { } + public class MyScope : OpenIddictEntityFrameworkCoreScope { } + public class MyToken : OpenIddictEntityFrameworkCoreToken { } } } diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreTokenStoreResolverTests.cs similarity index 70% rename from test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs rename to test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreTokenStoreResolverTests.cs index db5a2db1..809b795f 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/Resolvers/OpenIddictEntityFrameworkCoreTokenStoreResolverTests.cs @@ -14,11 +14,11 @@ using Moq; using OpenIddict.Abstractions; using OpenIddict.EntityFrameworkCore.Models; using Xunit; -using static OpenIddict.EntityFrameworkCore.OpenIddictTokenStoreResolver; +using static OpenIddict.EntityFrameworkCore.OpenIddictEntityFrameworkCoreTokenStoreResolver; namespace OpenIddict.EntityFrameworkCore.Tests { - public class OpenIddictTokenStoreResolverTests + public class OpenIddictEntityFrameworkCoreTokenStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -29,7 +29,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -43,7 +43,7 @@ namespace OpenIddict.EntityFrameworkCore.Tests var options = Mock.Of>(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); @@ -51,8 +51,8 @@ namespace OpenIddict.EntityFrameworkCore.Tests Assert.Equal(new StringBuilder() .AppendLine("The specified token type is not compatible with the Entity Framework Core stores.") .Append("When enabling the Entity Framework Core stores, make sure you use the built-in ") - .Append("'OpenIddictToken' entity (from the 'OpenIddict.EntityFrameworkCore.Models' package) ") - .Append("or a custom entity that inherits from the generic 'OpenIddictToken' entity.") + .Append("'OpenIddictEntityFrameworkCoreToken' entity or a custom entity that inherits ") + .Append("from the generic 'OpenIddictEntityFrameworkCoreToken' entity.") .ToString(), exception.Message); } @@ -69,10 +69,10 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert - var exception = Assert.Throws(() => resolver.Get()); + var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("No Entity Framework Core context was specified in the OpenIddict options.") @@ -96,23 +96,23 @@ namespace OpenIddict.EntityFrameworkCore.Tests }); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(new TypeResolutionCache(), options, provider); + var resolver = new OpenIddictEntityFrameworkCoreTokenStoreResolver(new TypeResolutionCache(), options, provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictTokenStore CreateStore() - => new Mock>( + private static OpenIddictEntityFrameworkCoreTokenStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of(), Mock.Of>()).Object; public class CustomToken { } - public class MyApplication : OpenIddictApplication { } - public class MyAuthorization : OpenIddictAuthorization { } - public class MyScope : OpenIddictScope { } - public class MyToken : OpenIddictToken { } + public class MyApplication : OpenIddictEntityFrameworkCoreApplication { } + public class MyAuthorization : OpenIddictEntityFrameworkCoreAuthorization { } + public class MyScope : OpenIddictEntityFrameworkCoreScope { } + public class MyToken : OpenIddictEntityFrameworkCoreToken { } } } diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs index 14bd3e93..124161e5 100644 --- a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs +++ b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs @@ -308,9 +308,9 @@ namespace OpenIddict.MongoDb.Tests return services; } - public class CustomApplication : OpenIddictApplication { } - public class CustomAuthorization : OpenIddictAuthorization { } - public class CustomScope : OpenIddictScope { } - public class CustomToken : OpenIddictToken { } + public class CustomApplication : OpenIddictMongoDbApplication { } + public class CustomAuthorization : OpenIddictMongoDbAuthorization { } + public class CustomScope : OpenIddictMongoDbScope { } + public class CustomToken : OpenIddictMongoDbToken { } } } diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbContextTests.cs b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbContextTests.cs index 830c67c0..ad1bcd56 100644 --- a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbContextTests.cs +++ b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbContextTests.cs @@ -69,20 +69,20 @@ namespace OpenIddict.MongoDb.Tests var services = new ServiceCollection(); var provider = services.BuildServiceProvider(); - var manager = new Mock>(); - manager.Setup(mock => mock.CreateManyAsync(It.IsAny>>(), It.IsAny())) + var manager = new Mock>(); + manager.Setup(mock => mock.CreateManyAsync(It.IsAny>>(), It.IsAny())) .Returns(async delegate { await Task.Delay(TimeSpan.FromMilliseconds(1000)); return new[] { string.Empty }; }); - var collection = new Mock>(); + var collection = new Mock>(); collection.SetupGet(mock => mock.Indexes) .Returns(manager.Object); var database = GetDatabase(); - database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) + database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) .Returns(collection.Object); var options = Mock.Of>( @@ -208,10 +208,10 @@ namespace OpenIddict.MongoDb.Tests await context.GetDatabaseAsync(CancellationToken.None); // Assert - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Never()); } [Fact] @@ -234,10 +234,10 @@ namespace OpenIddict.MongoDb.Tests Assert.Same(database.Object, await context.GetDatabaseAsync(CancellationToken.None)); Assert.Same(database.Object, await context.GetDatabaseAsync(CancellationToken.None)); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); } [Fact] @@ -249,12 +249,12 @@ namespace OpenIddict.MongoDb.Tests var count = 0; - var collection = new Mock>(); + var collection = new Mock>(); collection.SetupGet(mock => mock.Indexes) - .Returns(Mock.Of>()); + .Returns(Mock.Of>()); var database = GetDatabase(); - database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) + database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) .Callback(() => count++) .Returns(delegate { @@ -278,38 +278,38 @@ namespace OpenIddict.MongoDb.Tests await Assert.ThrowsAsync(async () => await context.GetDatabaseAsync(CancellationToken.None)); Assert.Same(database.Object, await context.GetDatabaseAsync(CancellationToken.None)); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Exactly(2)); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); - database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Exactly(2)); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); + database.Verify(mock => mock.GetCollection(It.IsAny(), It.IsAny()), Times.Once()); } private static Mock GetDatabase() { - var applications = new Mock>(); + var applications = new Mock>(); applications.SetupGet(mock => mock.Indexes) - .Returns(Mock.Of>()); + .Returns(Mock.Of>()); - var authorizations = new Mock>(); + var authorizations = new Mock>(); authorizations.SetupGet(mock => mock.Indexes) - .Returns(Mock.Of>()); + .Returns(Mock.Of>()); - var scopes = new Mock>(); + var scopes = new Mock>(); scopes.SetupGet(mock => mock.Indexes) - .Returns(Mock.Of>()); + .Returns(Mock.Of>()); - var tokens = new Mock>(); + var tokens = new Mock>(); tokens.SetupGet(mock => mock.Indexes) - .Returns(Mock.Of>()); + .Returns(Mock.Of>()); var database = new Mock(); - database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) + database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) .Returns(applications.Object); - database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) + database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) .Returns(authorizations.Object); - database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) + database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) .Returns(scopes.Object); - database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) + database.Setup(mock => mock.GetCollection(It.IsAny(), It.IsAny())) .Returns(tokens.Object); return database; diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs index 32f839ff..38120f37 100644 --- a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs +++ b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs @@ -55,17 +55,17 @@ namespace OpenIddict.MongoDb.Tests var provider = services.BuildServiceProvider(); var options = provider.GetRequiredService>().CurrentValue; - Assert.Equal(typeof(OpenIddictApplication), options.DefaultApplicationType); - Assert.Equal(typeof(OpenIddictAuthorization), options.DefaultAuthorizationType); - Assert.Equal(typeof(OpenIddictScope), options.DefaultScopeType); - Assert.Equal(typeof(OpenIddictToken), options.DefaultTokenType); + Assert.Equal(typeof(OpenIddictMongoDbApplication), options.DefaultApplicationType); + Assert.Equal(typeof(OpenIddictMongoDbAuthorization), options.DefaultAuthorizationType); + Assert.Equal(typeof(OpenIddictMongoDbScope), options.DefaultScopeType); + Assert.Equal(typeof(OpenIddictMongoDbToken), options.DefaultTokenType); } [Theory] - [InlineData(typeof(IOpenIddictApplicationStoreResolver), typeof(OpenIddictApplicationStoreResolver))] - [InlineData(typeof(IOpenIddictAuthorizationStoreResolver), typeof(OpenIddictAuthorizationStoreResolver))] - [InlineData(typeof(IOpenIddictScopeStoreResolver), typeof(OpenIddictScopeStoreResolver))] - [InlineData(typeof(IOpenIddictTokenStoreResolver), typeof(OpenIddictTokenStoreResolver))] + [InlineData(typeof(IOpenIddictApplicationStoreResolver), typeof(OpenIddictMongoDbApplicationStoreResolver))] + [InlineData(typeof(IOpenIddictAuthorizationStoreResolver), typeof(OpenIddictMongoDbAuthorizationStoreResolver))] + [InlineData(typeof(IOpenIddictScopeStoreResolver), typeof(OpenIddictMongoDbScopeStoreResolver))] + [InlineData(typeof(IOpenIddictTokenStoreResolver), typeof(OpenIddictMongoDbTokenStoreResolver))] public void UseMongoDb_RegistersMongoDbStoreResolvers(Type serviceType, Type implementationType) { // Arrange @@ -81,10 +81,10 @@ namespace OpenIddict.MongoDb.Tests } [Theory] - [InlineData(typeof(OpenIddictApplicationStore<>))] - [InlineData(typeof(OpenIddictAuthorizationStore<>))] - [InlineData(typeof(OpenIddictScopeStore<>))] - [InlineData(typeof(OpenIddictTokenStore<>))] + [InlineData(typeof(OpenIddictMongoDbApplicationStore<>))] + [InlineData(typeof(OpenIddictMongoDbAuthorizationStore<>))] + [InlineData(typeof(OpenIddictMongoDbScopeStore<>))] + [InlineData(typeof(OpenIddictMongoDbTokenStore<>))] public void UseMongoDb_RegistersMongoDbStore(Type type) { // Arrange diff --git a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbApplicationStoreResolverTests.cs similarity index 75% rename from test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs rename to test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbApplicationStoreResolverTests.cs index e47b9f9c..5a1d8091 100644 --- a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictApplicationStoreResolverTests.cs +++ b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbApplicationStoreResolverTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace OpenIddict.MongoDb.Tests { - public class OpenIddictApplicationStoreResolverTests + public class OpenIddictMongoDbApplicationStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -25,7 +25,7 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(Mock.Of>()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(provider); + var resolver = new OpenIddictMongoDbApplicationStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -38,16 +38,16 @@ namespace OpenIddict.MongoDb.Tests var services = new ServiceCollection(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(provider); + var resolver = new OpenIddictMongoDbApplicationStoreResolver(provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("The specified application type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictApplication' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictApplication' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbApplication' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbApplication' entity.") .ToString(), exception.Message); } @@ -60,19 +60,19 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(CreateStore()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictApplicationStoreResolver(provider); + var resolver = new OpenIddictMongoDbApplicationStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictApplicationStore CreateStore() - => new Mock>( + private static OpenIddictMongoDbApplicationStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of>()).Object; public class CustomApplication { } - public class MyApplication : OpenIddictApplication { } + public class MyApplication : OpenIddictMongoDbApplication { } } } diff --git a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbAuthorizationStoreResolverTests.cs similarity index 74% rename from test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs rename to test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbAuthorizationStoreResolverTests.cs index b0cd554c..4d5d86e0 100644 --- a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictAuthorizationStoreResolverTests.cs +++ b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbAuthorizationStoreResolverTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace OpenIddict.MongoDb.Tests { - public class OpenIddictAuthorizationStoreResolverTests + public class OpenIddictMongoDbAuthorizationStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -25,7 +25,7 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(Mock.Of>()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(provider); + var resolver = new OpenIddictMongoDbAuthorizationStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -38,16 +38,16 @@ namespace OpenIddict.MongoDb.Tests var services = new ServiceCollection(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(provider); + var resolver = new OpenIddictMongoDbAuthorizationStoreResolver(provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("The specified authorization type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictAuthorization' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictAuthorization' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbAuthorization' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbAuthorization' entity.") .ToString(), exception.Message); } @@ -60,19 +60,19 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(CreateStore()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictAuthorizationStoreResolver(provider); + var resolver = new OpenIddictMongoDbAuthorizationStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictAuthorizationStore CreateStore() - => new Mock>( + private static OpenIddictMongoDbAuthorizationStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of>()).Object; public class CustomAuthorization { } - public class MyAuthorization : OpenIddictAuthorization { } + public class MyAuthorization : OpenIddictMongoDbAuthorization { } } } diff --git a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbScopeStoreResolverTests.cs similarity index 76% rename from test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs rename to test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbScopeStoreResolverTests.cs index dd6a48ce..bce4ed35 100644 --- a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictScopeStoreResolverTests.cs +++ b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbScopeStoreResolverTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace OpenIddict.MongoDb.Tests { - public class OpenIddictScopeStoreResolverTests + public class OpenIddictMongoDbScopeStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -25,7 +25,7 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(Mock.Of>()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(provider); + var resolver = new OpenIddictMongoDbScopeStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -38,16 +38,16 @@ namespace OpenIddict.MongoDb.Tests var services = new ServiceCollection(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(provider); + var resolver = new OpenIddictMongoDbScopeStoreResolver(provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("The specified scope type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictScope' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictScope' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbScope' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbScope' entity.") .ToString(), exception.Message); } @@ -60,19 +60,19 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(CreateStore()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictScopeStoreResolver(provider); + var resolver = new OpenIddictMongoDbScopeStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictScopeStore CreateStore() - => new Mock>( + private static OpenIddictMongoDbScopeStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of>()).Object; public class CustomScope { } - public class MyScope : OpenIddictScope { } + public class MyScope : OpenIddictMongoDbScope { } } } diff --git a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbTokenStoreResolverTests.cs similarity index 76% rename from test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs rename to test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbTokenStoreResolverTests.cs index d4f69ceb..4b3bf743 100644 --- a/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictTokenStoreResolverTests.cs +++ b/test/OpenIddict.MongoDb.Tests/Resolvers/OpenIddictMongoDbTokenStoreResolverTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace OpenIddict.MongoDb.Tests { - public class OpenIddictTokenStoreResolverTests + public class OpenIddictMongoDbTokenStoreResolverTests { [Fact] public void Get_ReturnsCustomStoreCorrespondingToTheSpecifiedTypeWhenAvailable() @@ -25,7 +25,7 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(Mock.Of>()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(provider); + var resolver = new OpenIddictMongoDbTokenStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); @@ -38,16 +38,16 @@ namespace OpenIddict.MongoDb.Tests var services = new ServiceCollection(); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(provider); + var resolver = new OpenIddictMongoDbTokenStoreResolver(provider); // Act and assert var exception = Assert.Throws(() => resolver.Get()); Assert.Equal(new StringBuilder() .AppendLine("The specified token type is not compatible with the MongoDB stores.") - .Append("When enabling the MongoDB stores, make sure you use the built-in 'OpenIddictToken' ") - .Append("entity (from the 'OpenIddict.MongoDb.Models' package) or a custom entity ") - .Append("that inherits from the 'OpenIddictToken' entity.") + .Append("When enabling the MongoDB stores, make sure you use the built-in ") + .Append("'OpenIddictMongoDbToken' entity or a custom entity that inherits ") + .Append("from the 'OpenIddictMongoDbToken' entity.") .ToString(), exception.Message); } @@ -60,19 +60,19 @@ namespace OpenIddict.MongoDb.Tests services.AddSingleton(CreateStore()); var provider = services.BuildServiceProvider(); - var resolver = new OpenIddictTokenStoreResolver(provider); + var resolver = new OpenIddictMongoDbTokenStoreResolver(provider); // Act and assert Assert.NotNull(resolver.Get()); } - private static OpenIddictTokenStore CreateStore() - => new Mock>( + private static OpenIddictMongoDbTokenStore CreateStore() + => new Mock>( Mock.Of(), Mock.Of>()).Object; public class CustomToken { } - public class MyToken : OpenIddictToken { } + public class MyToken : OpenIddictMongoDbToken { } } }