Skip to content

Move IdentityServer instance and APIs from "Basics" to the v7 root level and adjust solutions #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RolandGuijt merged 2 commits into from
Jan 7, 2026
Merged

Move IdentityServer instance and APIs from "Basics" to the v7 root level and adjust solutions #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc53c13
Move IdentityServer instance and APIs from "Basics" to the v7 root le…
Jan 7, 2026
790af76
Fix package dependency problem for stepup
Jan 7, 2026
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
34 changes: 5 additions & 29 deletions BFF/v3/Angular/angular.ssr/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 IdentityServer/v7/Basics/Apis/README.md → IdentityServer/v7/Apis/README.md
View file
Open in desktop
File renamed without changes.
0 ...is/ResourceBasedApi/IdentityController.cs → ...is/ResourceBasedApi/IdentityController.cs
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...7/Basics/Apis/ResourceBasedApi/Program.cs → ...erver/v7/Apis/ResourceBasedApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System;
using Client;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using ResourceBasedApi;
Expand Down Expand Up @@ -32,7 +31,7 @@
// JWT tokens
.AddJwtBearer("token", options =>
{
options.Authority = Urls.IdentityServer;
options.Authority = "https://localhost:5001";
options.Audience = "resource2";

options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
Expand All @@ -44,7 +43,7 @@
// reference tokens
.AddOAuth2Introspection("introspection", options =>
{
options.Authority = Urls.IdentityServer;
options.Authority = "https://localhost:5001";

options.ClientId = "resource1";
options.ClientSecret = "secret";
Expand Down
0 ...ceBasedApi/Properties/launchSettings.json → ...ceBasedApi/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions .../ResourceBasedApi/ResourceBasedApi.csproj → .../ResourceBasedApi/ResourceBasedApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,4 @@
</ItemGroup>

<!-- Constants and helpers -->
<ItemGroup>
<Compile Include="..\..\Shared\Constants.cs">
<Link>Shared\Constants.cs</Link>
</Compile>

</ItemGroup>
</Project>
0 .../Basics/Apis/ResourceBasedApi/Selector.cs → ...rver/v7/Apis/ResourceBasedApi/Selector.cs
View file
Open in desktop
File renamed without changes.
0 ...sics/Apis/SimpleApi/IdentityController.cs → ...r/v7/Apis/SimpleApi/IdentityController.cs
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...erver/v7/Basics/Apis/SimpleApi/Program.cs → IdentityServer/v7/Apis/SimpleApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using Client;
using Serilog;
using Serilog.Events;
using Serilog.Sinks.SystemConsole.Themes;
Expand All @@ -26,7 +25,7 @@
builder.Services.AddAuthentication("token")
.AddJwtBearer("token", options =>
{
options.Authority = Urls.IdentityServer;
options.Authority = "https://localhost:5001";
options.TokenValidationParameters.ValidateAudience = false;

options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
Expand Down
4 changes: 2 additions & 2 deletions .../SimpleApi/Properties/launchSettings.json → .../SimpleApi/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"profiles": {
"Api": {
"SelfHost": {
"commandName": "Project",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5002"
}
}
}
}
5 changes: 0 additions & 5 deletions ...v7/Basics/Apis/SimpleApi/SimpleApi.csproj → ...Server/v7/Apis/SimpleApi/SimpleApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,5 @@
</ItemGroup>

<!-- Constants and helpers -->
<ItemGroup>
<Compile Include="..\..\Shared\Constants.cs">
<Link>Shared\Constants.cs</Link>
</Compile>
</ItemGroup>

</Project>
52 changes: 26 additions & 26 deletions IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{231602F3-72FC-4D10-9BB8-90FCCF662DF6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{62EB4A12-0868-4770-A63C-14FA07F0BF5C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{2538D8F8-8265-4C96-9888-DA03306C1CC2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -34,18 +34,6 @@ Global
{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x64.Build.0 = Release|Any CPU
{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.ActiveCfg = Release|Any CPU
{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.Build.0 = Release|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -58,18 +46,30 @@ Global
{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x64.ActiveCfg = Debug|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x64.Build.0 = Debug|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x86.ActiveCfg = Debug|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x86.Build.0 = Debug|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|Any CPU.Build.0 = Release|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x64.ActiveCfg = Release|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x64.Build.0 = Release|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x86.ActiveCfg = Release|Any CPU
{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x86.Build.0 = Release|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x64.ActiveCfg = Debug|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x64.Build.0 = Debug|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x86.ActiveCfg = Debug|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x86.Build.0 = Debug|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|Any CPU.Build.0 = Release|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x64.ActiveCfg = Release|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x64.Build.0 = Release|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x86.ActiveCfg = Release|Any CPU
{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
Expand Down
Loading
Loading