Merge pull request #4768 from coralproject/hotfix/tokenTest-error-handling

[Hotfix] Add error handling around `tokenTest` endpoint

Author: nick-funk

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.9.2",
+  "version": "9.9.3",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.9.2",
+  "version": "9.9.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.9.2",
+  "version": "9.9.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.9.2",
+  "version": "9.9.3",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

server/src/core/server/app/handlers/api/auth/tokenTest/index.ts

@@ -272,37 +272,41 @@ export const submitHandler = ({
   });
 
   return async (req, res, next) => {
-    await ipLimiter.test(req, req.ip);
-
-    const result = submitSchema.validate(req.body);
-    if (result.error) {
-      res.send(renderIndex([result.error.message]));
-      return;
-    }
-
-    const body = result.value as SubmitBody;
-    if (!body) {
-      res.send(renderIndex());
-      return;
+    try {
+      await ipLimiter.test(req, req.ip);
+
+      const result = submitSchema.validate(req.body);
+      if (result.error) {
+        res.send(renderIndex([result.error.message]));
+        return;
+      }
+
+      const body = result.value as SubmitBody;
+      if (!body) {
+        res.send(renderIndex());
+        return;
+      }
+
+      const cleanToken = body.token.trim();
+      const decodedToken = jwt.decode(cleanToken);
+      if (!decodedToken) {
+        res.send(renderIndex(["Token is invalid."]));
+        return;
+      }
+
+      const analysis = analyseTokenPayload(decodedToken);
+
+      res.send(
+        renderIndex(
+          [],
+          cleanToken,
+          JSON.stringify(decodedToken, null, 2).trim(),
+          analysis
+        )
+      );
+    } catch (err) {
+      return next(err);
     }
-
-    const cleanToken = body.token.trim();
-    const decodedToken = jwt.decode(cleanToken);
-    if (!decodedToken) {
-      res.send(renderIndex(["Token is invalid."]));
-      return;
-    }
-
-    const analysis = analyseTokenPayload(decodedToken);
-
-    res.send(
-      renderIndex(
-        [],
-        cleanToken,
-        JSON.stringify(decodedToken, null, 2).trim(),
-        analysis
-      )
-    );
   };
 };