diff --git a/WorkFlow.API/Program.cs b/WorkFlow.API/Program.cs index bfa128b..129fa1b 100644 --- a/WorkFlow.API/Program.cs +++ b/WorkFlow.API/Program.cs @@ -32,8 +32,7 @@ try builder.Services.AddDbContext(options => options.UseSqlServer(cnn_str).EnableDetailedErrors()); builder.Services.AddWorkFlow().AddUserManager(); builder.Services.AddCookieBasedLocalizer(); - builder.ConfigureBySection(); - builder.Services.AddDirectorySearchService(); + builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions")); builder.Services.AddJWTService(user => new SecurityTokenDescriptor() { Claims = user.ToClaimList().ToDictionary(claim => claim.Type, claim => claim.Value as object) diff --git a/WorkFlow.API/WorkFlow.API.csproj b/WorkFlow.API/WorkFlow.API.csproj index 374d12d..423bcfc 100644 --- a/WorkFlow.API/WorkFlow.API.csproj +++ b/WorkFlow.API/WorkFlow.API.csproj @@ -13,7 +13,7 @@ - + diff --git a/WorkFlow.Application/Contracts/IConfigService.cs b/WorkFlow.Application/Contracts/IConfigService.cs index f50c00d..60470c8 100644 --- a/WorkFlow.Application/Contracts/IConfigService.cs +++ b/WorkFlow.Application/Contracts/IConfigService.cs @@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Contracts { - public interface IConfigService : ICRUDService + public interface IConfigService : ICRUDService { } } \ No newline at end of file diff --git a/WorkFlow.Application/Contracts/IProfileControlsTFService.cs b/WorkFlow.Application/Contracts/IProfileControlsTFService.cs index 6525dc9..64cf021 100644 --- a/WorkFlow.Application/Contracts/IProfileControlsTFService.cs +++ b/WorkFlow.Application/Contracts/IProfileControlsTFService.cs @@ -5,7 +5,7 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Contracts { - public interface IProfileControlsTFService : ICRUDService + public interface IProfileControlsTFService : ICRUDService { Task>> ReadAsync( bool withProfile = true, bool withUser = false, diff --git a/WorkFlow.Application/Contracts/IProfileObjStateService.cs b/WorkFlow.Application/Contracts/IProfileObjStateService.cs index ed5586a..9893966 100644 --- a/WorkFlow.Application/Contracts/IProfileObjStateService.cs +++ b/WorkFlow.Application/Contracts/IProfileObjStateService.cs @@ -5,7 +5,7 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Contracts { - public interface IProfileObjStateService : ICRUDService + public interface IProfileObjStateService : ICRUDService { Task>> ReadAsync( bool withProfile = true, bool withUser = true, bool withState = true, diff --git a/WorkFlow.Application/Contracts/IProfileService.cs b/WorkFlow.Application/Contracts/IProfileService.cs index 8b4260a..3b55fda 100644 --- a/WorkFlow.Application/Contracts/IProfileService.cs +++ b/WorkFlow.Application/Contracts/IProfileService.cs @@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Contracts { - public interface IProfileService : ICRUDService + public interface IProfileService : ICRUDService { } } \ No newline at end of file diff --git a/WorkFlow.Application/Contracts/IStateService.cs b/WorkFlow.Application/Contracts/IStateService.cs index 81f2493..64cf75d 100644 --- a/WorkFlow.Application/Contracts/IStateService.cs +++ b/WorkFlow.Application/Contracts/IStateService.cs @@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Contracts { - public interface IStateService : ICRUDService + public interface IStateService : ICRUDService { } } \ No newline at end of file diff --git a/WorkFlow.Application/Services/ConfigService.cs b/WorkFlow.Application/Services/ConfigService.cs index 70789cc..3a3fe2e 100644 --- a/WorkFlow.Application/Services/ConfigService.cs +++ b/WorkFlow.Application/Services/ConfigService.cs @@ -9,8 +9,8 @@ using WorkFlow.Infrastructure.Contracts; namespace WorkFlow.Application.Services { public class ConfigService(IConfigRepository repository, IMapper mapper) - : CRUDService(repository, mapper), - IConfigService, ICRUDService + : CRUDService(repository, mapper), + IConfigService, ICRUDService { } } \ No newline at end of file diff --git a/WorkFlow.Application/Services/ProfileControlsTFService.cs b/WorkFlow.Application/Services/ProfileControlsTFService.cs index e419a23..23058cc 100644 --- a/WorkFlow.Application/Services/ProfileControlsTFService.cs +++ b/WorkFlow.Application/Services/ProfileControlsTFService.cs @@ -10,8 +10,8 @@ using WorkFlow.Infrastructure.Contracts; namespace WorkFlow.Application.Services { public class ProfileControlsTFService(IProfileControlsTFRepository repository, IMapper mapper) - : CRUDService(repository, mapper), - IProfileControlsTFService, ICRUDService + : CRUDService(repository, mapper), + IProfileControlsTFService, ICRUDService { public async Task>> ReadAsync( bool withProfile = true, bool withUser = false, diff --git a/WorkFlow.Application/Services/ProfileObjStateService.cs b/WorkFlow.Application/Services/ProfileObjStateService.cs index b14a173..4058681 100644 --- a/WorkFlow.Application/Services/ProfileObjStateService.cs +++ b/WorkFlow.Application/Services/ProfileObjStateService.cs @@ -10,8 +10,8 @@ using WorkFlow.Infrastructure.Contracts; namespace WorkFlow.Application.Services { public class ProfileObjStateService(IProfileObjStateRepository repository, IMapper mapper) - : CRUDService(repository, mapper), - IProfileObjStateService, ICRUDService + : CRUDService(repository, mapper), + IProfileObjStateService, ICRUDService { public async Task>> ReadAsync( bool withProfile = true, bool withUser = true, bool withState = true, diff --git a/WorkFlow.Application/Services/ProfileService.cs b/WorkFlow.Application/Services/ProfileService.cs index 39ae40a..3e1cdac 100644 --- a/WorkFlow.Application/Services/ProfileService.cs +++ b/WorkFlow.Application/Services/ProfileService.cs @@ -8,8 +8,8 @@ using WorkFlow.Infrastructure.Contracts; namespace WorkFlow.Application.Services { public class ProfileService(IProfileRepository repository, AutoMapper.IMapper mapper) - : CRUDService(repository, mapper), - IProfileService, ICRUDService + : CRUDService(repository, mapper), + IProfileService, ICRUDService { } } \ No newline at end of file diff --git a/WorkFlow.Application/Services/StateService.cs b/WorkFlow.Application/Services/StateService.cs index 963d23e..a1c162d 100644 --- a/WorkFlow.Application/Services/StateService.cs +++ b/WorkFlow.Application/Services/StateService.cs @@ -9,8 +9,8 @@ using WorkFlow.Infrastructure.Contracts; namespace WorkFlow.Application.Services { public class StateService(IStateRepository repository, IMapper mapper) - : CRUDService(repository, mapper), - IStateService, ICRUDService + : CRUDService(repository, mapper), + IStateService, ICRUDService { } } \ No newline at end of file diff --git a/WorkFlow.Application/WorkFlow.Application.csproj b/WorkFlow.Application/WorkFlow.Application.csproj index 7b8238f..2ef316c 100644 --- a/WorkFlow.Application/WorkFlow.Application.csproj +++ b/WorkFlow.Application/WorkFlow.Application.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/WorkFlow.Domain/WorkFlow.Domain.csproj b/WorkFlow.Domain/WorkFlow.Domain.csproj index aa4ea8c..c512782 100644 --- a/WorkFlow.Domain/WorkFlow.Domain.csproj +++ b/WorkFlow.Domain/WorkFlow.Domain.csproj @@ -7,7 +7,7 @@ - + diff --git a/WorkFlow.Infrastructure/WFDBContext.cs b/WorkFlow.Infrastructure/WFDBContext.cs index 9480be0..a534938 100644 --- a/WorkFlow.Infrastructure/WFDBContext.cs +++ b/WorkFlow.Infrastructure/WFDBContext.cs @@ -30,6 +30,8 @@ namespace WorkFlow.Infrastructure public DbSet UserReps { get; set; } + public DbSet ClientUsers { get; set; } + protected override void OnModelCreating(ModelBuilder modelBuilder) { //configure model builder for user manager tables diff --git a/WorkFlow.Infrastructure/WorkFlow.Infrastructure.csproj b/WorkFlow.Infrastructure/WorkFlow.Infrastructure.csproj index 88024f6..0283257 100644 --- a/WorkFlow.Infrastructure/WorkFlow.Infrastructure.csproj +++ b/WorkFlow.Infrastructure/WorkFlow.Infrastructure.csproj @@ -8,7 +8,7 @@ - +