From 0f9b3853b7a3d5a541ff63547028973488f7ca24 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Fri, 19 Jan 2024 12:35:29 -0600 Subject: [PATCH 1/3] SessionManagement - Update to .NET 8 --- .../v7/SessionManagement/.vscode/launch.json | 53 ++++++++++++++++++ .../v7/SessionManagement/.vscode/tasks.json | 53 ++++++++++++++++++ .../ApiHost.csproj => Api/Api.csproj} | 7 +-- .../Api/IdentityController.cs | 27 +++++++++ .../v7/SessionManagement/Api/Program.cs | 36 ++++++++++++ .../Properties/launchSettings.json | 0 .../v7/SessionManagement/Api/Startup.cs | 40 +++++++++++++ .../Client.csproj} | 6 +- .../Controllers/HomeController.cs | 0 .../Controllers/LogoutController.cs | 5 +- .../CookieEventHandler.cs | 0 .../LogoutSessionManager.cs | 0 .../{BackChannelClient => Client}/Program.cs | 3 + .../Properties/launchSettings.json | 0 .../{BackChannelClient => Client}/Startup.cs | 0 .../Views/Home/CallApi.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Home/Secure.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../wwwroot/css/site.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/js/site.js | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../lib/bootstrap/dist/css/bootstrap-grid.css | 0 .../bootstrap/dist/css/bootstrap-grid.css.map | 0 .../bootstrap/dist/css/bootstrap-grid.min.css | 0 .../dist/css/bootstrap-grid.min.css.map | 0 .../bootstrap/dist/css/bootstrap-reboot.css | 0 .../dist/css/bootstrap-reboot.css.map | 0 .../dist/css/bootstrap-reboot.min.css | 0 .../dist/css/bootstrap-reboot.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.js | 0 .../bootstrap/dist/js/bootstrap.bundle.js.map | 0 .../bootstrap/dist/js/bootstrap.bundle.min.js | 0 .../dist/js/bootstrap.bundle.min.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../bootstrap/dist/js/bootstrap.min.js.map | 0 .../jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 .../IdentityServer/Clients.cs | 2 +- .../IdentityServer/IdentityServer.csproj | 12 ++++ .../IdentityServer/IdentityServerHost.csproj | 12 ---- .../Pages/Account/AccessDenied.cshtml | 2 +- .../Pages/Account/AccessDenied.cshtml.cs | 2 +- .../Pages/Account/Login/Index.cshtml | 2 +- .../Pages/Account/Login/Index.cshtml.cs | 2 +- .../Pages/Account/Login/InputModel.cs | 2 +- .../Pages/Account/Login/LoginOptions.cs | 2 +- .../Pages/Account/Login/ViewModel.cs | 2 +- .../Pages/Account/Logout/Index.cshtml | 2 +- .../Pages/Account/Logout/Index.cshtml.cs | 2 +- .../Pages/Account/Logout/LoggedOut.cshtml | 2 +- .../Pages/Account/Logout/LoggedOut.cshtml.cs | 2 +- .../Account/Logout/LoggedOutViewModel.cs | 2 +- .../Pages/Account/Logout/LogoutOptions.cs | 2 +- .../IdentityServer/Pages/Ciba/All.cshtml | 2 +- .../IdentityServer/Pages/Ciba/All.cshtml.cs | 2 +- .../IdentityServer/Pages/Ciba/Consent.cshtml | 2 +- .../Pages/Ciba/Consent.cshtml.cs | 2 +- .../Pages/Ciba/ConsentOptions.cs | 2 +- .../IdentityServer/Pages/Ciba/Index.cshtml | 2 +- .../IdentityServer/Pages/Ciba/Index.cshtml.cs | 2 +- .../IdentityServer/Pages/Ciba/InputModel.cs | 2 +- .../IdentityServer/Pages/Ciba/ViewModel.cs | 2 +- .../Pages/Ciba/_ScopeListItem.cshtml | 2 +- .../Pages/Consent/ConsentOptions.cs | 2 +- .../IdentityServer/Pages/Consent/Index.cshtml | 2 +- .../Pages/Consent/Index.cshtml.cs | 2 +- .../Pages/Consent/InputModel.cs | 2 +- .../IdentityServer/Pages/Consent/ViewModel.cs | 2 +- .../Pages/Consent/_ScopeListItem.cshtml | 2 +- .../Pages/Device/DeviceOptions.cs | 2 +- .../IdentityServer/Pages/Device/Index.cshtml | 2 +- .../Pages/Device/Index.cshtml.cs | 4 +- .../IdentityServer/Pages/Device/InputModel.cs | 2 +- .../Pages/Device/Success.cshtml | 2 +- .../Pages/Device/Success.cshtml.cs | 2 +- .../IdentityServer/Pages/Device/ViewModel.cs | 2 +- .../Pages/Device/_ScopeListItem.cshtml | 2 +- .../Pages/Diagnostics/Index.cshtml | 2 +- .../Pages/Diagnostics/Index.cshtml.cs | 2 +- .../Pages/Diagnostics/ViewModel.cs | 2 +- .../IdentityServer/Pages/Extensions.cs | 2 +- .../Pages/ExternalLogin/Callback.cshtml | 2 +- .../Pages/ExternalLogin/Callback.cshtml.cs | 2 +- .../Pages/ExternalLogin/Challenge.cshtml | 2 +- .../Pages/ExternalLogin/Challenge.cshtml.cs | 2 +- .../IdentityServer/Pages/Grants/Index.cshtml | 2 +- .../Pages/Grants/Index.cshtml.cs | 2 +- .../IdentityServer/Pages/Grants/ViewModel.cs | 2 +- .../Pages/Home/Error/Index.cshtml | 2 +- .../Pages/Home/Error/Index.cshtml.cs | 2 +- .../Pages/Home/Error/ViewModel.cs | 2 +- .../IdentityServer/Pages/Index.cshtml | 2 +- .../IdentityServer/Pages/Index.cshtml.cs | 2 +- .../Pages/Redirect/Index.cshtml | 2 +- .../Pages/Redirect/Index.cshtml.cs | 2 +- .../Pages/SecurityHeadersAttribute.cs | 13 +++-- .../Pages/ServerSideSessions/Index.cshtml | 2 +- .../Pages/ServerSideSessions/Index.cshtml.cs | 2 +- .../IdentityServer/Pages/TestUsers.cs | 2 +- .../IdentityServer/Pages/_ViewImports.cshtml | 2 +- .../IdentityServer/Program.cs | 17 ++---- .../IdentityServer/Resources.cs | 2 +- .../IdentityServer/Startup.cs | 2 +- IdentityServer/v7/SessionManagement/README.md | 4 +- .../SessionManagement/SessionManagement.sln | 6 +- .../SimpleApi/IdentityController.cs | 28 --------- .../v7/SessionManagement/SimpleApi/Program.cs | 36 ------------ .../v7/SessionManagement/SimpleApi/Startup.cs | 41 -------------- 130 files changed, 312 insertions(+), 213 deletions(-) create mode 100644 IdentityServer/v7/SessionManagement/.vscode/launch.json create mode 100644 IdentityServer/v7/SessionManagement/.vscode/tasks.json rename IdentityServer/v7/SessionManagement/{SimpleApi/ApiHost.csproj => Api/Api.csproj} (56%) create mode 100644 IdentityServer/v7/SessionManagement/Api/IdentityController.cs create mode 100644 IdentityServer/v7/SessionManagement/Api/Program.cs rename IdentityServer/v7/SessionManagement/{SimpleApi => Api}/Properties/launchSettings.json (100%) create mode 100644 IdentityServer/v7/SessionManagement/Api/Startup.cs rename IdentityServer/v7/SessionManagement/{BackChannelClient/BackChannelClient.csproj => Client/Client.csproj} (56%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Controllers/HomeController.cs (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Controllers/LogoutController.cs (95%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/CookieEventHandler.cs (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/LogoutSessionManager.cs (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Program.cs (90%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Properties/launchSettings.json (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Startup.cs (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/Home/CallApi.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/Home/Index.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/Home/Secure.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/Shared/Error.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/Shared/_Layout.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/_ViewImports.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/Views/_ViewStart.cshtml (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/css/site.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/favicon.ico (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/js/site.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/LICENSE (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery/LICENSE.txt (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery/dist/jquery.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename IdentityServer/v7/SessionManagement/{BackChannelClient => Client}/wwwroot/lib/jquery/dist/jquery.min.map (100%) create mode 100644 IdentityServer/v7/SessionManagement/IdentityServer/IdentityServer.csproj delete mode 100644 IdentityServer/v7/SessionManagement/IdentityServer/IdentityServerHost.csproj delete mode 100644 IdentityServer/v7/SessionManagement/SimpleApi/IdentityController.cs delete mode 100644 IdentityServer/v7/SessionManagement/SimpleApi/Program.cs delete mode 100644 IdentityServer/v7/SessionManagement/SimpleApi/Startup.cs diff --git a/IdentityServer/v7/SessionManagement/.vscode/launch.json b/IdentityServer/v7/SessionManagement/.vscode/launch.json new file mode 100644 index 00000000..b9b67c9e --- /dev/null +++ b/IdentityServer/v7/SessionManagement/.vscode/launch.json @@ -0,0 +1,53 @@ +{ + "version": "0.2.0", + "compounds": [ + { + "name": "Run All", + "configurations": ["IdentityServer", "Api", "Client"], + "presentation": { + "group": "10-compunds", + } + } + ], + "configurations": [ + { + "name": "IdentityServer", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-identityserver", + "program": "${workspaceFolder}/IdentityServer/bin/Debug/net8.0/IdentityServer.dll", + "args": [], + "cwd": "${workspaceFolder}/IdentityServer", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "console": "externalTerminal", + }, + { + "name": "Api", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-api", + "program": "${workspaceFolder}/Api/bin/Debug/net8.0/Api.dll", + "args": [], + "cwd": "${workspaceFolder}/Api", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "console": "externalTerminal", + }, + { + "name": "Client", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-client", + "program": "${workspaceFolder}/Client/bin/Debug/net8.0/Client.dll", + "args": [], + "cwd": "${workspaceFolder}/Client", + "console": "externalTerminal", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + } + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/.vscode/tasks.json b/IdentityServer/v7/SessionManagement/.vscode/tasks.json new file mode 100644 index 00000000..22f4455a --- /dev/null +++ b/IdentityServer/v7/SessionManagement/.vscode/tasks.json @@ -0,0 +1,53 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/SessionManagement.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-identityserver", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/IdentityServer", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-api", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/Api", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-client", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/Client", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/SimpleApi/ApiHost.csproj b/IdentityServer/v7/SessionManagement/Api/Api.csproj similarity index 56% rename from IdentityServer/v7/SessionManagement/SimpleApi/ApiHost.csproj rename to IdentityServer/v7/SessionManagement/Api/Api.csproj index 0cb2150b..f5df8837 100644 --- a/IdentityServer/v7/SessionManagement/SimpleApi/ApiHost.csproj +++ b/IdentityServer/v7/SessionManagement/Api/Api.csproj @@ -1,13 +1,12 @@  - net6.0 + net8.0 - - - + + \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/Api/IdentityController.cs b/IdentityServer/v7/SessionManagement/Api/IdentityController.cs new file mode 100644 index 00000000..21183a40 --- /dev/null +++ b/IdentityServer/v7/SessionManagement/Api/IdentityController.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using System.Linq; + +namespace Api; + +[Route("identity")] +public class IdentityController : ControllerBase +{ + private readonly ILogger _logger; + + public IdentityController(ILogger logger) + { + _logger = logger; + } + + // this action simply echoes the claims back to the client + [HttpGet] + public ActionResult Get() + { + var claims = User.Claims.Select(c => new { c.Type, c.Value }); + _logger.LogInformation("claims: {claims}", claims); + + return new JsonResult(claims); + } +} \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/Api/Program.cs b/IdentityServer/v7/SessionManagement/Api/Program.cs new file mode 100644 index 00000000..21d55ba3 --- /dev/null +++ b/IdentityServer/v7/SessionManagement/Api/Program.cs @@ -0,0 +1,36 @@ +using System; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; +using Serilog; +using Serilog.Events; +using Serilog.Sinks.SystemConsole.Themes; + +namespace Api; + +public class Program +{ + public static void Main(string[] args) + { + Console.Title = "API"; + + BuildWebHost(args).Run(); + } + + public static IHost BuildWebHost(string[] args) + { + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Information() + .Enrich.FromLogContext() + .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code) + .CreateLogger(); + + return Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseSerilog() + .Build(); + } +} \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/SimpleApi/Properties/launchSettings.json b/IdentityServer/v7/SessionManagement/Api/Properties/launchSettings.json similarity index 100% rename from IdentityServer/v7/SessionManagement/SimpleApi/Properties/launchSettings.json rename to IdentityServer/v7/SessionManagement/Api/Properties/launchSettings.json diff --git a/IdentityServer/v7/SessionManagement/Api/Startup.cs b/IdentityServer/v7/SessionManagement/Api/Startup.cs new file mode 100644 index 00000000..d4fe098a --- /dev/null +++ b/IdentityServer/v7/SessionManagement/Api/Startup.cs @@ -0,0 +1,40 @@ +using System.IdentityModel.Tokens.Jwt; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; + +namespace Api; + +public class Startup +{ + public Startup() + { + JwtSecurityTokenHandler.DefaultMapInboundClaims = false; + } + + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers(); + + // this API will accept any access token from the authority + services.AddAuthentication("token") + .AddJwtBearer("token", options => + { + options.Authority = "https://localhost:5001"; + options.TokenValidationParameters.ValidateAudience = false; + + options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" }; + }); + } + + public void Configure(IApplicationBuilder app) + { + app.UseRouting(); + app.UseAuthentication(); + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers().RequireAuthorization(); + }); + } +} \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/BackChannelClient.csproj b/IdentityServer/v7/SessionManagement/Client/Client.csproj similarity index 56% rename from IdentityServer/v7/SessionManagement/BackChannelClient/BackChannelClient.csproj rename to IdentityServer/v7/SessionManagement/Client/Client.csproj index c2fbd4a1..19ff4268 100644 --- a/IdentityServer/v7/SessionManagement/BackChannelClient/BackChannelClient.csproj +++ b/IdentityServer/v7/SessionManagement/Client/Client.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 - + - + diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Controllers/HomeController.cs b/IdentityServer/v7/SessionManagement/Client/Controllers/HomeController.cs similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Controllers/HomeController.cs rename to IdentityServer/v7/SessionManagement/Client/Controllers/HomeController.cs diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Controllers/LogoutController.cs b/IdentityServer/v7/SessionManagement/Client/Controllers/LogoutController.cs similarity index 95% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Controllers/LogoutController.cs rename to IdentityServer/v7/SessionManagement/Client/Controllers/LogoutController.cs index 281750d1..1e211e0a 100644 --- a/IdentityServer/v7/SessionManagement/BackChannelClient/Controllers/LogoutController.cs +++ b/IdentityServer/v7/SessionManagement/Client/Controllers/LogoutController.cs @@ -1,6 +1,7 @@ using IdentityModel; using IdentityModel.Client; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.IdentityModel.Tokens; using System; @@ -26,8 +27,8 @@ public LogoutController(LogoutSessionManager logoutSessions) [AllowAnonymous] public async Task Index(string logout_token) { - Response.Headers.Add("Cache-Control", "no-cache, no-store"); - Response.Headers.Add("Pragma", "no-cache"); + Response.Headers.Append("Cache-Control", "no-cache, no-store"); + Response.Headers.Append("Pragma", "no-cache"); try { diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/CookieEventHandler.cs b/IdentityServer/v7/SessionManagement/Client/CookieEventHandler.cs similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/CookieEventHandler.cs rename to IdentityServer/v7/SessionManagement/Client/CookieEventHandler.cs diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/LogoutSessionManager.cs b/IdentityServer/v7/SessionManagement/Client/LogoutSessionManager.cs similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/LogoutSessionManager.cs rename to IdentityServer/v7/SessionManagement/Client/LogoutSessionManager.cs diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Program.cs b/IdentityServer/v7/SessionManagement/Client/Program.cs similarity index 90% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Program.cs rename to IdentityServer/v7/SessionManagement/Client/Program.cs index 8561404f..86ebddf7 100644 --- a/IdentityServer/v7/SessionManagement/BackChannelClient/Program.cs +++ b/IdentityServer/v7/SessionManagement/Client/Program.cs @@ -1,3 +1,4 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; @@ -7,6 +8,8 @@ public class Program { public static void Main(string[] args) { + Console.Title = "Client"; + CreateHostBuilder(args).Build().Run(); } diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Properties/launchSettings.json b/IdentityServer/v7/SessionManagement/Client/Properties/launchSettings.json similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Properties/launchSettings.json rename to IdentityServer/v7/SessionManagement/Client/Properties/launchSettings.json diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Startup.cs b/IdentityServer/v7/SessionManagement/Client/Startup.cs similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Startup.cs rename to IdentityServer/v7/SessionManagement/Client/Startup.cs diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/Home/CallApi.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/Home/CallApi.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/Home/CallApi.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/Home/CallApi.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/Home/Index.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/Home/Index.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/Home/Index.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/Home/Index.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/Home/Secure.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/Home/Secure.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/Home/Secure.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/Home/Secure.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/Shared/Error.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/Shared/Error.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/Shared/Error.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/Shared/Error.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/Shared/_Layout.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/Shared/_Layout.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/Shared/_Layout.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/Shared/_Layout.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/Shared/_ValidationScriptsPartial.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/Shared/_ValidationScriptsPartial.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/_ViewImports.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/_ViewImports.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/_ViewImports.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/_ViewImports.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/Views/_ViewStart.cshtml b/IdentityServer/v7/SessionManagement/Client/Views/_ViewStart.cshtml similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/Views/_ViewStart.cshtml rename to IdentityServer/v7/SessionManagement/Client/Views/_ViewStart.cshtml diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/css/site.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/css/site.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/css/site.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/css/site.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/favicon.ico b/IdentityServer/v7/SessionManagement/Client/wwwroot/favicon.ico similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/favicon.ico rename to IdentityServer/v7/SessionManagement/Client/wwwroot/favicon.ico diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/js/site.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/js/site.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/js/site.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/js/site.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/LICENSE b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/LICENSE rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/LICENSE diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/LICENSE.md b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/LICENSE.md rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/additional-methods.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/LICENSE.txt b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/LICENSE.txt rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/LICENSE.txt diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/dist/jquery.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/dist/jquery.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/dist/jquery.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/dist/jquery.min.js b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/dist/jquery.min.js rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/dist/jquery.min.map b/IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from IdentityServer/v7/SessionManagement/BackChannelClient/wwwroot/lib/jquery/dist/jquery.min.map rename to IdentityServer/v7/SessionManagement/Client/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/IdentityServer/v7/SessionManagement/IdentityServer/Clients.cs b/IdentityServer/v7/SessionManagement/IdentityServer/Clients.cs index d4c52b17..6fd45daf 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServer/Clients.cs +++ b/IdentityServer/v7/SessionManagement/IdentityServer/Clients.cs @@ -5,7 +5,7 @@ using Duende.IdentityServer.Models; using System.Collections.Generic; -namespace IdentityServerHost +namespace IdentityServer { public static class Clients { diff --git a/IdentityServer/v7/SessionManagement/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/SessionManagement/IdentityServer/IdentityServer.csproj new file mode 100644 index 00000000..8c834093 --- /dev/null +++ b/IdentityServer/v7/SessionManagement/IdentityServer/IdentityServer.csproj @@ -0,0 +1,12 @@ + + + + net8.0 + + + + + + + + \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/IdentityServer/IdentityServerHost.csproj b/IdentityServer/v7/SessionManagement/IdentityServer/IdentityServerHost.csproj deleted file mode 100644 index 91d05d69..00000000 --- a/IdentityServer/v7/SessionManagement/IdentityServer/IdentityServerHost.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net6.0 - - - - - - - - \ No newline at end of file diff --git a/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml b/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml index f56cfdb6..58eea887 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml +++ b/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml @@ -1,5 +1,5 @@ @page -@model IdentityServerHost.Pages.Account.AccessDeniedModel +@model IdentityServer.Pages.Account.AccessDeniedModel @{ }
diff --git a/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml.cs b/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml.cs index a43f3560..f38e708b 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml.cs +++ b/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/AccessDenied.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace IdentityServerHost.Pages.Account; +namespace IdentityServer.Pages.Account; public class AccessDeniedModel : PageModel { diff --git a/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/Login/Index.cshtml b/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/Login/Index.cshtml index 1ec5ae3f..f2d7da45 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/Login/Index.cshtml +++ b/IdentityServer/v7/SessionManagement/IdentityServer/Pages/Account/Login/Index.cshtml @@ -1,5 +1,5 @@ @page -@model IdentityServerHost.Pages.Login.Index +@model IdentityServer.Pages.Login.Index