AppStd/WorkFlow
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: AppStd:97d5156bbbd1654b9860744445a70b917cb2f789
Branches Tags
AppStd:master AppStd:feat/profile-and-profile_object
...
compare: AppStd:d6ccc102446b40dabec58b3455090604d61b1a27
Branches Tags
AppStd:feat/profile-and-profile_object AppStd:master

5 Commits
97d5156bbb ... d6ccc10244

Author SHA1 Message Date
Developer 02
d6ccc10244 fix: Aktualisiertes Präfix für den Namen der NLog-Protokolldatei als workFlow.API 2025-03-10 15:47:58 +01:00
Developer 02
3dccf82710 fix: Aktualisiertes Präfix für den Namen der NLog-Protokolldatei als workFlow.API 2025-03-10 15:36:42 +01:00
Developer 02
c7d8b67ccb refactor Aktualisierte AuthPublicKey-Konfiguration, die getrennt von AuthClaimPrams konfiguriert werden kann, um sie als JWT-Barriere-Konfiguration zu verwenden 2025-03-10 13:53:15 +01:00
Developer 02
b76043fa24 chore: Aktualisierung von DigitalData.Core.Application und UserManager.Application auf 2.0.0 
- Aktualisiert auf Dienste als aktuelle Core.Application
 2025-03-10 10:53:40 +01:00
Developer 02
e28f4560d6 Refactor: Inline AuthHubClient Optionen durch Konfigurationsabschnitt ersetzen 2025-03-10 09:48:10 +01:00
17 changed files with 35 additions and 31 deletions
Expand all files Collapse all files

15
WorkFlow.API/Program.cs
View File

@@ -32,8 +32,7 @@ try
builder.Services.AddDbContext<WFDBContext>(options => options.UseSqlServer(cnn_str).EnableDetailedErrors());
builder.Services.AddWorkFlow().AddUserManager<WFDBContext>();
builder.Services.AddCookieBasedLocalizer();
builder.ConfigureBySection<DirectorySearchOptions>();
builder.Services.AddDirectorySearchService();
builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
builder.Services.AddJWTService<UserReadDto>(user => new SecurityTokenDescriptor()
{
Claims = user.ToClaimList().ToDictionary(claim => claim.Type, claim => claim.Value as object)
@@ -48,12 +47,10 @@ try
else
throw new("The API Key Authorization configuration is not available in the app settings, even though the app is not in development or DiP mode and API Key Authorization is not disabled.");
// Created separately from AuthClientParams (added via options) for use in Jwt Bearer configuration
var authPublicKey = config.GetSection("AuthPublicKey").Get<ClientPublicKey>() ?? throw new InvalidOperationException("The AuthPublicKey configuration is missing or invalid.");
builder.Services.AddAuthHubClient(config, opt =>
{
opt.PublicKeys.Add(authPublicKey);
});
builder.Services.AddAuthHubClient(config.GetSection("AuthClientParams"), opt => opt.PublicKeys.Add(authPublicKey));
builder.Services.AddControllers();
@@ -66,7 +63,11 @@ try
IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
{
return [authPublicKey.SecurityKey];
}
},
ValidateIssuer = true,
ValidIssuer = authPublicKey.Issuer,
ValidateAudience = true,
ValidAudience = authPublicKey.Audience
};
});

4
WorkFlow.API/WorkFlow.API.csproj
View File

@@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DigitalData.Auth.Client" Version="1.1.4.1" />
<PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
<PackageReference Include="DigitalData.Auth.Client" Version="1.1.5" />
<PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
<PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />

7
WorkFlow.API/appsettings.json
View File

@@ -11,8 +11,8 @@
"NLog": {
"throwConfigExceptions": true,
"variables": {
"logDirectory": "E:\\LogFiles\\Digital Data\\workFlow",
"logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Web"
"logDirectory": "E:\\LogFiles\\Digital Data\\workFlow.API",
"logFileNamePrefix": "${shortdate}-workFlow.API"
},
"targets": {
"infoLogs": {
@@ -78,7 +78,8 @@
}
},
"AuthClientParams": {
"Url": "https://localhost:7192"
"Url": "https://localhost:7192",
"PublicKeys": []
},
"AuthPublicKey": {
"Issuer": "auth.digitaldata.works",

2
WorkFlow.Application/Contracts/IConfigService.cs
View File

@@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities;
namespace WorkFlow.Application.Contracts
{
public interface IConfigService : ICRUDService<ConfigCreateDto, ConfigDto, ConfigUpdateDto, Config, int>
public interface IConfigService : ICRUDService<ConfigCreateDto, ConfigDto, Config, int>
{
}
}

2
WorkFlow.Application/Contracts/IProfileControlsTFService.cs
View File

@@ -5,7 +5,7 @@ using WorkFlow.Domain.Entities;
namespace WorkFlow.Application.Contracts
{
public interface IProfileControlsTFService : ICRUDService<ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTFUpdateDto, ProfileControlsTF, int>
public interface IProfileControlsTFService : ICRUDService<ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTF, int>
{
Task<DataResult<IEnumerable<ProfileControlsTFDto>>> ReadAsync(
bool withProfile = true, bool withUser = false,

2
WorkFlow.Application/Contracts/IProfileObjStateService.cs
View File

@@ -5,7 +5,7 @@ using WorkFlow.Domain.Entities;
namespace WorkFlow.Application.Contracts
{
public interface IProfileObjStateService : ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjStateUpdateDto, ProfileObjState, int>
public interface IProfileObjStateService : ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>
{
Task<DataResult<IEnumerable<ProfileObjStateDto>>> ReadAsync(
bool withProfile = true, bool withUser = true, bool withState = true,

2
WorkFlow.Application/Contracts/IProfileService.cs
View File

@@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities;
namespace WorkFlow.Application.Contracts
{
public interface IProfileService : ICRUDService<ProfileCreateDto, ProfileDto, ProfileUpdateDto, Profile, int>
public interface IProfileService : ICRUDService<ProfileCreateDto, ProfileDto, Profile, int>
{
}
}

2
WorkFlow.Application/Contracts/IStateService.cs
View File

@@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities;
namespace WorkFlow.Application.Contracts
{
public interface IStateService : ICRUDService<StateCreateDto, StateDto, StateUpdateDto, State, int>
public interface IStateService : ICRUDService<StateCreateDto, StateDto, State, int>
{
}
}

4
WorkFlow.Application/Services/ConfigService.cs
View File

@@ -9,8 +9,8 @@ using WorkFlow.Infrastructure.Contracts;
namespace WorkFlow.Application.Services
{
public class ConfigService(IConfigRepository repository, IMapper mapper)
: CRUDService<IConfigRepository, ConfigCreateDto, ConfigDto, ConfigUpdateDto, Config, int>(repository, mapper),
IConfigService, ICRUDService<ConfigCreateDto, ConfigDto, ConfigUpdateDto, Config, int>
: CRUDService<IConfigRepository, ConfigCreateDto, ConfigDto, Config, int>(repository, mapper),
IConfigService, ICRUDService<ConfigCreateDto, ConfigDto, Config, int>
{
}
}

4
WorkFlow.Application/Services/ProfileControlsTFService.cs
View File

@@ -10,8 +10,8 @@ using WorkFlow.Infrastructure.Contracts;
namespace WorkFlow.Application.Services
{
public class ProfileControlsTFService(IProfileControlsTFRepository repository, IMapper mapper)
: CRUDService<IProfileControlsTFRepository, ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTFUpdateDto, ProfileControlsTF, int>(repository, mapper),
IProfileControlsTFService, ICRUDService<ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTFUpdateDto, ProfileControlsTF, int>
: CRUDService<IProfileControlsTFRepository, ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTF, int>(repository, mapper),
IProfileControlsTFService, ICRUDService<ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTF, int>
{
public async Task<DataResult<IEnumerable<ProfileControlsTFDto>>> ReadAsync(
bool withProfile = true, bool withUser = false,

4
WorkFlow.Application/Services/ProfileObjStateService.cs
View File

@@ -10,8 +10,8 @@ using WorkFlow.Infrastructure.Contracts;
namespace WorkFlow.Application.Services
{
public class ProfileObjStateService(IProfileObjStateRepository repository, IMapper mapper)
: CRUDService<IProfileObjStateRepository, ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjStateUpdateDto, ProfileObjState, int>(repository, mapper),
IProfileObjStateService, ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjStateUpdateDto, ProfileObjState, int>
: CRUDService<IProfileObjStateRepository, ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>(repository, mapper),
IProfileObjStateService, ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>
{
public async Task<DataResult<IEnumerable<ProfileObjStateDto>>> ReadAsync(
bool withProfile = true, bool withUser = true, bool withState = true,

4
WorkFlow.Application/Services/ProfileService.cs
View File

@@ -8,8 +8,8 @@ using WorkFlow.Infrastructure.Contracts;
namespace WorkFlow.Application.Services
{
public class ProfileService(IProfileRepository repository, AutoMapper.IMapper mapper)
: CRUDService<IProfileRepository, ProfileCreateDto, ProfileDto, ProfileUpdateDto, Profile, int>(repository, mapper),
IProfileService, ICRUDService<ProfileCreateDto, ProfileDto, ProfileUpdateDto, Profile, int>
: CRUDService<IProfileRepository, ProfileCreateDto, ProfileDto, Profile, int>(repository, mapper),
IProfileService, ICRUDService<ProfileCreateDto, ProfileDto, Profile, int>
{
}
}

4
WorkFlow.Application/Services/StateService.cs
View File

@@ -9,8 +9,8 @@ using WorkFlow.Infrastructure.Contracts;
namespace WorkFlow.Application.Services
{
public class StateService(IStateRepository repository, IMapper mapper)
: CRUDService<IStateRepository, StateCreateDto, StateDto, StateUpdateDto, State, int>(repository, mapper),
IStateService, ICRUDService<StateCreateDto, StateDto, StateUpdateDto, State, int>
: CRUDService<IStateRepository, StateCreateDto, StateDto, State, int>(repository, mapper),
IStateService, ICRUDService<StateCreateDto, StateDto, State, int>
{
}
}

4
WorkFlow.Application/WorkFlow.Application.csproj
View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
<PackageReference Include="UserManager.Application" Version="2.0.0" />
<PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
<PackageReference Include="UserManager.Application" Version="3.1.2" />
</ItemGroup>
<ItemGroup>

2
WorkFlow.Domain/WorkFlow.Domain.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="UserManager.Domain" Version="2.0.0" />
<PackageReference Include="UserManager.Domain" Version="3.0.1" />
</ItemGroup>
</Project>

2
WorkFlow.Infrastructure/WFDBContext.cs
View File

@@ -30,6 +30,8 @@ namespace WorkFlow.Infrastructure
public DbSet<UserRep> UserReps { get; set; }
public DbSet<ClientUser> ClientUsers { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
//configure model builder for user manager tables

2
WorkFlow.Infrastructure/WorkFlow.Infrastructure.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
<PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
<PackageReference Include="UserManager.Infrastructure" Version="3.0.1" />
</ItemGroup>
<ItemGroup>