Skip to content

Commit f851f2b

Browse files
RolandGuijtRoland Guijt
andauthored
Move IdentityServer instance and APIs from "Basics" to the v7 root level and adjust solutions (#274)
* Move IdentityServer instance and APIs from "Basics" to the v7 root level and adjust solutions * Fix package dependency problem for stepup --------- Co-authored-by: Roland Guijt <roland.guijt@duendesoftware.com>
1 parent d2420db commit f851f2b

File tree

140 files changed

+220
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+220
-258
lines changed

BFF/v3/Angular/angular.ssr/package-lock.json

Lines changed: 5 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

IdentityServer/v7/Basics/Apis/ResourceBasedApi/IdentityController.cs renamed to IdentityServer/v7/Apis/ResourceBasedApi/IdentityController.cs

File renamed without changes.

IdentityServer/v7/Basics/Apis/ResourceBasedApi/Program.cs renamed to IdentityServer/v7/Apis/ResourceBasedApi/Program.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
using System;
5-
using Client;
65
using Microsoft.AspNetCore.Builder;
76
using Microsoft.Extensions.DependencyInjection;
87
using ResourceBasedApi;
@@ -32,7 +31,7 @@
3231
// JWT tokens
3332
.AddJwtBearer("token", options =>
3433
{
35-
options.Authority = Urls.IdentityServer;
34+
options.Authority = "https://localhost:5001";
3635
options.Audience = "resource2";
3736

3837
options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
@@ -44,7 +43,7 @@
4443
// reference tokens
4544
.AddOAuth2Introspection("introspection", options =>
4645
{
47-
options.Authority = Urls.IdentityServer;
46+
options.Authority = "https://localhost:5001";
4847

4948
options.ClientId = "resource1";
5049
options.ClientSecret = "secret";

IdentityServer/v7/Basics/Apis/ResourceBasedApi/Properties/launchSettings.json renamed to IdentityServer/v7/Apis/ResourceBasedApi/Properties/launchSettings.json

File renamed without changes.

IdentityServer/v7/Basics/Apis/ResourceBasedApi/ResourceBasedApi.csproj renamed to IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,4 @@
1212
</ItemGroup>
1313

1414
<!-- Constants and helpers -->
15-
<ItemGroup>
16-
<Compile Include="..\..\Shared\Constants.cs">
17-
<Link>Shared\Constants.cs</Link>
18-
</Compile>
19-
20-
</ItemGroup>
2115
</Project>

IdentityServer/v7/Basics/Apis/ResourceBasedApi/Selector.cs renamed to IdentityServer/v7/Apis/ResourceBasedApi/Selector.cs

File renamed without changes.

IdentityServer/v7/Basics/Apis/SimpleApi/IdentityController.cs renamed to IdentityServer/v7/Apis/SimpleApi/IdentityController.cs

File renamed without changes.

IdentityServer/v7/Basics/Apis/SimpleApi/Program.cs renamed to IdentityServer/v7/Apis/SimpleApi/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Duende Software. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Client;
54
using Serilog;
65
using Serilog.Events;
76
using Serilog.Sinks.SystemConsole.Themes;
@@ -26,7 +25,7 @@
2625
builder.Services.AddAuthentication("token")
2726
.AddJwtBearer("token", options =>
2827
{
29-
options.Authority = Urls.IdentityServer;
28+
options.Authority = "https://localhost:5001";
3029
options.TokenValidationParameters.ValidateAudience = false;
3130

3231
options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };

IdentityServer/v7/Basics/Apis/SimpleApi/Properties/launchSettings.json renamed to IdentityServer/v7/Apis/SimpleApi/Properties/launchSettings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"profiles": {
3-
"Api": {
3+
"SelfHost": {
44
"commandName": "Project",
55
"environmentVariables": {
66
"ASPNETCORE_ENVIRONMENT": "Development"
77
},
88
"applicationUrl": "https://localhost:5002"
99
}
1010
}
11-
}
11+
}

0 commit comments

Comments
 (0)