fix: validation

Crucible-Standard · May 18, 2024 · 8477e90 · 8477e90
1 parent 4f67a16
commit 8477e90
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 98 deletions.
diff --git a/src/controllers/main.ts b/src/controllers/main.ts
@@ -16,10 +16,34 @@ class MainController extends DefaultController {
     request: express.Request,
     response: express.Response
   ) => {
-    const token = `${request.query.token}` || `${request.body.text}`;
-    const data = await getSingle(token);
-
-    response.status(200).send(data);
+    if (request.query.token || request.body.text) {
+      const token = `${request.query.token}` || `${request.body.text}`;
+      // check to see if token is at least 3 characters
+      if (token.length > 2) {
+        const data = await getSingle(token);
+        response.status(200).send(data);
+      } else {
+        response.status(400).send({
+          data: {
+            message:
+              "Please use the endpoint with a get param of 'token'. example https://cryptoget.herokuapp.com/?token=eth",
+          },
+          meta: {
+            status: 400,
+          },
+        });
+      }
+    } else {
+      response.status(400).send({
+        data: {
+          message:
+            "Please use the endpoint with a get param of 'token'. example https://cryptoget.herokuapp.com/?token=eth",
+        },
+        meta: {
+          status: 400,
+        },
+      });
+    }
   };
 }
 

diff --git a/src/controllers/slack.ts b/src/controllers/slack.ts
@@ -16,13 +16,28 @@ class SlackController extends DefaultController {
     request: express.Request,
     response: express.Response
   ) => {
-    const token = `${request.query.token}` || `${request.body.text}`;
-    const data = await getSingle(token);
+    if (request.query.token || request.body.text) {
+      const token = `${request.query.token}` || `${request.body.text}`;
+      // check to see if token is at least 3 characters
+      if (token.length > 2) {
+        const data = await getSingle(token);
 
-    response.status(200).send({
-      response_type: "in_channel",
-      text: `${data.data.message}`,
-    });
+        response.status(200).send({
+          response_type: "in_channel",
+          text: `${data.data.message}`,
+        });
+      } else {
+        response.status(400).send({
+          data: {
+            message:
+              "Please use the endpoint with a get param of 'token'. example https://cryptoget.herokuapp.com/?token=eth",
+          },
+          meta: {
+            status: 400,
+          },
+        });
+      }
+    }
   };
 }
 

diff --git a/src/middleware/validation.ts b/src/middleware/validation.ts
@@ -28,41 +28,6 @@ function validateTokenMiddleware(
       },
     });
   }
-
-  // check to see if token exists in request
-  try {
-    if (request) {
-      if (request.query.token || request.body.text) {
-        const args = `${request.query.token}` || `${request.body.text}`;
-        // check to see if token is at least 3 characters
-        if (args.length > 2) {
-          next();
-        } else {
-          logger.info("Token is invalid, Please use a valid token");
-          response.status(400).send({
-            data: {
-              message:
-                "Please use the endpoint with a get param of 'token'. example https://cryptoget.herokuapp.com/?token=eth",
-            },
-            meta: {
-              status: 400,
-            },
-          });
-        }
-      }
-    }
-  } catch (e) {
-    logger.info("Token is invalid, Please use a valid token");
-    response.status(400).send({
-      data: {
-        message:
-          "Please use the endpoint with a get param of 'token'. example https://cryptoget.herokuapp.com/?token=eth",
-      },
-      meta: {
-        status: 400,
-      },
-    });
-  }
   next();
 }
 

diff --git a/tests/middleware/validation.test.ts b/tests/middleware/validation.test.ts