add userCounter mocks and rearrange webhook path

Author: mchangrh

ci.json

@@ -4,11 +4,12 @@
     "globalSalt": "testSalt",
     "adminUserID": "4bdfdc9cddf2c7d07a8a87b57bf6d25389fb75d1399674ee0e0938a6a60f4c3b",
     "newLeafURLs": ["placeholder"],
-    "discordReportChannelWebhookURL": "http://127.0.0.1:8081/ReportChannelWebhook",
-    "discordFirstTimeSubmissionsWebhookURL": "http://127.0.0.1:8081/FirstTimeSubmissionsWebhook",
-    "discordCompletelyIncorrectReportWebhookURL": "http://127.0.0.1:8081/CompletelyIncorrectReportWebhook",
-    "discordNeuralBlockRejectWebhookURL": "http://127.0.0.1:8081/NeuralBlockRejectWebhook",
+    "discordReportChannelWebhookURL": "http://127.0.0.1:8081/webhook/ReportChannel",
+    "discordFirstTimeSubmissionsWebhookURL": "http://127.0.0.1:8081/webhook/FirstTimeSubmissions",
+    "discordCompletelyIncorrectReportWebhookURL": "http://127.0.0.1:8081/webhook/CompletelyIncorrectReport",
+    "discordNeuralBlockRejectWebhookURL": "http://127.0.0.1:8081/webhook/NeuralBlockReject",
     "neuralBlockURL": "http://127.0.0.1:8081/NeuralBlock",
+    "userCounterURL": "https://127.0.0.1:8081/UserCounter",
     "behindProxy": true,
     "postgres": {
         "user": "ci_db_user",

src/utils/getIP.ts

@@ -3,6 +3,9 @@ import { Request } from "express";
 import { IPAddress } from "../types/segments.model";
 
 export function getIP(req: Request): IPAddress {
+    // if in testing mode, return immediately
+    if (config.mode === "test") return "127.0.0.1" as IPAddress;
+
     if (config.behindProxy === true || config.behindProxy === "true") {
         config.behindProxy = "X-Forwarded-For";
     }
@@ -15,6 +18,6 @@ export function getIP(req: Request): IPAddress {
         case "X-Real-IP":
             return req.headers["x-real-ip"] as IPAddress;
         default:
-            return (req.connection?.remoteAddress || req.socket?.remoteAddress) as IPAddress;
+            return req.socket?.remoteAddress as IPAddress;
     }
 }

test.json

@@ -4,11 +4,12 @@
     "globalSalt": "testSalt",
     "adminUserID": "4bdfdc9cddf2c7d07a8a87b57bf6d25389fb75d1399674ee0e0938a6a60f4c3b",
     "newLeafURLs": ["placeholder"],
-    "discordReportChannelWebhookURL": "http://127.0.0.1:8081/ReportChannelWebhook",
-    "discordFirstTimeSubmissionsWebhookURL": "http://127.0.0.1:8081/FirstTimeSubmissionsWebhook",
-    "discordCompletelyIncorrectReportWebhookURL": "http://127.0.0.1:8081/CompletelyIncorrectReportWebhook",
-    "discordNeuralBlockRejectWebhookURL": "http://127.0.0.1:8081/NeuralBlockRejectWebhook",
+    "discordReportChannelWebhookURL": "http://127.0.0.1:8081/webhook/ReportChannel",
+    "discordFirstTimeSubmissionsWebhookURL": "http://127.0.0.1:8081/webhook/FirstTimeSubmissions",
+    "discordCompletelyIncorrectReportWebhookURL": "http://127.0.0.1:8081/webhook/CompletelyIncorrectReport",
+    "discordNeuralBlockRejectWebhookURL": "http://127.0.0.1:8081/webhook/NeuralBlockReject",
     "neuralBlockURL": "http://127.0.0.1:8081/NeuralBlock",
+    "userCounterURL": "http://127.0.0.1:8081/UserCounter",
     "behindProxy": true,
     "db": ":memory:",
     "privateDB": ":memory:",

test/cases/userCounter.ts

@@ -5,8 +5,8 @@ import { getHash } from "../../src/utils/getHash";
 
 
 describe("userCounter", () => {
-    it("Should return 200", (done) => {
-        if (!config.userCounterURL) return done(); // skip if no userCounterURL is set
+    it("Should return 200", function (done) {
+        if (!config.userCounterURL) this.skip(); // skip if no userCounterURL is set
         axios.request({
             method: "POST",
             baseURL: config.userCounterURL,

test/mocks.ts

@@ -1,23 +1,24 @@
 import express from "express";
 import { config } from "../src/config";
 import { Server } from "http";
+import { UserCounter } from "./mocks/UserCounter";
 
 const app = express();
 
-app.post("/ReportChannelWebhook", (req, res) => {
+app.post("/webhook/ReportChannel", (req, res) => {
     res.sendStatus(200);
 });
 
-app.post("/FirstTimeSubmissionsWebhook", (req, res) => {
+app.post("/webhook/FirstTimeSubmissions", (req, res) => {
     res.sendStatus(200);
 });
 
-app.post("/CompletelyIncorrectReportWebhook", (req, res) => {
+app.post("/webhook/CompletelyIncorrectReport", (req, res) => {
     res.sendStatus(200);
 });
 
 // Testing NeuralBlock
-app.post("/NeuralBlockRejectWebhook", (req, res) => {
+app.post("/webhook/NeuralBlockReject", (req, res) => {
     res.sendStatus(200);
 });
 
@@ -47,6 +48,9 @@ app.post("/CustomWebhook", (req, res) => {
     res.sendStatus(200);
 });
 
+// mocks
+app.use("/UserCounter", UserCounter);
+
 export function createMockServer(callback: () => void): Server {
     return app.listen(config.mockPort, callback);
 }

test/mocks/UserCounter.ts

@@ -0,0 +1,11 @@
+import { Router } from "express";
+export const UserCounter = Router();
+
+UserCounter.post("/api/v1/addIP", (req, res) => {
+    res.sendStatus(200);
+});
+UserCounter.get("/api/v1/userCount", (req, res) => {
+    res.send({
+        userCount: 100
+    });
+});