Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj

This file was deleted.

This file was deleted.

40 changes: 0 additions & 40 deletions IdentityServer/v7/UserInteraction/ProfileService/Api/Program.cs

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@
<Link>Shared\Constants.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

var builder = WebApplication.CreateBuilder(args);

builder.AddServiceDefaults();

builder.Services.AddControllersWithViews();
builder.Services.AddHttpClient();

Expand Down Expand Up @@ -63,6 +65,8 @@

var app = builder.Build();

app.MapDefaultEndpoints();

app.UseDeveloperExceptionPage();
app.UseStaticFiles();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

<ItemGroup>
<PackageReference Include="Duende.IdentityServer" />
<PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,15 @@
using Duende.IdentityServer;
using IdentityServerHost;
using Microsoft.AspNetCore.DataProtection;
using Serilog;
using Serilog.Events;
using Serilog.Sinks.SystemConsole.Themes;

Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
.MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
.MinimumLevel.Override("System", LogEventLevel.Warning)
.MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
.Enrich.FromLogContext()
// uncomment to write to Azure diagnostics stream
//.WriteTo.File(
// @"D:\home\LogFiles\Application\identityserver.txt",
// fileSizeLimitBytes: 1_000_000,
// rollOnFileSizeLimit: true,
// shared: true,
// flushToDiskInterval: TimeSpan.FromSeconds(1))
.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
.CreateLogger();

var builder = WebApplication.CreateBuilder(args);

builder.Services.AddSerilog();
builder.AddServiceDefaults();

builder.Services.AddRazorPages();

var idsvrBuilder = builder.Services.AddIdentityServer(options =>
{
options.Events.RaiseErrorEvents = true;
options.Events.RaiseInformationEvents = true;
options.Events.RaiseFailureEvents = true;
options.Events.RaiseSuccessEvents = true;

// see https://docs.duendesoftware.com/identityserver/fundamentals/resources/
options.EmitStaticAudienceClaim = true;
})
Expand Down Expand Up @@ -72,6 +47,8 @@

var app = builder.Build();

app.MapDefaultEndpoints();

if (app.Environment.IsDevelopment())
{
app.UseDeveloperExceptionPage();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var builder = DistributedApplication.CreateBuilder(args);

var idp = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");

var api = builder.AddProject<Projects.SimpleApi>("simpleapi");

builder.AddProject<Projects.Client>("client")
.WaitFor(idp)
.WaitFor(api);

builder.Build().Run();
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="Aspire.AppHost.Sdk/13.2.2">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>5c75dcd6-9173-476d-85f7-b7e4eacdf45d</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\IdentityServerHost\IdentityServerHost.csproj" />
<ProjectReference Include="..\Client\Client.csproj" />
<ProjectReference Include="..\..\..\Apis\SimpleApi\SimpleApi.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:17047;http://localhost:15290",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ENVIRONMENT": "Development",
"ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21174",
"ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23175",
"ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22123"
}
},
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:15290",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ENVIRONMENT": "Development",
"ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19219",
"ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18148",
"ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20033"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Aspire.Hosting.Dcp": "Warning"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,82 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "Ident
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{7E6CC06C-13D3-4754-BC55-E224C42F5F78}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{D87B7842-E586-4DC4-95E1-539841AB5FF0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{39063407-1CFA-4AB0-82A4-958BF215758B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfileService.AppHost", "ProfileService.AppHost\ProfileService.AppHost.csproj", "{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{0D5D1788-E500-4944-9A72-F46A5E641D47}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0E801369-EC29-497E-9D41-403E4111F672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Debug|x64.ActiveCfg = Debug|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Debug|x64.Build.0 = Debug|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Debug|x86.ActiveCfg = Debug|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Debug|x86.Build.0 = Debug|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Release|Any CPU.Build.0 = Release|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Release|x64.ActiveCfg = Release|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Release|x64.Build.0 = Release|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Release|x86.ActiveCfg = Release|Any CPU
{0E801369-EC29-497E-9D41-403E4111F672}.Release|x86.Build.0 = Release|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Debug|x64.ActiveCfg = Debug|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Debug|x64.Build.0 = Debug|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Debug|x86.ActiveCfg = Debug|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Debug|x86.Build.0 = Debug|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Release|Any CPU.Build.0 = Release|Any CPU
{D87B7842-E586-4DC4-95E1-539841AB5FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D87B7842-E586-4DC4-95E1-539841AB5FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D87B7842-E586-4DC4-95E1-539841AB5FF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D87B7842-E586-4DC4-95E1-539841AB5FF0}.Release|Any CPU.Build.0 = Release|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Release|x64.ActiveCfg = Release|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Release|x64.Build.0 = Release|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Release|x86.ActiveCfg = Release|Any CPU
{7E6CC06C-13D3-4754-BC55-E224C42F5F78}.Release|x86.Build.0 = Release|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Debug|x64.ActiveCfg = Debug|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Debug|x64.Build.0 = Debug|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Debug|x86.ActiveCfg = Debug|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Debug|x86.Build.0 = Debug|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Release|Any CPU.Build.0 = Release|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Release|x64.ActiveCfg = Release|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Release|x64.Build.0 = Release|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Release|x86.ActiveCfg = Release|Any CPU
{39063407-1CFA-4AB0-82A4-958BF215758B}.Release|x86.Build.0 = Release|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Debug|x64.ActiveCfg = Debug|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Debug|x64.Build.0 = Debug|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Debug|x86.ActiveCfg = Debug|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Debug|x86.Build.0 = Debug|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Release|Any CPU.Build.0 = Release|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Release|x64.ActiveCfg = Release|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Release|x64.Build.0 = Release|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Release|x86.ActiveCfg = Release|Any CPU
{1DCE85A2-4D3B-4DD0-B582-A3D09DAA8028}.Release|x86.Build.0 = Release|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Debug|x64.ActiveCfg = Debug|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Debug|x64.Build.0 = Debug|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Debug|x86.ActiveCfg = Debug|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Debug|x86.Build.0 = Debug|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Release|Any CPU.Build.0 = Release|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Release|x64.ActiveCfg = Release|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Release|x64.Build.0 = Release|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Release|x86.ActiveCfg = Release|Any CPU
{0D5D1788-E500-4944-9A72-F46A5E641D47}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
21 changes: 0 additions & 21 deletions IdentityServer/v8/UserInteraction/ProfileService/Api/Api.csproj

This file was deleted.

Loading
Loading