Merge pull request #99 from IABTechLab/ans-UID2-4477-return-404-unmat…

…ched-requests

Return 404 unmatched URLs

public/locales_euid/en.json

@@ -19,6 +19,8 @@
   "Enter your verification code": "Enter your verification code",
   "Powered by": "Powered by",
   "Internal Server Error": "Internal Server Error",
+  "Page Not Found": "Page Not Found",
+  "Unknown Error": "Unknown Error",
   "euid-exit": "EXIT",
   "Welcome!": "Hello,",
   "Opt-Out": "Opt-Out",

public/locales_uid2/en.json

@@ -16,6 +16,8 @@
   "Enter your verification code": "Enter your verification code",
   "Powered by": "Powered by",
   "Internal Server Error": "Internal Server Error",
+  "Page Not Found": "Page Not Found",
+  "Unknown Error": "Unknown Error",
   "EXIT": "EXIT",
   "Welcome!": "Hello,",
   "Opt-Out": "Opt-Out",

public/locales_uid2/ja.json

@@ -16,6 +16,8 @@
   "Enter your verification code": "認証コードを入力してください",
   "Powered by": "Powered by",
   "Internal Server Error": "内部サーバーエラー",
+  "Page Not Found": "ページが見つかりません",
+  "Unknown Error": "不明なエラー",
   "EXIT": "終了",
   "Welcome!": "こんにちは",
   "Opt-Out": "オプトアウト",

src/app.ts

@@ -75,7 +75,17 @@ app.use((err: any, req: Request, res: Response, _next: NextFunction) => {
 
   // render the error page
   res.status(err.status || 500);
-  res.render('error');
+
+  let errorPageMessage;
+  if (err.status === 404) {
+    errorPageMessage = res.__('Page Not Found');
+  } else if (err.status === 500) {
+    errorPageMessage = res.__('Internal Server Error');
+  } else {
+    errorPageMessage = res.__('Unknown Error');
+  }
+
+  res.render('error', { errorPageMessage });
 });
 
 logger.log('info', `Using locales from ${LOCALE_FOLDER}`);

src/routes/index.ts

@@ -59,7 +59,7 @@ const handleEmailPromptSubmission: RequestHandler<{}, z.infer<typeof EmailPrompt
     EmailPromptRequest.parse(req.body);
   } catch (e) {
     logger.log('error', 'error while parsing the request');
-    _next(createError(500));
+    _next(createError(400));
     return;
   }
   const {
@@ -149,7 +149,7 @@ const defaultRouteHandler: RequestHandler<{}, {}, z.infer<typeof DefaultRouteReq
     requestStep = DefaultRouteRequest.parse(req.body).step; 
   } catch (e) {
     logger.log('error', 'error while parsing step');
-    next(createError(500));
+    next(createError(400));
     return;
   }
 

views_euid/error.hbs

@@ -1 +1 @@
-<h1>{{__ "Internal Server Error"}}</h1>
+<h1> {{errorPageMessage}} </h1>

views_uid2/error.hbs

@@ -1 +1 @@
-<h1>{{__ "Internal Server Error"}}</h1>
+<h1> {{errorPageMessage}} </h1>