thomas.nuyken/vegasco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New Angular based web version #1

Closed
thomas.nuyken wants to merge 150 commits from main into ddd
pull from: main
merge into: thomas.nuyken:ddd
Conversation 0 Commits 150 Files Changed 165 +8 -17
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d6ecfee6e - Show all commits

13
src/WebApi/Authentication/JwtOptions.cs
View File

@@ -6,11 +6,9 @@ public class JwtOptions
{ {
public const string SectionName = "JWT"; public const string SectionName = "JWT";
public string Audience { get; set; } = ""; public string ValidAudience { get; set; } = "";
public string Authority { get; set; } = ""; public string MetadataUrl { get; set; } = "";
public string Issuer { get; set; } = "";
public string? NameClaimType { get; set; } public string? NameClaimType { get; set; }
} }
@@ -19,13 +17,10 @@ public class JwtOptionsValidator : AbstractValidator<JwtOptions>
{ {
public JwtOptionsValidator() public JwtOptionsValidator()
{ {
RuleFor(x => x.Audience) RuleFor(x => x.ValidAudience)
.NotEmpty(); .NotEmpty();
RuleFor(x => x.Authority) RuleFor(x => x.MetadataUrl)
.NotEmpty();
RuleFor(x => x.Issuer)
.NotEmpty(); .NotEmpty();
} }
} }

7
src/WebApi/Common/DependencyInjectionExtensions.cs
View File

@@ -125,14 +125,11 @@ public static class DependencyInjectionExtensions
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
.AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, o => .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, o =>
{ {
o.Authority = jwtOptions.Value.Authority; o.MetadataAddress = jwtOptions.Value.MetadataUrl;
o.TokenValidationParameters.ValidAudience = jwtOptions.Value.Audience; o.TokenValidationParameters.ValidAudience = jwtOptions.Value.ValidAudience;
o.TokenValidationParameters.ValidateAudience = true; o.TokenValidationParameters.ValidateAudience = true;
o.TokenValidationParameters.ValidIssuer = jwtOptions.Value.Issuer;
o.TokenValidationParameters.ValidateIssuer = true;
if (!string.IsNullOrWhiteSpace(jwtOptions.Value.NameClaimType)) if (!string.IsNullOrWhiteSpace(jwtOptions.Value.NameClaimType))
{ {
o.TokenValidationParameters.NameClaimType = jwtOptions.Value.NameClaimType; o.TokenValidationParameters.NameClaimType = jwtOptions.Value.NameClaimType;

5
tests/WebApi.Tests.Integration/WebAppFactory.cs
View File

@@ -45,9 +45,8 @@ public sealed class WebAppFactory : WebApplicationFactory<IWebApiMarker>, IAsync
IEnumerable<KeyValuePair<string, string?>> customConfig = IEnumerable<KeyValuePair<string, string?>> customConfig =
[ [
new KeyValuePair<string, string?>("ConnectionStrings:Database", _database.GetConnectionString()), new KeyValuePair<string, string?>("ConnectionStrings:Database", _database.GetConnectionString()),
new KeyValuePair<string, string?>("JWT:Authority", "https://localhost"), new KeyValuePair<string, string?>("JWT:ValidAudience", "https://localhost"),
new KeyValuePair<string, string?>("JWT:Audience", "https://localhost"), new KeyValuePair<string, string?>("JWT:MetadataUrl", "https://localhost"),
new KeyValuePair<string, string?>("JWT:Issuer", "https://localhost"),
new KeyValuePair<string, string?>("JWT:NameClaimType", null), new KeyValuePair<string, string?>("JWT:NameClaimType", null),
]; ];