DPOP - Switch back to IdentityServerHost

DuendeSoftware · Jan 19, 2024 · 4866982 · 4866982
1 parent 20d2990
commit 4866982
Show file tree

Hide file tree

Showing 125 changed files with 79 additions and 77 deletions.
diff --git a/IdentityServer/v7/DPoP/.vscode/launch.json b/IdentityServer/v7/DPoP/.vscode/launch.json
@@ -3,28 +3,28 @@
     "compounds": [
         {
           "name": "Run All (interactive)",
-          "configurations": ["IdentityServer", "Api", "Web"],
+          "configurations": ["IdentityServerHost", "Api", "Web"],
           "presentation": {
             "group": "10-compunds",
           }
         },
         {
             "name": "Run All (client credentials)",
-            "configurations": ["IdentityServer", "Api", "ClientCredentials"],
+            "configurations": ["IdentityServerHost", "Api", "ClientCredentials"],
             "presentation": {
               "group": "10-compunds",
             }
           }
     ],
     "configurations": [
         {
-            "name": "IdentityServer",
+            "name": "IdentityServerHost",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build-identityserver",
-            "program": "${workspaceFolder}/IdentityServer/bin/Debug/net8.0/IdentityServer.dll",
+            "preLaunchTask": "build-IdentityServerHost",
+            "program": "${workspaceFolder}/IdentityServerHost/bin/Debug/net8.0/IdentityServerHost.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/IdentityServer",
+            "cwd": "${workspaceFolder}/IdentityServerHost",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },

diff --git a/IdentityServer/v7/DPoP/.vscode/tasks.json b/IdentityServer/v7/DPoP/.vscode/tasks.json
@@ -14,12 +14,12 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "build-identityserver",
+            "label": "build-IdentityServerHost",
             "type": "process",
             "command": "dotnet",
             "args": [
                 "build",
-                "${workspaceFolder}/IdentityServer",
+                "${workspaceFolder}/IdentityServerHost",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],

diff --git a/IdentityServer/v7/DPoP/ClientCredentials/Program.cs b/IdentityServer/v7/DPoP/ClientCredentials/Program.cs
@@ -13,6 +13,8 @@ public class Program
 {
     public static void Main(string[] args)
     {
+        Console.Title = "Client";
+
         Log.Logger = new LoggerConfiguration()
             .MinimumLevel.Debug()
             .WriteTo.Console(theme: AnsiConsoleTheme.Code)

diff --git a/IdentityServer/v7/DPoP/DPoP.sln b/IdentityServer/v7/DPoP/DPoP.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer", "IdentityServer\IdentityServer.csproj", "{7F49863A-08F1-4A9B-9740-C05CF679384F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "IdentityServerHost\IdentityServerHost.csproj", "{7F49863A-08F1-4A9B-9740-C05CF679384F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{1EDEC089-0640-44D0-8566-FFAB1F078F8A}"
 EndProject

diff --git a/...yServer/v7/DPoP/IdentityServer/Clients.cs → ...ver/v7/DPoP/IdentityServerHost/Clients.cs b/...yServer/v7/DPoP/IdentityServer/Clients.cs → ...ver/v7/DPoP/IdentityServerHost/Clients.cs
@@ -5,7 +5,7 @@
 using Duende.IdentityServer.Models;
 using System.Collections.Generic;
 
-namespace IdentityServer
+namespace IdentityServerHost
 {
     public static class Clients
     {

diff --git a/...DPoP/IdentityServer/IdentityServer.csproj → ...ntityServerHost/IdentityServerHost.csproj b/...DPoP/IdentityServer/IdentityServer.csproj → ...ntityServerHost/IdentityServerHost.csproj
diff --git a/...yServer/Pages/Account/AccessDenied.cshtml → ...verHost/Pages/Account/AccessDenied.cshtml b/...yServer/Pages/Account/AccessDenied.cshtml → ...verHost/Pages/Account/AccessDenied.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Account.AccessDeniedModel
+@model IdentityServerHost.Pages.Account.AccessDeniedModel
 @{
 }
 <div class="row">

diff --git a/...rver/Pages/Account/AccessDenied.cshtml.cs → ...Host/Pages/Account/AccessDenied.cshtml.cs b/...rver/Pages/Account/AccessDenied.cshtml.cs → ...Host/Pages/Account/AccessDenied.cshtml.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Account;
+namespace IdentityServerHost.Pages.Account;
 
 public class AccessDeniedModel : PageModel
 {

diff --git a/...yServer/Pages/Account/Create/Index.cshtml → ...verHost/Pages/Account/Create/Index.cshtml b/...yServer/Pages/Account/Create/Index.cshtml → ...verHost/Pages/Account/Create/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Create.Index
+@model IdentityServerHost.Pages.Create.Index
 
 <div class="login-page">
     <div class="lead">

diff --git a/...rver/Pages/Account/Create/Index.cshtml.cs → ...Host/Pages/Account/Create/Index.cshtml.cs b/...rver/Pages/Account/Create/Index.cshtml.cs → ...Host/Pages/Account/Create/Index.cshtml.cs
@@ -9,7 +9,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Create;
+namespace IdentityServerHost.Pages.Create;
 
 [SecurityHeaders]
 [AllowAnonymous]

diff --git a/...Server/Pages/Account/Create/InputModel.cs → ...erHost/Pages/Account/Create/InputModel.cs b/...Server/Pages/Account/Create/InputModel.cs → ...erHost/Pages/Account/Create/InputModel.cs
@@ -4,7 +4,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace IdentityServer.Pages.Create;
+namespace IdentityServerHost.Pages.Create;
 
 public class InputModel
 {

diff --git a/...tyServer/Pages/Account/Login/Index.cshtml → ...rverHost/Pages/Account/Login/Index.cshtml b/...tyServer/Pages/Account/Login/Index.cshtml → ...rverHost/Pages/Account/Login/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Login.Index
+@model IdentityServerHost.Pages.Login.Index
 
 <div class="login-page">
     <div class="lead">

diff --git a/...erver/Pages/Account/Login/Index.cshtml.cs → ...rHost/Pages/Account/Login/Index.cshtml.cs b/...erver/Pages/Account/Login/Index.cshtml.cs → ...rHost/Pages/Account/Login/Index.cshtml.cs
@@ -9,7 +9,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Login;
+namespace IdentityServerHost.Pages.Login;
 
 [SecurityHeaders]
 [AllowAnonymous]

diff --git a/...yServer/Pages/Account/Login/InputModel.cs → ...verHost/Pages/Account/Login/InputModel.cs b/...yServer/Pages/Account/Login/InputModel.cs → ...verHost/Pages/Account/Login/InputModel.cs
@@ -4,7 +4,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace IdentityServer.Pages.Login;
+namespace IdentityServerHost.Pages.Login;
 
 public class InputModel
 {

diff --git a/...erver/Pages/Account/Login/LoginOptions.cs → ...rHost/Pages/Account/Login/LoginOptions.cs b/...erver/Pages/Account/Login/LoginOptions.cs → ...rHost/Pages/Account/Login/LoginOptions.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Pages.Login;
+namespace IdentityServerHost.Pages.Login;
 
 public class LoginOptions
 {

diff --git a/...tyServer/Pages/Account/Login/ViewModel.cs → ...rverHost/Pages/Account/Login/ViewModel.cs b/...tyServer/Pages/Account/Login/ViewModel.cs → ...rverHost/Pages/Account/Login/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-namespace IdentityServer.Pages.Login;
+namespace IdentityServerHost.Pages.Login;
 
 public class ViewModel
 {

diff --git a/...yServer/Pages/Account/Logout/Index.cshtml → ...verHost/Pages/Account/Logout/Index.cshtml b/...yServer/Pages/Account/Logout/Index.cshtml → ...verHost/Pages/Account/Logout/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Logout.Index
+@model IdentityServerHost.Pages.Logout.Index
 
 <div class="logout-page">
     <div class="lead">

diff --git a/...rver/Pages/Account/Logout/Index.cshtml.cs → ...Host/Pages/Account/Logout/Index.cshtml.cs b/...rver/Pages/Account/Logout/Index.cshtml.cs → ...Host/Pages/Account/Logout/Index.cshtml.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Logout;
+namespace IdentityServerHost.Pages.Logout;
 
 [SecurityHeaders]
 [AllowAnonymous]

diff --git a/...ver/Pages/Account/Logout/LoggedOut.cshtml → ...ost/Pages/Account/Logout/LoggedOut.cshtml b/...ver/Pages/Account/Logout/LoggedOut.cshtml → ...ost/Pages/Account/Logout/LoggedOut.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Logout.LoggedOut
+@model IdentityServerHost.Pages.Logout.LoggedOut
 
 <div class="logged-out-page">
     <h1>

diff --git a/.../Pages/Account/Logout/LoggedOut.cshtml.cs → .../Pages/Account/Logout/LoggedOut.cshtml.cs b/.../Pages/Account/Logout/LoggedOut.cshtml.cs → .../Pages/Account/Logout/LoggedOut.cshtml.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Logout;
+namespace IdentityServerHost.Pages.Logout;
 
 [SecurityHeaders]
 [AllowAnonymous]

diff --git a/...ages/Account/Logout/LoggedOutViewModel.cs → ...ages/Account/Logout/LoggedOutViewModel.cs b/...ages/Account/Logout/LoggedOutViewModel.cs → ...ages/Account/Logout/LoggedOutViewModel.cs
@@ -3,7 +3,7 @@
 // See LICENSE in the project root for license information.
 
 
-namespace IdentityServer.Pages.Logout;
+namespace IdentityServerHost.Pages.Logout;
 
 public class LoggedOutViewModel
 {

diff --git a/...ver/Pages/Account/Logout/LogoutOptions.cs → ...ost/Pages/Account/Logout/LogoutOptions.cs b/...ver/Pages/Account/Logout/LogoutOptions.cs → ...ost/Pages/Account/Logout/LogoutOptions.cs
@@ -1,5 +1,5 @@
 
-namespace IdentityServer.Pages.Logout;
+namespace IdentityServerHost.Pages.Logout;
 
 public class LogoutOptions
 {

diff --git a/...DPoP/IdentityServer/Pages/Ciba/All.cshtml → .../IdentityServerHost/Pages/Ciba/All.cshtml b/...DPoP/IdentityServer/Pages/Ciba/All.cshtml → .../IdentityServerHost/Pages/Ciba/All.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Ciba.AllModel
+@model IdentityServerHost.Pages.Ciba.AllModel
 @{
 }
 

diff --git a/...P/IdentityServer/Pages/Ciba/All.cshtml.cs → ...entityServerHost/Pages/Ciba/All.cshtml.cs b/...P/IdentityServer/Pages/Ciba/All.cshtml.cs → ...entityServerHost/Pages/Ciba/All.cshtml.cs
@@ -8,7 +8,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Ciba;
+namespace IdentityServerHost.Pages.Ciba;
 
 [SecurityHeaders]
 [Authorize]

diff --git a/.../IdentityServer/Pages/Ciba/Consent.cshtml → ...ntityServerHost/Pages/Ciba/Consent.cshtml b/.../IdentityServer/Pages/Ciba/Consent.cshtml → ...ntityServerHost/Pages/Ciba/Consent.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Ciba.Consent
+@model IdentityServerHost.Pages.Ciba.Consent
 @{
 }
 

diff --git a/...entityServer/Pages/Ciba/Consent.cshtml.cs → ...tyServerHost/Pages/Ciba/Consent.cshtml.cs b/...entityServer/Pages/Ciba/Consent.cshtml.cs → ...tyServerHost/Pages/Ciba/Consent.cshtml.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Ciba;
+namespace IdentityServerHost.Pages.Ciba;
 
 [Authorize]
 [SecurityHeadersAttribute]

diff --git a/...ityServer/Pages/Consent/ConsentOptions.cs → ...tyServerHost/Pages/Ciba/ConsentOptions.cs b/...ityServer/Pages/Consent/ConsentOptions.cs → ...tyServerHost/Pages/Ciba/ConsentOptions.cs
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 
-namespace IdentityServer.Pages.Consent;
+namespace IdentityServerHost.Pages.Ciba;
 
 public class ConsentOptions
 {

diff --git a/...oP/IdentityServer/Pages/Ciba/Index.cshtml → ...dentityServerHost/Pages/Ciba/Index.cshtml b/...oP/IdentityServer/Pages/Ciba/Index.cshtml → ...dentityServerHost/Pages/Ciba/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Ciba.IndexModel
+@model IdentityServerHost.Pages.Ciba.IndexModel
 @{
 }
 

diff --git a/...IdentityServer/Pages/Ciba/Index.cshtml.cs → ...tityServerHost/Pages/Ciba/Index.cshtml.cs b/...IdentityServer/Pages/Ciba/Index.cshtml.cs → ...tityServerHost/Pages/Ciba/Index.cshtml.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Ciba;
+namespace IdentityServerHost.Pages.Ciba;
 
 [AllowAnonymous]
 [SecurityHeaders]

diff --git a/...P/IdentityServer/Pages/Ciba/InputModel.cs → ...entityServerHost/Pages/Ciba/InputModel.cs b/...P/IdentityServer/Pages/Ciba/InputModel.cs → ...entityServerHost/Pages/Ciba/InputModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-namespace IdentityServer.Pages.Ciba;
+namespace IdentityServerHost.Pages.Ciba;
 
 public class InputModel
 {

diff --git a/...oP/IdentityServer/Pages/Ciba/ViewModel.cs → ...dentityServerHost/Pages/Ciba/ViewModel.cs b/...oP/IdentityServer/Pages/Ciba/ViewModel.cs → ...dentityServerHost/Pages/Ciba/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-namespace IdentityServer.Pages.Ciba;
+namespace IdentityServerHost.Pages.Ciba;
 
 public class ViewModel
 {

diff --git a/...tyServer/Pages/Ciba/_ScopeListItem.cshtml → ...rverHost/Pages/Ciba/_ScopeListItem.cshtml b/...tyServer/Pages/Ciba/_ScopeListItem.cshtml → ...rverHost/Pages/Ciba/_ScopeListItem.cshtml
@@ -1,4 +1,4 @@
-@using IdentityServer.Pages.Ciba
+@using IdentityServerHost.Pages.Ciba
 @model ScopeViewModel
 
 <li class="list-group-item">

diff --git a/...entityServer/Pages/Ciba/ConsentOptions.cs → ...erverHost/Pages/Consent/ConsentOptions.cs b/...entityServer/Pages/Ciba/ConsentOptions.cs → ...erverHost/Pages/Consent/ConsentOptions.cs
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 
-namespace IdentityServer.Pages.Ciba;
+namespace IdentityServerHost.Pages.Consent;
 
 public class ConsentOptions
 {

diff --git a/...IdentityServer/Pages/Consent/Index.cshtml → ...tityServerHost/Pages/Consent/Index.cshtml b/...IdentityServer/Pages/Consent/Index.cshtml → ...tityServerHost/Pages/Consent/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Consent.Index
+@model IdentityServerHost.Pages.Consent.Index
 @{
 }
 

diff --git a/...ntityServer/Pages/Consent/Index.cshtml.cs → ...yServerHost/Pages/Consent/Index.cshtml.cs b/...ntityServer/Pages/Consent/Index.cshtml.cs → ...yServerHost/Pages/Consent/Index.cshtml.cs
@@ -8,7 +8,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Consent;
+namespace IdentityServerHost.Pages.Consent;
 
 [Authorize]
 [SecurityHeadersAttribute]

diff --git a/...dentityServer/Pages/Consent/InputModel.cs → ...ityServerHost/Pages/Consent/InputModel.cs b/...dentityServer/Pages/Consent/InputModel.cs → ...ityServerHost/Pages/Consent/InputModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-namespace IdentityServer.Pages.Consent;
+namespace IdentityServerHost.Pages.Consent;
 
 public class InputModel
 {

diff --git a/...IdentityServer/Pages/Consent/ViewModel.cs → ...tityServerHost/Pages/Consent/ViewModel.cs b/...IdentityServer/Pages/Consent/ViewModel.cs → ...tityServerHost/Pages/Consent/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-namespace IdentityServer.Pages.Consent;
+namespace IdentityServerHost.Pages.Consent;
 
 public class ViewModel
 {

diff --git a/...erver/Pages/Consent/_ScopeListItem.cshtml → ...rHost/Pages/Consent/_ScopeListItem.cshtml b/...erver/Pages/Consent/_ScopeListItem.cshtml → ...rHost/Pages/Consent/_ScopeListItem.cshtml
@@ -1,4 +1,4 @@
-@using IdentityServer.Pages.Consent
+@using IdentityServerHost.Pages.Consent
 @model ScopeViewModel
 
 <li class="list-group-item">

diff --git a/...ntityServer/Pages/Device/DeviceOptions.cs → ...yServerHost/Pages/Device/DeviceOptions.cs b/...ntityServer/Pages/Device/DeviceOptions.cs → ...yServerHost/Pages/Device/DeviceOptions.cs
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 
-namespace IdentityServer.Pages.Device;
+namespace IdentityServerHost.Pages.Device;
 
 public class DeviceOptions
 {

diff --git a/.../IdentityServer/Pages/Device/Index.cshtml → ...ntityServerHost/Pages/Device/Index.cshtml b/.../IdentityServer/Pages/Device/Index.cshtml → ...ntityServerHost/Pages/Device/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Device.Index
+@model IdentityServerHost.Pages.Device.Index
 @{
 }
 

diff --git a/...entityServer/Pages/Device/Index.cshtml.cs → ...tyServerHost/Pages/Device/Index.cshtml.cs b/...entityServer/Pages/Device/Index.cshtml.cs → ...tyServerHost/Pages/Device/Index.cshtml.cs
@@ -4,13 +4,13 @@
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityServer.Pages.Consent;
+using IdentityServerHost.Pages.Consent;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Options;
 
-namespace IdentityServer.Pages.Device;
+namespace IdentityServerHost.Pages.Device;
 
 [SecurityHeaders]
 [Authorize]

diff --git a/...IdentityServer/Pages/Device/InputModel.cs → ...tityServerHost/Pages/Device/InputModel.cs b/...IdentityServer/Pages/Device/InputModel.cs → ...tityServerHost/Pages/Device/InputModel.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Pages.Device;
+namespace IdentityServerHost.Pages.Device;
 
 public class InputModel
 {

diff --git a/...dentityServer/Pages/Device/Success.cshtml → ...ityServerHost/Pages/Device/Success.cshtml b/...dentityServer/Pages/Device/Success.cshtml → ...ityServerHost/Pages/Device/Success.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IdentityServer.Pages.Device.SuccessModel
+@model IdentityServerHost.Pages.Device.SuccessModel
 @{
 }
 

diff --git a/...tityServer/Pages/Device/Success.cshtml.cs → ...ServerHost/Pages/Device/Success.cshtml.cs b/...tityServer/Pages/Device/Success.cshtml.cs → ...ServerHost/Pages/Device/Success.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace IdentityServer.Pages.Device;
+namespace IdentityServerHost.Pages.Device;
 
 [SecurityHeaders]
 [Authorize]

diff --git a/.../IdentityServer/Pages/Device/ViewModel.cs → ...ntityServerHost/Pages/Device/ViewModel.cs b/.../IdentityServer/Pages/Device/ViewModel.cs → ...ntityServerHost/Pages/Device/ViewModel.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Pages.Device;
+namespace IdentityServerHost.Pages.Device;
 
 public class ViewModel
 {