diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 51b5455..adf5c82 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -3,15 +3,15 @@ true - - - - - - - - - + + + + + + + + + diff --git a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityContextInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityContextInitializer.cs index 37050b1..451b477 100644 --- a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityContextInitializer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityContextInitializer.cs @@ -4,7 +4,7 @@ namespace SecuritySystem.GeneralPermission.Initialize; public interface ISecurityContextInitializer : ISecurityContextInitializer { - new Task> Init(CancellationToken cancellationToken); + new Task> Initialize(CancellationToken cancellationToken); } -public interface ISecurityContextInitializer : ISecurityInitializer; \ No newline at end of file +public interface ISecurityContextInitializer : IInitializer; \ No newline at end of file diff --git a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityInitializer.cs deleted file mode 100644 index 6b20a8a..0000000 --- a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityInitializer.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace SecuritySystem.GeneralPermission.Initialize; - -public interface ISecurityInitializer -{ - Task Init(CancellationToken cancellationToken); -} diff --git a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityRoleInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityRoleInitializer.cs index 05501b9..8b3a8b2 100644 --- a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityRoleInitializer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityRoleInitializer.cs @@ -4,9 +4,9 @@ namespace SecuritySystem.GeneralPermission.Initialize; public interface ISecurityRoleInitializer : ISecurityRoleInitializer { - Task> Init(IEnumerable securityRoles, CancellationToken cancellationToken); + Task> Initialize(IEnumerable securityRoles, CancellationToken cancellationToken); - new Task> Init(CancellationToken cancellationToken); + new Task> Initialize(CancellationToken cancellationToken); } -public interface ISecurityRoleInitializer : ISecurityInitializer; \ No newline at end of file +public interface ISecurityRoleInitializer : IInitializer; \ No newline at end of file diff --git a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs index cebbb7d..cd0a9b6 100644 --- a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs @@ -15,7 +15,7 @@ namespace SecuritySystem.GeneralPermission.Initialize; public class SecurityContextInitializer(IServiceProvider serviceProvider, IEnumerable bindings) : ISecurityContextInitializer { - public async Task Init(CancellationToken cancellationToken) + public async Task Initialize(CancellationToken cancellationToken) { foreach (var binding in bindings) { @@ -23,7 +23,7 @@ public async Task Init(CancellationToken cancellationToken) (ISecurityContextInitializer)serviceProvider.GetRequiredService( typeof(ISecurityContextInitializer<>).MakeGenericType(binding.SecurityContextTypeType)); - await initializer.Init(cancellationToken); + await initializer.Initialize(cancellationToken); } } } @@ -44,11 +44,10 @@ public class SecurityContextInitializer( return serviceProxyFactory.Create>(innerServiceType, identityInfo, visualIdentityInfo); }); - public Task> Init(CancellationToken cancellationToken) => - this.lazyInnerService.Value.Init(cancellationToken); + public Task> Initialize(CancellationToken cancellationToken) => + this.lazyInnerService.Value.Initialize(cancellationToken); - Task ISecurityInitializer.Init(CancellationToken cancellationToken) => - ((ISecurityInitializer)this.lazyInnerService.Value).Init(cancellationToken); + Task IInitializer.Initialize(CancellationToken cancellationToken) => ((IInitializer)this.lazyInnerService.Value).Initialize(cancellationToken); } public class SecurityContextInitializer( @@ -58,20 +57,20 @@ public class SecurityContextInitializer> logger, IdentityInfo identityInfo, VisualIdentityInfo visualIdentityInfo, - ISecurityIdentityConverter identityConverter, + ISecurityIdentityConverter identityConverter, InitializerSettings settings) : ISecurityContextInitializer - where TSecurityContextType : class, new() - where TSecurityContextTypeIdent : notnull + where TSecurityContextType : class, new() + where TSecurityContextTypeIdent : notnull { - public async Task> Init(CancellationToken cancellationToken) + public async Task> Initialize(CancellationToken cancellationToken) { - var dbSecurityContextTypes = await queryableSource.GetQueryable().GenericToListAsync(cancellationToken); + var dbSecurityContextTypes = await queryableSource.GetQueryable().GenericToListAsync(cancellationToken); - var mergeResult = dbSecurityContextTypes.GetMergeResult( - securityContextInfoSource.SecurityContextInfoList, - identityInfo.Id.Getter, - sc => identityConverter.Convert(sc.Identity).Id); + var mergeResult = dbSecurityContextTypes.GetMergeResult( + securityContextInfoSource.SecurityContextInfoList, + identityInfo.Id.Getter, + sc => identityConverter.Convert(sc.Identity).Id); if (mergeResult.RemovingItems.Any()) { @@ -85,7 +84,8 @@ public async Task> Init(C { foreach (var removingItem in mergeResult.RemovingItems) { - logger.LogDebug("SecurityContextType removed: {Name} {Id}", visualIdentityInfo.Name.Getter(removingItem), identityInfo.Id.Getter(removingItem)); + logger.LogDebug("SecurityContextType removed: {Name} {Id}", visualIdentityInfo.Name.Getter(removingItem), + identityInfo.Id.Getter(removingItem)); await genericRepository.RemoveAsync(removingItem, cancellationToken); } @@ -97,12 +97,13 @@ public async Task> Init(C foreach (var securityContextInfo in mergeResult.AddingItems) { - var securityContextType = new TSecurityContextType(); + var securityContextType = new TSecurityContextType(); - visualIdentityInfo.Name.Setter(securityContextType, securityContextInfo.Name); - identityInfo.Id.Setter(securityContextType, identityConverter.Convert(securityContextInfo.Identity).Id); + visualIdentityInfo.Name.Setter(securityContextType, securityContextInfo.Name); + identityInfo.Id.Setter(securityContextType, identityConverter.Convert(securityContextInfo.Identity).Id); - logger.LogDebug("SecurityContextType created: {Name} {Id}", visualIdentityInfo.Name.Getter(securityContextType), identityInfo.Id.Getter(securityContextType)); + logger.LogDebug("SecurityContextType created: {Name} {Id}", visualIdentityInfo.Name.Getter(securityContextType), + identityInfo.Id.Getter(securityContextType)); await genericRepository.SaveAsync(securityContextType, cancellationToken); } @@ -111,7 +112,7 @@ public async Task> Init(C { if (visualIdentityInfo.Name.Getter(securityContextType) != securityContextInfo.Name) { - visualIdentityInfo.Name.Setter(securityContextType, securityContextInfo.Name); + visualIdentityInfo.Name.Setter(securityContextType, securityContextInfo.Name); logger.LogDebug("SecurityContextType updated: {Name} {Id}", securityContextInfo.Name, identityInfo.Id.Getter(securityContextType)); @@ -122,5 +123,5 @@ public async Task> Init(C return mergeResult; } - async Task ISecurityInitializer.Init(CancellationToken cancellationToken) => await this.Init(cancellationToken); -} + async Task IInitializer.Initialize(CancellationToken cancellationToken) => await this.Initialize(cancellationToken); +} \ No newline at end of file diff --git a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs index b7ff380..1bbc879 100644 --- a/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs @@ -4,6 +4,7 @@ using CommonFramework.VisualIdentitySource; using GenericQueryable; + using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -14,7 +15,7 @@ namespace SecuritySystem.GeneralPermission.Initialize; public class SecurityRoleInitializer(IServiceProvider serviceProvider, IEnumerable bindings) : ISecurityRoleInitializer { - public async Task Init(CancellationToken cancellationToken) + public async Task Initialize(CancellationToken cancellationToken) { foreach (var binding in bindings) { @@ -22,7 +23,7 @@ public async Task Init(CancellationToken cancellationToken) (ISecurityRoleInitializer)serviceProvider.GetRequiredService( typeof(ISecurityRoleInitializer<>).MakeGenericType(binding.SecurityRoleType)); - await initializer.Init(cancellationToken); + await initializer.Initialize(cancellationToken); } } } @@ -53,14 +54,14 @@ public class SecurityRoleInitializer( visualIdentityInfo); }); - public Task> Init(IEnumerable securityRoles, CancellationToken cancellationToken) => - this.lazyInnerService.Value.Init(securityRoles, cancellationToken); + public Task> Initialize(IEnumerable securityRoles, CancellationToken cancellationToken) => + this.lazyInnerService.Value.Initialize(securityRoles, cancellationToken); - public Task> Init(CancellationToken cancellationToken) => - this.lazyInnerService.Value.Init(cancellationToken); + public Task> Initialize(CancellationToken cancellationToken) => + this.lazyInnerService.Value.Initialize(cancellationToken); - Task ISecurityInitializer.Init(CancellationToken cancellationToken) => - ((ISecurityInitializer)this.lazyInnerService.Value).Init(cancellationToken); + Task IInitializer.Initialize(CancellationToken cancellationToken) => + ((IInitializer)this.lazyInnerService.Value).Initialize(cancellationToken); } public class SecurityRoleInitializer( @@ -77,12 +78,12 @@ public class SecurityRoleInitializer> Init(CancellationToken cancellationToken) + public async Task> Initialize(CancellationToken cancellationToken) { - return await this.Init(securityRoleSource.GetRealRoles(), cancellationToken); + return await this.Initialize(securityRoleSource.GetRealRoles(), cancellationToken); } - public async Task> Init( + public async Task> Initialize( IEnumerable securityRoles, CancellationToken cancellationToken) { @@ -145,5 +146,5 @@ public async Task> Init( return mergeResult; } - async Task ISecurityInitializer.Init(CancellationToken cancellationToken) => await this.Init(cancellationToken); + async Task IInitializer.Initialize(CancellationToken cancellationToken) => await this.Initialize(cancellationToken); } \ No newline at end of file diff --git a/src/SecuritySystem.Testing/RootAuthManager.cs b/src/SecuritySystem.Testing/RootAuthManager.cs index 2008993..ccdb19f 100644 --- a/src/SecuritySystem.Testing/RootAuthManager.cs +++ b/src/SecuritySystem.Testing/RootAuthManager.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; diff --git a/src/_Example/ExampleApp.Api/Controllers/InitController.cs b/src/_Example/ExampleApp.Api/Controllers/InitController.cs index 0c3594c..a274d3d 100644 --- a/src/_Example/ExampleApp.Api/Controllers/InitController.cs +++ b/src/_Example/ExampleApp.Api/Controllers/InitController.cs @@ -5,7 +5,6 @@ using HierarchicalExpand.AncestorDenormalization; using Microsoft.AspNetCore.Mvc; - using SecuritySystem.GeneralPermission.Initialize; using SecuritySystem.Services; @@ -15,7 +14,7 @@ namespace ExampleApp.Api.Controllers; [ApiController] public class InitController( IRawUserAuthenticationService rawUserAuthenticationService, - IDenormalizedAncestorsService denormalizedAncestorsService, + IDenormalizedAncestorsService denormalizedAncestorsService, ISecurityRoleInitializer securityRoleInitializer, ISecurityContextInitializer securityContextInitializer, TestDbContext dbContext) : ControllerBase @@ -63,12 +62,12 @@ public async Task TestInitialize(CancellationToken cancellationToken = default) await dbContext.SaveChangesAsync(cancellationToken); - await denormalizedAncestorsService.SyncAllAsync(cancellationToken); + await denormalizedAncestorsService.Initialize(cancellationToken); await dbContext.SaveChangesAsync(cancellationToken); - await securityRoleInitializer.Init(cancellationToken); - await securityContextInitializer.Init(cancellationToken); + await securityRoleInitializer.Initialize(cancellationToken); + await securityContextInitializer.Initialize(cancellationToken); await dbContext.SaveChangesAsync(cancellationToken); } diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs index c721a53..af8a5b8 100644 --- a/src/__SolutionItems/CommonAssemblyInfo.cs +++ b/src/__SolutionItems/CommonAssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyProduct("SecuritySystem")] [assembly: AssemblyCompany("IvAt")] -[assembly: AssemblyVersion("2.1.7.0")] +[assembly: AssemblyVersion("2.1.8.0")] [assembly: AssemblyInformationalVersion("changes at build")] #if DEBUG