Update errorpage.cpp

maddsua · Feb 14, 2024 · c117508 · c117508
1 parent 8d2d2ba
commit c117508
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/core/server/errorpage.cpp b/core/server/errorpage.cpp
@@ -15,29 +15,34 @@ HTTP::Response Pages::renderErrorPage(HTTP::Status code, const std::string& mess
 
 HTTP::Response Pages::renderErrorPage(HTTP::Status code, const std::string& message, ErrorResponseType type) {
 
-	std::string pagecontent;
-
-	if (type == ErrorResponseType::HTML) {
-
-		pagecontent = renderTemplate(Templates::servicePage, {
-			{ "svcpage_statuscode", std::to_string(code.code()) },
-			{ "svcpage_statustext", code.text() },
-			{ "svcpage_message_text", message }
-		});
-
-	} else {
-
-		JSON::Map responseObject = {
-			{ "ok", false },
-			{ "status", "failed" },
-			{ "context", code.text() },
-			{ "what", message }
-		};
-
-		pagecontent = JSON::stringify(responseObject);
+	HTTP::Response errorResponse { code };
+
+	switch (type) {
+
+		case ErrorResponseType::HTML: {
+			errorResponse.body = renderTemplate(Templates::servicePage, {
+				{ "svcpage_statuscode", std::to_string(code.code()) },
+				{ "svcpage_statustext", code.text() },
+				{ "svcpage_message_text", message }
+			});
+			errorResponse.headers.set("content-type", "text/html");
+		} break;
+
+		case ErrorResponseType::JSON: {
+			errorResponse.body = JSON::stringify(JSON::Map({
+				{ "ok", false },
+				{ "status", "failed" },
+				{ "context", code.text() },
+				{ "what", message }
+			}));
+			errorResponse.headers.set("content-type", "application/json");
+		} break;
+
+		default: {
+			errorResponse.body = "Backend error: " + message + "\r\nmaddsua/lambda\r\n";
+			errorResponse.headers.set("content-type", "text/plain");
+		} break;
 	}
 
-	return Lambda::HTTP::Response(code, {
-		{ "Content-Type", type == ErrorResponseType::HTML ? "text/html" : "application/json" }
-	}, pagecontent);
+	return errorResponse;
 }
diff --git a/core/server/options.hpp b/core/server/options.hpp
@@ -13,7 +13,7 @@ namespace Lambda {
 	};
 
 	enum struct ErrorResponseType {
-		HTML, JSON
+		Plain, HTML, JSON
 	};
 
 	struct ServeOptions {