Compare commits
8 Commits
feature/id
...
feature/lo
| Author | SHA1 | Date | |
|---|---|---|---|
| 2efdee79a3 | |||
| 865a21458d | |||
| e28eb4bada | |||
| e5bfda69a6 | |||
| 49c88bdb66 | |||
| e65052d7f4 | |||
| 7abea2ee50 | |||
| c981b24c60 |
@@ -4,21 +4,29 @@
|
|||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
|
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.0" />
|
||||||
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.0.0" />
|
<PackageVersion Include="Aspire.Hosting.Keycloak" Version="9.4.0-preview.1.25378.8" />
|
||||||
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
|
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.4.0" />
|
||||||
<PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.0.0" />
|
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.4.0" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
|
<PackageVersion Include="Aspire.Keycloak.Authentication" Version="9.4.0-preview.1.25378.8" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
|
<PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.4.0" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
|
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
|
||||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
|
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
|
||||||
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
|
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
|
||||||
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
|
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
||||||
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
|
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
|
||||||
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
|
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
|
||||||
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
|
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
|
||||||
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
|
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
|
||||||
<PackageVersion Include="xunit" Version="2.9.0" />
|
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
|
||||||
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
|
<PackageVersion Include="coverlet.collector" Version="6.0.4">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageVersion>
|
||||||
|
<PackageVersion Include="xunit" Version="2.9.3" />
|
||||||
|
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageVersion>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -8,10 +8,16 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PresentPortal.ServiceDefaults\PresentPortal.ServiceDefaults.csproj" />
|
<ProjectReference Include="..\PresentPortal.ServiceDefaults\PresentPortal.ServiceDefaults.csproj" />
|
||||||
|
<ProjectReference Include="..\PresentPortal.Shared\PresentPortal.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Aspire.Keycloak.Authentication" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="wwwroot\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using PresentPortal.Shared;
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
// Add service defaults & Aspire client integrations.
|
// Add service defaults & Aspire client integrations.
|
||||||
@@ -9,6 +11,20 @@ builder.Services.AddProblemDetails();
|
|||||||
// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
|
// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
|
||||||
builder.Services.AddOpenApi();
|
builder.Services.AddOpenApi();
|
||||||
|
|
||||||
|
builder.Services.AddAuthentication()
|
||||||
|
.AddKeycloakJwtBearer(ServiceNames.Keycloak, KeycloakConstants.Realm, options =>
|
||||||
|
{
|
||||||
|
var keycloakHost = builder.Configuration.GetValue<string>($"services:{ServiceNames.Keycloak}:http:0")
|
||||||
|
?? throw new InvalidOperationException("Keycloak host is not configured.");
|
||||||
|
|
||||||
|
options.MetadataAddress = $"{keycloakHost}/realms/{KeycloakConstants.Realm}/.well-known/openid-configuration";
|
||||||
|
options.RequireHttpsMetadata = !builder.Environment.IsDevelopment();
|
||||||
|
options.Audience = KeycloakConstants.ClientId;
|
||||||
|
options.Authority = keycloakHost;
|
||||||
|
options.TokenValidationParameters.NameClaimType = "preferred_username";
|
||||||
|
});
|
||||||
|
builder.Services.AddAuthorization();
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
// Configure the HTTP request pipeline.
|
// Configure the HTTP request pipeline.
|
||||||
@@ -19,6 +35,9 @@ if (app.Environment.IsDevelopment())
|
|||||||
app.MapOpenApi();
|
app.MapOpenApi();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
app.UseAuthentication();
|
||||||
|
app.UseAuthorization();
|
||||||
|
|
||||||
string[] summaries =
|
string[] summaries =
|
||||||
["Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"];
|
["Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"];
|
||||||
|
|
||||||
@@ -34,7 +53,16 @@ app.MapGet("/weatherforecast", () =>
|
|||||||
.ToArray();
|
.ToArray();
|
||||||
return forecast;
|
return forecast;
|
||||||
})
|
})
|
||||||
.WithName("GetWeatherForecast");
|
.WithName("GetWeatherForecast")
|
||||||
|
.RequireAuthorization();
|
||||||
|
|
||||||
|
app.MapGet("/test", (HttpContext context) =>
|
||||||
|
{
|
||||||
|
_ = context.User;
|
||||||
|
return TypedResults.Ok();
|
||||||
|
})
|
||||||
|
.WithName("Test Endpoint")
|
||||||
|
.RequireAuthorization();
|
||||||
|
|
||||||
app.MapDefaultEndpoints();
|
app.MapDefaultEndpoints();
|
||||||
|
|
||||||
|
|||||||
@@ -13,12 +13,20 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PresentPortal.ApiService\PresentPortal.ApiService.csproj"/>
|
<ProjectReference Include="..\PresentPortal.ApiService\PresentPortal.ApiService.csproj"/>
|
||||||
|
<ProjectReference Include="..\PresentPortal.Shared\PresentPortal.Shared.csproj" IsAspireProjectResource="false" />
|
||||||
<ProjectReference Include="..\PresentPortal.Web\PresentPortal.Web.csproj"/>
|
<ProjectReference Include="..\PresentPortal.Web\PresentPortal.Web.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Aspire.Hosting.AppHost" />
|
<PackageReference Include="Aspire.Hosting.AppHost" />
|
||||||
|
<PackageReference Include="Aspire.Hosting.Keycloak" />
|
||||||
<PackageReference Include="Aspire.Hosting.Redis" />
|
<PackageReference Include="Aspire.Hosting.Redis" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="Resources\present-portal.json">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,8 +1,18 @@
|
|||||||
|
using PresentPortal.Shared;
|
||||||
|
|
||||||
var builder = DistributedApplication.CreateBuilder(args);
|
var builder = DistributedApplication.CreateBuilder(args);
|
||||||
|
|
||||||
var cache = builder.AddRedis("cache");
|
var cache = builder.AddRedis("cache");
|
||||||
|
|
||||||
var apiService = builder.AddProject<Projects.PresentPortal_ApiService>("apiservice");
|
var keycloak = builder.AddKeycloak(ServiceNames.Keycloak, 8080)
|
||||||
|
.WithRealmImport(@"Resources\present-portal-realm.json")
|
||||||
|
.WithDataVolume()
|
||||||
|
.WithExternalHttpEndpoints()
|
||||||
|
.WithLifetime(ContainerLifetime.Persistent);
|
||||||
|
|
||||||
|
var apiService = builder.AddProject<Projects.PresentPortal_ApiService>(ServiceNames.Api)
|
||||||
|
.WithReference(keycloak)
|
||||||
|
.WaitFor(keycloak);
|
||||||
|
|
||||||
builder.AddProject<Projects.PresentPortal_Web>("webfrontend")
|
builder.AddProject<Projects.PresentPortal_Web>("webfrontend")
|
||||||
.WithExternalHttpEndpoints()
|
.WithExternalHttpEndpoints()
|
||||||
|
|||||||
2127
PresentPortal.AppHost/Resources/present-portal-realm.json
Normal file
2127
PresentPortal.AppHost/Resources/present-portal-realm.json
Normal file
File diff suppressed because it is too large
Load Diff
8
PresentPortal.Shared/KeycloakConstants.cs
Normal file
8
PresentPortal.Shared/KeycloakConstants.cs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
namespace PresentPortal.Shared;
|
||||||
|
|
||||||
|
public static class KeycloakConstants
|
||||||
|
{
|
||||||
|
public const string Realm = "present-portal";
|
||||||
|
|
||||||
|
public const string ClientId = "present-portal";
|
||||||
|
}
|
||||||
9
PresentPortal.Shared/PresentPortal.Shared.csproj
Normal file
9
PresentPortal.Shared/PresentPortal.Shared.csproj
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
8
PresentPortal.Shared/ServiceNames.cs
Normal file
8
PresentPortal.Shared/ServiceNames.cs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
namespace PresentPortal.Shared;
|
||||||
|
|
||||||
|
public static class ServiceNames
|
||||||
|
{
|
||||||
|
public const string Api = "Api";
|
||||||
|
|
||||||
|
public const string Keycloak = "Keycloak";
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PresentPortal.ServiceDefaults\PresentPortal.ServiceDefaults.csproj"/>
|
<ProjectReference Include="..\PresentPortal.ServiceDefaults\PresentPortal.ServiceDefaults.csproj"/>
|
||||||
|
<ProjectReference Include="..\PresentPortal.Shared\PresentPortal.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using PresentPortal.Shared;
|
||||||
using PresentPortal.Web;
|
using PresentPortal.Web;
|
||||||
using PresentPortal.Web.Components;
|
using PresentPortal.Web.Components;
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ builder.Services.AddHttpClient<WeatherApiClient>(client =>
|
|||||||
{
|
{
|
||||||
// This URL uses "https+http://" to indicate HTTPS is preferred over HTTP.
|
// This URL uses "https+http://" to indicate HTTPS is preferred over HTTP.
|
||||||
// Learn more about service discovery scheme resolution at https://aka.ms/dotnet/sdschemes.
|
// Learn more about service discovery scheme resolution at https://aka.ms/dotnet/sdschemes.
|
||||||
client.BaseAddress = new("https+http://apiservice");
|
client.BaseAddress = new($"https+http://{ServiceNames.Api}");
|
||||||
});
|
});
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
<Project Path="PresentPortal.ApiService\PresentPortal.ApiService.csproj" Type="Classic C#" />
|
<Project Path="PresentPortal.ApiService\PresentPortal.ApiService.csproj" Type="Classic C#" />
|
||||||
<Project Path="PresentPortal.AppHost\PresentPortal.AppHost.csproj" Type="Classic C#" />
|
<Project Path="PresentPortal.AppHost\PresentPortal.AppHost.csproj" Type="Classic C#" />
|
||||||
<Project Path="PresentPortal.ServiceDefaults\PresentPortal.ServiceDefaults.csproj" Type="Classic C#" />
|
<Project Path="PresentPortal.ServiceDefaults\PresentPortal.ServiceDefaults.csproj" Type="Classic C#" />
|
||||||
|
<Project Path="PresentPortal.Shared\PresentPortal.Shared.csproj" Type="Classic C#" />
|
||||||
<Project Path="PresentPortal.Tests\PresentPortal.Tests.csproj" Type="Classic C#" />
|
<Project Path="PresentPortal.Tests\PresentPortal.Tests.csproj" Type="Classic C#" />
|
||||||
<Project Path="PresentPortal.Web\PresentPortal.Web.csproj" Type="Classic C#" />
|
<Project Path="PresentPortal.Web\PresentPortal.Web.csproj" Type="Classic C#" />
|
||||||
</Solution>
|
</Solution>
|
||||||
Reference in New Issue
Block a user