Skip to content

Commit bbf1943

Browse files
RolandGuijtroland
andauthored
Add Aspire to profile service sample (#324)
Co-authored-by: roland <roland.guijt@gmail.com>
1 parent b5923b0 commit bbf1943

28 files changed

Lines changed: 263 additions & 262 deletions

IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

IdentityServer/v7/UserInteraction/ProfileService/Api/IdentityController.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

IdentityServer/v7/UserInteraction/ProfileService/Api/Program.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

IdentityServer/v7/UserInteraction/ProfileService/Api/Properties/launchSettings.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@
1818
<Link>Shared\Constants.cs</Link>
1919
</Compile>
2020
</ItemGroup>
21+
<ItemGroup>
22+
<ProjectReference Include="..\..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
23+
</ItemGroup>
2124

2225
</Project>

IdentityServer/v7/UserInteraction/ProfileService/Client/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
var builder = WebApplication.CreateBuilder(args);
1111

12+
builder.AddServiceDefaults();
13+
1214
builder.Services.AddControllersWithViews();
1315
builder.Services.AddHttpClient();
1416

@@ -63,6 +65,8 @@
6365

6466
var app = builder.Build();
6567

68+
app.MapDefaultEndpoints();
69+
6670
app.UseDeveloperExceptionPage();
6771
app.UseStaticFiles();
6872

IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
<ItemGroup>
99
<PackageReference Include="Duende.IdentityServer" />
10-
<PackageReference Include="Serilog.AspNetCore" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
1114
</ItemGroup>
1215

1316
</Project>

IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/Program.cs

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,15 @@
44
using Duende.IdentityServer;
55
using IdentityServerHost;
66
using Microsoft.AspNetCore.DataProtection;
7-
using Serilog;
8-
using Serilog.Events;
9-
using Serilog.Sinks.SystemConsole.Themes;
10-
11-
Log.Logger = new LoggerConfiguration()
12-
.MinimumLevel.Debug()
13-
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
14-
.MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
15-
.MinimumLevel.Override("System", LogEventLevel.Warning)
16-
.MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
17-
.Enrich.FromLogContext()
18-
// uncomment to write to Azure diagnostics stream
19-
//.WriteTo.File(
20-
// @"D:\home\LogFiles\Application\identityserver.txt",
21-
// fileSizeLimitBytes: 1_000_000,
22-
// rollOnFileSizeLimit: true,
23-
// shared: true,
24-
// flushToDiskInterval: TimeSpan.FromSeconds(1))
25-
.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
26-
.CreateLogger();
277

288
var builder = WebApplication.CreateBuilder(args);
299

30-
builder.Services.AddSerilog();
10+
builder.AddServiceDefaults();
3111

3212
builder.Services.AddRazorPages();
3313

3414
var idsvrBuilder = builder.Services.AddIdentityServer(options =>
3515
{
36-
options.Events.RaiseErrorEvents = true;
37-
options.Events.RaiseInformationEvents = true;
38-
options.Events.RaiseFailureEvents = true;
39-
options.Events.RaiseSuccessEvents = true;
40-
4116
// see https://docs.duendesoftware.com/identityserver/fundamentals/resources/
4217
options.EmitStaticAudienceClaim = true;
4318
})
@@ -72,6 +47,8 @@
7247

7348
var app = builder.Build();
7449

50+
app.MapDefaultEndpoints();
51+
7552
if (app.Environment.IsDevelopment())
7653
{
7754
app.UseDeveloperExceptionPage();
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
var builder = DistributedApplication.CreateBuilder(args);
2+
3+
var idp = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");
4+
5+
var api = builder.AddProject<Projects.SimpleApi>("simpleapi");
6+
7+
builder.AddProject<Projects.Client>("client")
8+
.WaitFor(idp)
9+
.WaitFor(api);
10+
11+
builder.Build().Run();
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project Sdk="Aspire.AppHost.Sdk/13.2.2">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<UserSecretsId>5c75dcd6-9173-476d-85f7-b7e4eacdf45d</UserSecretsId>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Aspire.Hosting.AppHost" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\IdentityServerHost\IdentityServerHost.csproj" />
17+
<ProjectReference Include="..\Client\Client.csproj" />
18+
<ProjectReference Include="..\..\..\Apis\SimpleApi\SimpleApi.csproj" />
19+
</ItemGroup>
20+
21+
</Project>

0 commit comments

Comments
 (0)