Merge branch 'main' into error-status-codes

Return appropriate error codes
2023-06-28 16:44:18 -04:00 · 2023-06-28 13:41:02 -04:00 · 2023-06-28 00:45:34 -04:00
1 changed files with 6 additions and 0 deletions
--- a/src/server/handlers/catch-all-handler.tsx
+++ b/src/server/handlers/catch-all-handler.tsx
@ -75,7 +75,12 @@ export default async (req: Request, res: Response) => {

        routeData = await activeRoute.fetchInitialData(initialFetchReq);
      }
+
+      if (!activeRoute) {
+        res.status(404);
+      }
    } else if (try_site.state === "failed") {
+      res.status(500);
      errorPageData = getErrorPageData(new Error(try_site.msg), site);
    }

@ -89,6 +94,7 @@ export default async (req: Request, res: Response) => {
      if (error.msg === "instance_is_private") {
        return res.redirect(`/signup`);
      } else {
+        res.status(500);
        errorPageData = getErrorPageData(new Error(error.msg), site);
      }
    }
Author	SHA1	Message	Date
Dessalines	1e53c61aff	Merge branch 'main' into error-status-codes	2023-06-28 16:44:18 -04:00
SleeplessOne1917	61827c3d45	Merge branch 'main' into error-status-codes	2023-06-28 13:41:02 -04:00
SleeplessOne1917	0ea9b72242	Return appropriate error codes	2023-06-28 00:45:34 -04:00