Fixes #141

[R] Typos

Author: i4004

src/Simplify.Web/Diagnostics/DetailedExceptionInfoBuilder.cs

@@ -13,8 +13,8 @@ public static class DetailedExceptionInfoBuilder
 		/// Builds the detailed exception info.
 		/// </summary>
 		/// <param name="e">The exception.</param>
-		/// <returns></returns>
-		public static string? Build(Exception e)
+		/// <param name="htmlFormatting">if set to <c>true</c> then HTML formatting will be added to text.</param>
+		public static string? Build(Exception e, bool htmlFormatting)
 		{
 			var trace = new StackTrace(e, true);
 
@@ -28,12 +28,18 @@ public static class DetailedExceptionInfoBuilder
 				? ""
 				: $"[{fileLineNumber}:{fileColumnNumber}]";
 
-			return
-				$"<b>{positionPrefix} {e.GetType()} : {e.Message}</b>{Environment.NewLine}{trace}{BuildInnerExceptionData(1, e.InnerException)}"
-					.Replace(Environment.NewLine, "<br />");
+			var result = (htmlFormatting ? "<b>" : "")
+				   + $"{positionPrefix} {e.GetType()} : {e.Message}"
+				   + (htmlFormatting ? "</b>" : "")
+				   + $"{Environment.NewLine}{trace}{BuildInnerExceptionData(1, e.InnerException, htmlFormatting)}";
+
+			if (htmlFormatting)
+				result = result.Replace(Environment.NewLine, "<br />");
+
+			return result;
 		}
 
-		private static string? BuildInnerExceptionData(int currentLevel, Exception? e)
+		private static string? BuildInnerExceptionData(int currentLevel, Exception? e, bool htmlFormatting)
 		{
 			if (e == null)
 				return null;
@@ -54,8 +60,10 @@ public static class DetailedExceptionInfoBuilder
 				? " " + currentLevel.ToString(CultureInfo.InvariantCulture)
 				: "";
 
-			return
-				$"<br /><b>[Inner Exception{levelText}]{positionPrefix} {e.GetType()} : {e.Message}</b>{Environment.NewLine}{trace}{BuildInnerExceptionData(currentLevel + 1, e.InnerException)}";
+			return (htmlFormatting ? "<br /><b>" : "")
+				   + $"[Inner Exception{levelText}]{positionPrefix} {e.GetType()} : {e.Message}"
+				   + (htmlFormatting ? "</b>" : "")
+				   + $"{Environment.NewLine}{trace}{BuildInnerExceptionData(currentLevel + 1, e.InnerException, htmlFormatting)}";
 		}
 	}
 }

src/Simplify.Web/Diagnostics/ErrorPageGenerator.cs

@@ -4,7 +4,7 @@
 namespace Simplify.Web.Diagnostics
 {
 	/// <summary>
-	/// Provides exception information HTML page generator
+	/// Provides HTTP 500 error page generator
 	/// </summary>
 	public static class ErrorPageGenerator
 	{
@@ -14,11 +14,19 @@ public static class ErrorPageGenerator
 		/// <param name="e">Exception to get information from.</param>
 		/// <param name="hideExceptionDetails">if set to <c>true</c> then exception details will not be shown.</param>
 		/// <param name="darkStyle"><c>true</c> if page style should be in dark colors.</param>
-		/// <returns></returns>
-		public static string Generate(Exception e, bool hideExceptionDetails = false, bool darkStyle = false) =>
-			Http500ErrorPageBuilder.Build(hideExceptionDetails
-					? null
-					: DetailedExceptionInfoBuilder.Build(e),
-				darkStyle);
+		/// <param name="minimalStyle">If set to true then no HTML page style will be added.</param>
+		public static string Generate(Exception e,
+			bool hideExceptionDetails = false,
+			bool darkStyle = false,
+			bool minimalStyle = false)
+		{
+			var exceptionText = hideExceptionDetails
+				? null
+				: DetailedExceptionInfoBuilder.Build(e, !minimalStyle);
+
+			return minimalStyle
+				? Http500MinimalErrorPageBuilder.Build(exceptionText)
+				: Http500ErrorPageBuilder.Build(exceptionText, darkStyle);
+		}
 	}
 }

src/Simplify.Web/Diagnostics/ExceptionEventHandler.cs

@@ -5,6 +5,6 @@ namespace Simplify.Web.Diagnostics
 	/// <summary>
 	/// Catched exceptions delegate
 	/// </summary>
-	/// <param name="e">The e.</param>
+	/// <param name="e">The exception.</param>
 	public delegate void ExceptionEventHandler(Exception e);
 }

src/Simplify.Web/Diagnostics/Templates/Http500ErrorPageBuilder.cs

@@ -10,11 +10,10 @@ namespace Simplify.Web.Diagnostics.Templates
 	public static class Http500ErrorPageBuilder
 	{
 		/// <summary>
-		/// Builds the specified hide exception details.
+		/// Builds the error page.
 		/// </summary>
 		/// <param name="exceptionText">The exception text.</param>
 		/// <param name="darkStyle"><c>true</c> if page style should be in dark colors.</param>
-		/// <returns></returns>
 		public static string Build(string? exceptionText = null, bool darkStyle = false) =>
 			TemplateBuilder.FromCurrentAssembly("Diagnostics.Templates.Http500ErrorPage.html")
 				.Build()

src/Simplify.Web/Diagnostics/Templates/Http500MinimalErrorPage.html

@@ -0,0 +1,2 @@
+HTTP 500 - Internal Server Error
+{ExceptionText}

src/Simplify.Web/Diagnostics/Templates/Http500MinimalErrorPageBuilder.cs

@@ -0,0 +1,22 @@
+using Simplify.Templates;
+
+namespace Simplify.Web.Diagnostics.Templates
+{
+	/// <summary>
+	/// Provides HTML HTTP 500 minimal error page builder
+	/// </summary>
+
+	public class Http500MinimalErrorPageBuilder
+	{
+		/// <summary>
+		/// Builds the error page.
+		/// </summary>
+		/// <param name="exceptionText">The exception text.</param>
+		/// <returns></returns>
+		public static string Build(string? exceptionText = null) =>
+			TemplateBuilder.FromCurrentAssembly("Diagnostics.Templates.Http500MinimalErrorPage.html")
+				.Build()
+				.Set("ExceptionText", exceptionText)
+				.Get();
+	}
+}

src/Simplify.Web/RequestPipeline/SimplifyWebRequestMiddleware.cs

@@ -17,7 +17,7 @@ namespace Simplify.Web.RequestPipeline
 	/// <summary>
 	/// Simplify.Web request execution root
 	/// </summary>
-	public class SimplifyWebRequestMiddleware
+	public static class SimplifyWebRequestMiddleware
 	{
 		/// <summary>
 		/// Occurs when exception occurred and catched by framework.
@@ -58,7 +58,7 @@ public static async Task<RequestHandlingStatus> Invoke(HttpContext context)
 					e = exception;
 				}
 
-				await context.Response.WriteAsync(GenerateErrorPage(scope, e));
+				await context.WriteErrorResponse(scope, e);
 
 				return RequestHandlingStatus.RequestWasHandled;
 			}
@@ -73,11 +73,21 @@ internal static bool ProcessOnException(Exception e)
 			return true;
 		}
 
-		private static string GenerateErrorPage(ILifetimeScope scope, Exception e)
+		private static async Task WriteErrorResponse(this HttpContext context, ILifetimeScope scope, Exception e)
+		{
+			var webContext = scope.Resolver.Resolve<IWebContextProvider>().Get();
+
+			if (webContext.IsAjax)
+				context.Response.ContentType = "text/plain";
+
+			await context.Response.WriteAsync(scope.GenerateErrorResponse(e, webContext.IsAjax));
+		}
+
+		private static string GenerateErrorResponse(this ILifetimeScope scope, Exception e, bool minimalStyle)
 		{
 			var settings = scope.Resolver.Resolve<ISimplifyWebSettings>();
 
-			return ErrorPageGenerator.Generate(e, settings.HideExceptionDetails, settings.ErrorPageDarkStyle);
+			return ErrorPageGenerator.Generate(e, settings.HideExceptionDetails, settings.ErrorPageDarkStyle, minimalStyle);
 		}
 	}
 }

src/Simplify.Web/Simplify.Web.csproj

@@ -28,6 +28,7 @@
 		<PackageTags>.NET web-framework MVC DI OWIN</PackageTags>
 	</PropertyGroup>
 	<ItemGroup>
+		<EmbeddedResource Include="Diagnostics\Templates\Http500MinimalErrorPage.html" />
 		<EmbeddedResource Include="Diagnostics\Templates\Http500ErrorPageExceptionInfo.html" />
 		<EmbeddedResource Include="Diagnostics\Templates\Http500ErrorPage.html" />
 		<EmbeddedResource Include="Diagnostics\Templates\Styles\Dark.css" />