From 85b09760828c4e1f1a5ae7c30e3f72f46219321a Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sun, 29 Oct 2023 11:52:02 +1300
Subject: [PATCH] Move API call error handling

---
 server/app.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/app.js b/server/app.js
index 762553337..18c4764d6 100644
--- a/server/app.js
+++ b/server/app.js
@@ -474,6 +474,14 @@ const getPureError = (error)=>{
 app.use(async (err, req, res, next)=>{
 	err.originalUrl = req.originalUrl;
 	console.error(err);
+
+	if(err.originalUrl?.startsWith('/api/')) {
+		// console.log('API error');
+		res.status(err?.status || err?.response?.status || 500).send(err.message || err);
+		return;
+	}
+
+	// console.log('non-API error');
 	const status = err.status || err.code || 500;
 
 	req.ogMeta = { ...defaultMetaTags,
@@ -490,12 +498,6 @@ app.use(async (err, req, res, next)=>{
 	};
 	req.customUrl= '/error';
 
-	if(req.originalUrl.startsWith('/api/')) {
-		// console.log('api error');
-		res.status(err?.status || err?.response?.status || 500).send(err.message || err);
-		return;
-	}
-
 	const page = await renderPage(req, res);
 	if(!page) return;
 	res.send(page);