diff options
Diffstat (limited to 'MatrixRoomUtils.Web.Server')
| -rw-r--r-- | MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj | 28 | ||||
| -rw-r--r-- | MatrixRoomUtils.Web.Server/Pages/Error.cshtml | 49 | ||||
| -rw-r--r-- | MatrixRoomUtils.Web.Server/Pages/Error.cshtml.cs | 21 | ||||
| -rw-r--r-- | MatrixRoomUtils.Web.Server/Program.cs | 8 | ||||
| -rw-r--r-- | MatrixRoomUtils.Web.Server/Properties/launchSettings.json | 68 |
5 files changed, 81 insertions, 93 deletions
diff --git a/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj b/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj index 71c3d08..a34cd2c 100644 --- a/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj +++ b/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj @@ -1,22 +1,22 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> - <PropertyGroup> - <TargetFramework>net7.0</TargetFramework> - <Nullable>enable</Nullable> - <ImplicitUsings>enable</ImplicitUsings> - </PropertyGroup> + <PropertyGroup> + <TargetFramework>net7.0</TargetFramework> + <Nullable>enable</Nullable> + <ImplicitUsings>enable</ImplicitUsings> + </PropertyGroup> - <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.3" /> - </ItemGroup> + <ItemGroup> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.3"/> + </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\MatrixRoomUtils.Web\MatrixRoomUtils.Web.csproj" /> - </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\MatrixRoomUtils.Web\MatrixRoomUtils.Web.csproj"/> + </ItemGroup> - <ItemGroup> - <Folder Include="Controllers" /> - </ItemGroup> + <ItemGroup> + <Folder Include="Controllers"/> + </ItemGroup> </Project> diff --git a/MatrixRoomUtils.Web.Server/Pages/Error.cshtml b/MatrixRoomUtils.Web.Server/Pages/Error.cshtml index 0125c85..04b2c2a 100644 --- a/MatrixRoomUtils.Web.Server/Pages/Error.cshtml +++ b/MatrixRoomUtils.Web.Server/Pages/Error.cshtml @@ -5,38 +5,37 @@ <html lang="en"> <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> + <meta charset="utf-8"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> <title>Error</title> - <link href="~/css/bootstrap/bootstrap.min.css" rel="stylesheet" /> - <link href="~/css/app.css" rel="stylesheet" asp-append-version="true" /> + <link href="~/css/bootstrap/bootstrap.min.css" rel="stylesheet"/> + <link href="~/css/app.css" rel="stylesheet" asp-append-version="true"/> </head> <body> - <div class="main"> - <div class="Content px-4"> - <h1 class="text-danger">Error.</h1> - <h2 class="text-danger">An error occurred while processing your request.</h2> +<div class="main"> + <div class="Content px-4"> + <h1 class="text-danger">Error.</h1> + <h2 class="text-danger">An error occurred while processing your request.</h2> - @if (Model.ShowRequestId) - { - <p> - <strong>Request ID:</strong> <code>@Model.RequestId</code> - </p> - } - - <h3>Development Mode</h3> - <p> - Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred. - </p> + @if (Model.ShowRequestId) { <p> - <strong>The Development environment shouldn't be enabled for deployed applications.</strong> - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong> - and restarting the app. + <strong>Request ID:</strong> <code>@Model.RequestId</code> </p> - </div> + } + + <h3>Development Mode</h3> + <p> + Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred. + </p> + <p> + <strong>The Development environment shouldn't be enabled for deployed applications.</strong> + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong> + and restarting the app. + </p> </div> +</div> </body> -</html> +</html> \ No newline at end of file diff --git a/MatrixRoomUtils.Web.Server/Pages/Error.cshtml.cs b/MatrixRoomUtils.Web.Server/Pages/Error.cshtml.cs index b70d895..4b918c1 100644 --- a/MatrixRoomUtils.Web.Server/Pages/Error.cshtml.cs +++ b/MatrixRoomUtils.Web.Server/Pages/Error.cshtml.cs @@ -6,21 +6,14 @@ namespace MatrixRoomUtils.Web.Server.Pages; [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [IgnoreAntiforgeryToken] -public class ErrorModel : PageModel -{ - public string? RequestId { get; set; } +public class ErrorModel : PageModel { + private readonly ILogger<ErrorModel> _logger; - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + public ErrorModel(ILogger<ErrorModel> logger) => _logger = logger; - private readonly ILogger<ErrorModel> _logger; + public string? RequestId { get; set; } - public ErrorModel(ILogger<ErrorModel> logger) - { - _logger = logger; - } + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - public void OnGet() - { - RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - } -} + public void OnGet() => RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; +} \ No newline at end of file diff --git a/MatrixRoomUtils.Web.Server/Program.cs b/MatrixRoomUtils.Web.Server/Program.cs index a486226..b5c3869 100644 --- a/MatrixRoomUtils.Web.Server/Program.cs +++ b/MatrixRoomUtils.Web.Server/Program.cs @@ -9,11 +9,8 @@ var app = builder.Build(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) -{ app.UseWebAssemblyDebugging(); -} -else -{ +else { app.UseExceptionHandler("/Error"); // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); @@ -26,9 +23,8 @@ app.UseStaticFiles(); app.UseRouting(); - app.MapRazorPages(); app.MapControllers(); app.MapFallbackToFile("index.html"); -app.Run(); +app.Run(); \ No newline at end of file diff --git a/MatrixRoomUtils.Web.Server/Properties/launchSettings.json b/MatrixRoomUtils.Web.Server/Properties/launchSettings.json index 3dcf07b..ad7ef88 100644 --- a/MatrixRoomUtils.Web.Server/Properties/launchSettings.json +++ b/MatrixRoomUtils.Web.Server/Properties/launchSettings.json @@ -1,40 +1,40 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:6314", - "sslPort": 44318 + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:6314", + "sslPort": 44318 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "http://localhost:5167", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:7235;http://localhost:5167", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" } }, - "profiles": { - "http": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "applicationUrl": "http://localhost:5167", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "https": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "applicationUrl": "https://localhost:7235;http://localhost:5167", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" } } } +} |