Compare commits
71
Commits
961f03c1c7
...
1.73.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8140b5fe65 | ||
|
|
fda97db5fa | ||
|
|
9285cedfa9 | ||
|
|
29574f4df0 | ||
|
|
343874551a | ||
|
|
b4a48c9cbf | ||
|
|
0eac9d533f | ||
|
|
24ba609e0c | ||
|
|
29f6d66c44 | ||
|
|
bcfc9ef962 | ||
|
|
b4e967acc9 | ||
|
|
205bbb9f3f | ||
|
|
73ef4b04a9 | ||
|
|
780415b6d4 | ||
|
|
879094073a | ||
|
|
b369dad452 | ||
|
|
c938bfec09 | ||
|
|
adc14038db | ||
|
|
61cb6c2228 | ||
|
|
e7a798b5e9 | ||
|
|
41b6b71b31 | ||
|
|
ee6beef603 | ||
|
|
1c3f3eaf0d | ||
|
|
2e77666d9e | ||
|
|
1977b6b301 | ||
|
|
0ab14d8b63 | ||
|
|
466458e230 | ||
|
|
141d32f591 | ||
|
|
d9e7f225ae | ||
|
|
6ae63e2ad1 | ||
|
|
f5efdde37c | ||
|
|
1592d5dc8f | ||
|
|
50a8a59d92 | ||
|
|
b70d9559b0 | ||
|
|
81d5e8f07c | ||
|
|
20a53942b5 | ||
|
|
9edb2aa4aa | ||
|
|
6ed023f2cf | ||
|
|
2c9f5a846c | ||
|
|
41f7c05be3 | ||
|
|
1a03355e84 | ||
|
|
7743c3178e | ||
|
|
ab3d8e6e9a | ||
|
|
db4c348288 | ||
|
|
6683234642 | ||
|
|
6ddbb9479a | ||
|
|
6c7349a0f8 | ||
|
|
e97fd6cd3f | ||
|
|
184c7c252a | ||
|
|
bfe8c458d6 | ||
|
|
e6e0475db1 | ||
|
|
5090c60797 | ||
|
|
9432252e15 | ||
|
|
47111a1a3a | ||
|
|
6eb3d50375 | ||
|
|
4deb732804 | ||
|
|
20d9387d0b | ||
|
|
9f6d0ccaa0 | ||
|
|
1acbc4d213 | ||
|
|
8c99668fac | ||
|
|
ad44f46204 | ||
|
|
49d999c1e3 | ||
|
|
9ed4777a18 | ||
|
|
0cf44f68cc | ||
|
|
41ed5a4288 | ||
|
|
bbcba5e06c | ||
|
|
502cc326dd | ||
|
|
4675d4c5fc | ||
|
|
f80bb2fff9 | ||
|
|
6767906b0d | ||
|
|
a344af4498 |
@@ -0,0 +1,18 @@
|
|||||||
|
namespace LiteCharms.Features.Api.Configuration;
|
||||||
|
|
||||||
|
public sealed class AuthentikSettings
|
||||||
|
{
|
||||||
|
public string? Authority { get; set; }
|
||||||
|
|
||||||
|
public string? ApiResourceName { get; set; }
|
||||||
|
|
||||||
|
public string? ApiResourceSecret { get; set; }
|
||||||
|
|
||||||
|
public string? RequiredClaimName { get; set; }
|
||||||
|
|
||||||
|
public string? RequiredClaimNameValue { get; set; }
|
||||||
|
|
||||||
|
public bool RequireHttpsMetadata { get; set; }
|
||||||
|
|
||||||
|
public bool BypassSslErrors { get; set; }
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ public sealed class OpenApiBearerSecuritySchemeTransformer : IOpenApiDocumentTra
|
|||||||
{
|
{
|
||||||
Type = SecuritySchemeType.Http,
|
Type = SecuritySchemeType.Http,
|
||||||
Scheme = "bearer",
|
Scheme = "bearer",
|
||||||
Description = "JWT Authorization header using the Bearer scheme. Example: \"Bearer {token}\"",
|
Description = "JWT Authorization header using the Bearer scheme",
|
||||||
};
|
};
|
||||||
|
|
||||||
document.AddComponent("Bearer", bearerScheme);
|
document.AddComponent("Bearer", bearerScheme);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using LiteCharms.Features.Abstractions;
|
using LiteCharms.Features.Abstractions;
|
||||||
using LiteCharms.Features.Api;
|
using LiteCharms.Features.Api;
|
||||||
|
using LiteCharms.Features.Api.Configuration;
|
||||||
|
|
||||||
namespace LiteCharms.Features.Extensions;
|
namespace LiteCharms.Features.Extensions;
|
||||||
|
|
||||||
@@ -8,6 +9,86 @@ public static class Api
|
|||||||
public const string Books = nameof(Books);
|
public const string Books = nameof(Books);
|
||||||
public const string Payments = nameof(Payments);
|
public const string Payments = nameof(Payments);
|
||||||
|
|
||||||
|
public static IServiceCollection AddAuthentic(this IServiceCollection services, IConfiguration configuration)
|
||||||
|
{
|
||||||
|
var authOptions = new AuthentikSettings();
|
||||||
|
|
||||||
|
configuration.GetSection("Authentik").Bind(authOptions);
|
||||||
|
|
||||||
|
services.Configure<AuthentikSettings>(configuration.GetSection(nameof(AuthentikSettings)));
|
||||||
|
|
||||||
|
services.AddAuthentication(OAuth2IntrospectionDefaults.AuthenticationScheme)
|
||||||
|
.AddOAuth2Introspection(options =>
|
||||||
|
{
|
||||||
|
options.Authority = options.Authority;
|
||||||
|
options.ClientId = options.ClientId;
|
||||||
|
options.ClientSecret = options.ClientSecret;
|
||||||
|
options.DiscoveryPolicy.RequireHttps = authOptions.RequireHttpsMetadata;
|
||||||
|
options.EnableCaching = true;
|
||||||
|
options.CacheDuration = TimeSpan.FromMinutes(10);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(authOptions.RequiredClaimName) && !string.IsNullOrWhiteSpace(authOptions.RequiredClaimNameValue))
|
||||||
|
services.AddAuthorizationBuilder().AddPolicy("ApiScope", policy =>
|
||||||
|
policy.RequireClaim(authOptions.RequiredClaimName, authOptions.RequiredClaimNameValue));
|
||||||
|
else
|
||||||
|
services.AddAuthorization();
|
||||||
|
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IServiceCollection AddApiServices(this IServiceCollection services, IConfiguration configuration)
|
||||||
|
{
|
||||||
|
services.AddHttpClient();
|
||||||
|
|
||||||
|
services.AddApiVersioning(options =>
|
||||||
|
{
|
||||||
|
options.DefaultApiVersion = new ApiVersion(1);
|
||||||
|
options.ReportApiVersions = true;
|
||||||
|
options.AssumeDefaultVersionWhenUnspecified = true;
|
||||||
|
options.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
|
||||||
|
new QueryStringApiVersionReader("version"),
|
||||||
|
new QueryStringApiVersionReader("version"),
|
||||||
|
new MediaTypeApiVersionReader("version"));
|
||||||
|
})
|
||||||
|
.AddApiExplorer(options =>
|
||||||
|
{
|
||||||
|
options.GroupNameFormat = "'v'VVV";
|
||||||
|
options.SubstituteApiVersionInUrl = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
var urls = configuration["ASPNETCORE_URLS"] ?? configuration["Urls"];
|
||||||
|
var healthUrl = "http://localhost:8080/health";
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(urls))
|
||||||
|
{
|
||||||
|
string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://"))!
|
||||||
|
.Replace("0.0.0.0", "localhost")
|
||||||
|
.Replace("*", "localhost")
|
||||||
|
.Replace("+", "localhost");
|
||||||
|
|
||||||
|
healthUrl = $"{firstUrl.TrimEnd('/')}/health";
|
||||||
|
}
|
||||||
|
|
||||||
|
services.AddHealthChecksUI(setup =>
|
||||||
|
{
|
||||||
|
setup.SetNotifyUnHealthyOneTimeUntilChange();
|
||||||
|
setup.AddHealthCheckEndpoint("primary, heal", healthUrl);
|
||||||
|
setup.SetHeaderText("Midrand Books");
|
||||||
|
})
|
||||||
|
.AddInMemoryStorage();
|
||||||
|
|
||||||
|
services.AddOutputCache(options =>
|
||||||
|
{
|
||||||
|
options.AddBasePolicy(builder => builder.Cache());
|
||||||
|
options.DefaultExpirationTimeSpan = TimeSpan.FromSeconds(10);
|
||||||
|
});
|
||||||
|
|
||||||
|
services.AddOpenApi(options => options.AddDocumentTransformer<OpenApiBearerSecuritySchemeTransformer>());
|
||||||
|
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
|
||||||
public static IApplicationBuilder MapEndpoints(this WebApplication app, IDictionary<int, RouteGroupBuilder> versionGroups)
|
public static IApplicationBuilder MapEndpoints(this WebApplication app, IDictionary<int, RouteGroupBuilder> versionGroups)
|
||||||
{
|
{
|
||||||
var endpoints = app.Services.GetRequiredService<IEnumerable<IEndpoint>>();
|
var endpoints = app.Services.GetRequiredService<IEnumerable<IEndpoint>>();
|
||||||
@@ -44,53 +125,4 @@ public static class Api
|
|||||||
public static string ToEndpointName(this Type target, string? annotation = "") =>
|
public static string ToEndpointName(this Type target, string? annotation = "") =>
|
||||||
$"{target.Name.Replace("Endpoint", string.Empty)}{annotation}".ToLower(CultureInfo.CurrentCulture);
|
$"{target.Name.Replace("Endpoint", string.Empty)}{annotation}".ToLower(CultureInfo.CurrentCulture);
|
||||||
|
|
||||||
public static IServiceCollection AddApiServices(this IServiceCollection services, IConfiguration configuration)
|
|
||||||
{
|
|
||||||
services.AddHttpClient();
|
|
||||||
|
|
||||||
services.AddApiVersioning(options =>
|
|
||||||
{
|
|
||||||
options.DefaultApiVersion = new ApiVersion(1);
|
|
||||||
options.ReportApiVersions = true;
|
|
||||||
options.AssumeDefaultVersionWhenUnspecified = true;
|
|
||||||
options.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
|
|
||||||
new QueryStringApiVersionReader("version"),
|
|
||||||
new QueryStringApiVersionReader("version"),
|
|
||||||
new MediaTypeApiVersionReader("version"));
|
|
||||||
})
|
|
||||||
.AddApiExplorer(options =>
|
|
||||||
{
|
|
||||||
options.GroupNameFormat = "'v'VVV";
|
|
||||||
options.SubstituteApiVersionInUrl = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
var urls = configuration["ASPNETCORE_URLS"] ?? configuration["Urls"];
|
|
||||||
var healthUrl = "http://localhost:8080/health";
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(urls))
|
|
||||||
{
|
|
||||||
string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://"))!
|
|
||||||
.Replace("*", "localhost").Replace("+", "localhost");
|
|
||||||
|
|
||||||
healthUrl = $"{firstUrl.TrimEnd('/')}/health";
|
|
||||||
}
|
|
||||||
|
|
||||||
services.AddHealthChecksUI(setup =>
|
|
||||||
{
|
|
||||||
setup.SetNotifyUnHealthyOneTimeUntilChange();
|
|
||||||
setup.AddHealthCheckEndpoint("primary, heal", healthUrl);
|
|
||||||
setup.SetHeaderText("Midrand Books");
|
|
||||||
})
|
|
||||||
.AddInMemoryStorage();
|
|
||||||
|
|
||||||
services.AddOutputCache(options =>
|
|
||||||
{
|
|
||||||
options.AddBasePolicy(builder => builder.Cache());
|
|
||||||
options.DefaultExpirationTimeSpan = TimeSpan.FromSeconds(10);
|
|
||||||
});
|
|
||||||
|
|
||||||
services.AddOpenApi(options => options.AddDocumentTransformer<OpenApiBearerSecuritySchemeTransformer>());
|
|
||||||
|
|
||||||
return services;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,18 @@
|
|||||||
<None Include="..\icon.png" Pack="true" PackagePath="\" />
|
<None Include="..\icon.png" Pack="true" PackagePath="\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Security (IODC)-->
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
|
||||||
|
<PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" Version="6.2.0" />
|
||||||
|
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
|
||||||
|
<PackageReference Include="IdentityModel" Version="6.2.0" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.8" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
|
||||||
|
|
||||||
|
<Using Include="IdentityModel.AspNetCore.OAuth2Introspection"/>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- API Versioning -->
|
<!-- API Versioning -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
|
<PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
|
||||||
|
|||||||
Reference in New Issue
Block a user