3 files changed, 2 insertions, 53 deletions
diff --git a/src/DevHive.Web/Controllers/ErrorController.cs b/src/DevHive.Web/Controllers/ErrorController.cs
deleted file mode 100644
index b187501..0000000
--- a/src/DevHive.Web/Controllers/ErrorController.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Diagnostics;
-using AutoMapper;
-using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace DevHive.Web.Controllers
-{
-	public class ErrorController : ControllerBase
-	{
-		[HttpPost]
-		[Route("/api/Error")]
-		public IActionResult Error()
-		{
-			//Later for logging
-			string requestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
-
-			IExceptionHandlerFeature exception =
-			HttpContext.Features.Get<IExceptionHandlerFeature>();
-
-			object result = ProcessException(requestId, exception);
-			return new BadRequestObjectResult(JsonConvert.SerializeObject(result));
-		}
-
-		private object ProcessException(string requestId, IExceptionHandlerFeature exception)
-		{
-			switch (exception.Error)
-			{
-				case ArgumentException _:
-				case InvalidOperationException _:
-				case AutoMapperMappingException _:
-				case AutoMapperConfigurationException _:
-					return MessageToObject(exception.Error.Message);
-				default:
-					return MessageToObject(null);
-			}
-		}
-
-		private object MessageToObject(string message)
-		{
-			return new
-			{
-				Error = message
-			};
-		}
-	}
-}
-
diff --git a/src/DevHive.Web/Models/Middleware/ExceptionMiddleware.cs b/src/DevHive.Web/Models/Middleware/ExceptionMiddleware.cs
index d952ff4..c57452e 100644
--- a/src/DevHive.Web/Models/Middleware/ExceptionMiddleware.cs
+++ b/src/DevHive.Web/Models/Middleware/ExceptionMiddleware.cs
@@ -43,7 +43,7 @@ namespace DevHive.Web.Models.Middleware
 			return context.Response.WriteAsync(new
 			{
 				StatusCode = context.Response.StatusCode,
-				Message = "Internal Server Error from the custom middleware."
+				Message = exception.Message
 			}.ToString());
 		}
 	}
diff --git a/src/DevHive.Web/Startup.cs b/src/DevHive.Web/Startup.cs
index 4e55873..8fa346a 100644
--- a/src/DevHive.Web/Startup.cs
+++ b/src/DevHive.Web/Startup.cs
@@ -47,12 +47,11 @@ namespace DevHive.Web
 
 			if (env.IsDevelopment())
 			{
-				//app.UseDeveloperExceptionPage();
+				app.UseDeveloperExceptionPage();
 				app.UseSwaggerConfiguration();
 			}
 			else
 			{
-				app.UseExceptionHandler("/api/Error");
 				app.UseHsts();
 			}