authorizeUser middleware

2024-11-01 18:24:48 +01:00
parent 45ca5a2243
commit 973ef54393
7 changed files with 391 additions and 76 deletions
--- a/client/src/api/contactsApi.tsx
+++ b/client/src/api/contactsApi.tsx
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+export function setStatus(contact: string, read: boolean) {
+  axios
+    .put(
+      `http://localhost:5173/api/chat/contacts/${contact}`,
+      { status: read },
+      { withCredentials: true },
+    )
+    .then((res) => {
+      console.log(res.data.message);
+    })
+    .catch((e) => console.log(e.response.data.message));
+}
--- a/client/src/components/chat/ContactForm.tsx
+++ b/client/src/components/chat/ContactForm.tsx
@@ -8,7 +8,6 @@ type Input = {
 type ContactsProps = {
  usernamecontact: string;
  read: boolean;
-  lastActive: string;
 };

 type InitializeContactsProps = {
--- a/client/src/pages/Chat.tsx
+++ b/client/src/pages/Chat.tsx
@@ -12,6 +12,7 @@ import {
 } from '../socket/socket.tsx';
 import Cookies from 'js-cookie';
 import axios from 'axios';
+import { setStatus } from '../api/contactsApi.tsx';

 type ChatMessages = {
  sender: string;
@@ -43,31 +44,17 @@ function Chat() {
    }
  }, []);

-  function setStatus(contact: string, read: boolean) {
-    axios
-      .put(
-        `http://localhost:5173/api/chat/contacts/${contact}`,
-        { status: read },
-        { withCredentials: true },
-      )
-      .then((res) => {
-        console.log(res.data.message);
-
-        setContactsList((prevContacts) =>
-          prevContacts.map((c) =>
-            c.usernamecontact === contact ? { ...c, read } : c,
-          ),
-        );
-      })
-      .catch((e) => console.log(e.response.data.message));
-  }
-
  function InitializeContact(newContact: string) {
    setMessages([]); // Clear messages from previous contact
-    sendRequestHistoricalMessages(newContact); // Request historical messages for new contact
+    //sendRequestHistoricalMessages(newContact); // Request historical messages for new contact
    localStorage.setItem('contact', newContact);
    setCurrentContact(newContact);
-    sendContact({ contact: newContact, read: true }); // TODO do api instead of sending contact to server via socket
+    sendContact({ contact: newContact, read: true });
+    setContactsList((prevContacts) =>
+      prevContacts.map((c) =>
+        c.usernamecontact === newContact ? { ...c, read: true } : c,
+      ),
+    );
    setStatus(newContact, true);

    console.log('Contact submitted:', newContact);
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -18,6 +18,7 @@
        "uuid": "^10.0.0"
      },
      "devDependencies": {
+        "nodemon": "^3.1.7",
        "prettier": "3.3.3"
      }
    },
@@ -111,6 +112,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
    "node_modules/aproba": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
@@ -166,6 +181,19 @@
        "node": ">= 10.0.0"
      }
    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/body-parser": {
      "version": "1.20.3",
      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
@@ -215,6 +243,19 @@
        "concat-map": "0.0.1"
      }
    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/buffer-equal-constant-time": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -249,6 +290,31 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
    "node_modules/chownr": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -592,6 +658,19 @@
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
      "license": "MIT"
    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/finalhandler": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
@@ -673,6 +752,21 @@
      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
      "license": "ISC"
    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/function-bind": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -743,6 +837,19 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/gopd": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -755,6 +862,16 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/has-property-descriptors": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -850,6 +967,13 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/ignore-by-default": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true,
+      "license": "ISC"
+    },
    "node_modules/inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -876,6 +1000,29 @@
        "node": ">= 0.10"
      }
    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/is-fullwidth-code-point": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -885,6 +1032,29 @@
        "node": ">=8"
      }
    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
    "node_modules/jsonwebtoken": {
      "version": "9.0.2",
      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
@@ -1171,6 +1341,35 @@
        }
      }
    },
+    "node_modules/nodemon": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz",
+      "integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "debug": "^4",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
+        "semver": "^7.5.3",
+        "simple-update-notifier": "^2.0.0",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.5"
+      },
+      "bin": {
+        "nodemon": "bin/nodemon.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nodemon"
+      }
+    },
    "node_modules/nopt": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -1186,6 +1385,16 @@
        "node": ">=6"
      }
    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/npmlog": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
@@ -1354,6 +1563,19 @@
        "split2": "^4.1.0"
      }
    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
    "node_modules/postgres-array": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
@@ -1422,6 +1644,13 @@
        "node": ">= 0.10"
      }
    },
+    "node_modules/pstree.remy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/qs": {
      "version": "6.13.0",
      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
@@ -1475,6 +1704,19 @@
        "node": ">= 6"
      }
    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
    "node_modules/rimraf": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -1645,6 +1887,19 @@
      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
      "license": "ISC"
    },
+    "node_modules/simple-update-notifier": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/socket.io": {
      "version": "4.8.0",
      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
@@ -1739,6 +1994,19 @@
        "node": ">=8"
      }
    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/tar": {
      "version": "6.2.1",
      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
@@ -1756,6 +2024,19 @@
        "node": ">=10"
      }
    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
    "node_modules/toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -1765,6 +2046,16 @@
        "node": ">=0.6"
      }
    },
+    "node_modules/touch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
+      "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "nodetouch": "bin/nodetouch.js"
+      }
+    },
    "node_modules/tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -1784,6 +2075,13 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/undefsafe": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/undici-types": {
      "version": "6.19.8",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
--- a/server/package.json
+++ b/server/package.json
@@ -1,4 +1,8 @@
 {
+  "scripts": {
+    "dev": "nodemon server.js",
+    "start": "node server.js"
+  },
  "dependencies": {
    "bcrypt": "^5.1.1",
    "body-parser": "^1.20.3",
@@ -13,6 +17,7 @@
    "uuid": "^10.0.0"
  },
  "devDependencies": {
+    "nodemon": "^3.1.7",
    "prettier": "3.3.3"
  }
 }
--- a/server/server.js
+++ b/server/server.js
@@ -23,11 +23,13 @@ const {
  getUserId,
  deleteContact,
  updateContactStatus,
+  getMessages,
 } = require("./db/db.js");
+const authorizeUser = require("./utils/authorize");
 const filter = require("./utils/filter");
 const { generateJwtToken, verifyJwtToken } = require("./auth/jwt");
 const { initializeSocket } = require("./socket/socket");
-const { getContacts } = require("./db/db");
+const { getContacts, insertContact } = require("./db/db");

 const corsOptions = {
  origin: process.env.ORIGIN,
@@ -125,68 +127,62 @@ app.post("/api/auth/login", async (req, res) => {
  }
 });

-app.get("/api/auth/validate", (req, res) => {
-  const token = req.cookies.token;
-  if (!token) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
-  const { username } = verifyJwtToken(token);
-  if (username) {
-    return res.status(200).json({ message: "Authorized", username: username });
-  }
+app.get("/api/auth/validate", authorizeUser, (req, res) => {
+  return res.status(200).json({
+    message: "Authorized",
+    username: req.user.username,
+  });
 });

-app.delete("/api/chat/contacts/:contact", async (req, res) => {
-  const token = req.cookies.token;
-
+app.delete("/api/chat/contacts/:contact", authorizeUser, async (req, res) => {
  if (!req.params.contact) {
-    return res.status(400).json({ message: "Missing usernamecontact" });
+    return res
+      .status(400)
+      .json({ message: "Missing usernameContact parameter" });
  }
-  const usernamecontact = filter(req.params.contact);
-  if (!token) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
-  const { username } = verifyJwtToken(token);
-  if (!username) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
-  await deleteContact(username, usernamecontact);
+  const usernameContact = filter(req.params.contact);
+
+  await deleteContact(req.user.username, usernameContact);
  return res.status(200).json({ message: "Successfully deleted contact" });
 });

-app.put("/api/chat/contacts/:contact", async (req, res) => {
-  const token = req.cookies.token;
-
+app.put("/api/chat/contacts/:contact", authorizeUser, async (req, res) => {
  if (!req.params.contact) {
-    return res.status(400).json({ message: "Missing usernamecontact" });
+    return res
+      .status(400)
+      .json({ message: "Missing usernameContact parameter" });
  }
-  const usernamecontact = filter(req.params.contact);
+  const usernameContact = filter(req.params.contact);
  const read = req.body.status;
-  if (!token) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
-  const { username } = verifyJwtToken(token);
-  if (!username) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
+  await updateContactStatus(req.user.username, usernameContact, read);

-  await updateContactStatus(username, usernamecontact, read);
+  return res
+    .status(200)
+    .json({ message: "Successfully updated contact status" });
 });

-app.get("/api/chat/contacts", async (req, res) => {
-  const token = req.cookies.token;
-  if (!token) {
-    return res.status(401).json({ message: "Unauthorized" });
+app.post("/api/chat/contact/:contact", authorizeUser, async (req, res) => {
+  if (!req.params.contact) {
+    return res.status(400).json({ message: "Missing contact parameter" });
  }
-  const { username } = verifyJwtToken(token);
-  if (!username) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
-  const contacts = await getContacts(username);
-  console.log("sent contacts list for: ", username);
+  const usernameContact = filter(req.params.contact);
+  await insertContact(req.user.username, usernameContact);
+
+  return res.status(200).json({ message: "Successfully inserted contact" });
+});
+
+app.get("/api/chat/contacts", authorizeUser, async (req, res) => {
+  const contacts = await getContacts(req.user.username);
+  console.log("Sent contacts list for: ", req.user.username);
  return res.status(200).json(contacts);
 });

+app.get("/api/chat/messages", authorizeUser, async (req, res) => {
+  const messages = await getMessages(req.user.username);
+  console.log("Sent contacts list for: ", req.user.username);
+  return res.status(200).json(messages);
+});
+
 initializeSocket(io);

 server.listen(PORT, () => {
--- a/server/utils/authorize.js
+++ b/server/utils/authorize.js
@@ -1,14 +1,30 @@
 const { verifyJwtToken } = require("../auth/jwt");
-
-function authorizeUser(res, token) {
-  if (!token) {
-    return res.status(401).json({ message: "Unauthorized" });
-  }
+function authorizeUser(req, res, next) {
  try {
-    const { username } = verifyJwtToken(token);
-    if (username) {
-      return res.status(200).json({ message: "Authorized", username: username });
+    const token = req.cookies.token;
+    if (!token) {
+      return res.status(401).json({ message: "Unauthorized" });
    }

+    const decoded = verifyJwtToken(token);
+    if (!decoded.user_id || !decoded.username) {
+      return res.status(401).json({ message: "Invalid token" });
+    }
+
+    res.setHeader("X-Content-Type-Options", "nosniff");
+    res.setHeader("X-Frame-Options", "DENY");
+    res.setHeader("X-XSS-Protection", "1; mode=block");
+
+    req.user = {
+      user_id: decoded.user_id,
+      username: decoded.username.toString().trim(),
+    };
+
+    next();
+  } catch (e) {
+    console.error("Authorization failed:", e);
+    return res.status(500).json({ message: "Internal server error" });
  }
 }
+
+module.exports = authorizeUser;