From 34ce9acf8bef02e8d02c5a60d35be878921659fb Mon Sep 17 00:00:00 2001 From: AKINDIPE ANJOLAOLUWA DANIEL <64547124+anjolaoluwaakindipe@users.noreply.github.com> Date: Thu, 7 Sep 2023 00:45:04 -0400 Subject: [PATCH] Backend session setup (#180) --- server/package-lock.json | 516 +++++++++++++++++- server/package.json | 5 + server/prisma/schema.prisma | 12 +- server/src/index.ts | 24 +- server/src/modules/auth/controller.ts | 63 +++ server/src/modules/auth/router.ts | 10 + server/src/modules/auth/service.ts | 38 ++ server/src/modules/auth/validations.ts | 18 + .../src/modules/community-event/controller.ts | 40 +- server/src/modules/community-event/router.ts | 2 +- .../src/modules/community-event/serializer.ts | 2 +- server/src/modules/community-event/service.ts | 41 +- server/src/modules/community-event/types.ts | 2 +- server/src/modules/event-type/controller.ts | 33 +- server/src/modules/routes.ts | 2 + server/src/utils/auth.ts | 23 + server/src/utils/env.ts | 7 + server/tsconfig.json | 1 + server/types/express-session.d.ts | 11 + 19 files changed, 770 insertions(+), 80 deletions(-) create mode 100644 server/src/modules/auth/controller.ts create mode 100644 server/src/modules/auth/router.ts create mode 100644 server/src/modules/auth/service.ts create mode 100644 server/src/modules/auth/validations.ts create mode 100644 server/src/utils/auth.ts create mode 100644 server/src/utils/env.ts create mode 100644 server/types/express-session.d.ts diff --git a/server/package-lock.json b/server/package-lock.json index 3aceea7..58cb823 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -10,13 +10,18 @@ "license": "UNLICENSED", "dependencies": { "@prisma/client": "^4.15.0", + "bcrypt": "^5.1.1", "cors": "^2.8.5", + "dotenv": "^16.3.1", "express": "^4.18.2", + "express-session": "^1.17.3", "zod": "^3.21.4" }, "devDependencies": { + "@types/bcrypt": "^5.0.0", "@types/cors": "^2.8.13", "@types/express": "^4.17.17", + "@types/express-session": "^1.17.7", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", @@ -232,6 +237,39 @@ "dev": true, "peer": true }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", + "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -323,6 +361,15 @@ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "dev": true }, + "node_modules/@types/bcrypt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/bcrypt/-/bcrypt-5.0.0.tgz", + "integrity": "sha512-agtcFKaruL8TmcvqbndlqHPSJgsolhf/qPWchFlgnW1gECTN/nKbFcoFnvKAQRFfKbh+BO6A3SWdJu9t+xF3Lw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -404,6 +451,15 @@ "@types/send": "*" } }, + "node_modules/@types/express-session": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.17.7.tgz", + "integrity": "sha512-L25080PBYoRLu472HY/HNCxaXY8AaGgqGC8/p/8+BYMhG0RDOLQ1wpXOpAzr4Gi5TGozTKyJv5BVODM5UNyVMw==", + "dev": true, + "dependencies": { + "@types/express": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.12", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", @@ -642,6 +698,11 @@ "dev": true, "peer": true }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -694,11 +755,21 @@ "node": ">=0.4.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -731,6 +802,23 @@ "node": ">= 8" } }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -763,8 +851,20 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/bcrypt": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz", + "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.11", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } }, "node_modules/binary-extensions": { "version": "2.2.0", @@ -815,7 +915,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -965,6 +1064,14 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", @@ -993,6 +1100,14 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1014,8 +1129,12 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, "node_modules/content-disposition": { "version": "0.5.4", @@ -1091,7 +1210,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -1119,6 +1237,11 @@ "node": ">=0.4.0" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1136,6 +1259,14 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-libc": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", + "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", + "engines": { + "node": ">=8" + } + }, "node_modules/dezalgo": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", @@ -1167,6 +1298,17 @@ "node": ">=6.0.0" } }, + "node_modules/dotenv": { + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/dynamic-dedupe": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", @@ -1188,6 +1330,11 @@ "dev": true, "peer": true }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -1554,6 +1701,45 @@ "node": ">= 0.10.0" } }, + "node_modules/express-session": { + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz", + "integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==", + "dependencies": { + "cookie": "0.4.2", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-headers": "~1.0.2", + "parseurl": "~1.3.3", + "safe-buffer": "5.2.1", + "uid-safe": "~2.1.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/express-session/node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express-session/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express-session/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1755,11 +1941,32 @@ "node": ">= 0.6" } }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.2", @@ -1780,6 +1987,25 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/get-intrinsic": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", @@ -1798,7 +2024,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1902,6 +2127,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, "node_modules/hexoid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", @@ -1926,6 +2156,18 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -1975,7 +2217,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -2027,6 +2268,14 @@ "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", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -2144,6 +2393,28 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -2225,7 +2496,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -2242,11 +2512,41 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -2257,8 +2557,7 @@ "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/natural-compare": { "version": "1.4.0", @@ -2281,6 +2580,30 @@ "dev": true, "peer": true }, + "node_modules/node-addon-api": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz", + "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==" + }, + "node_modules/node-fetch": { + "version": "2.6.13", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz", + "integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-releases": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz", @@ -2288,6 +2611,20 @@ "dev": true, "peer": true }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -2297,6 +2634,17 @@ "node": ">=0.10.0" } }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -2324,11 +2672,18 @@ "node": ">= 0.8" } }, + "node_modules/on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -2413,7 +2768,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2565,6 +2919,14 @@ } ] }, + "node_modules/random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -2597,6 +2959,19 @@ "node": ">= 0.8" } }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -2761,7 +3136,6 @@ "version": "7.5.1", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", - "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -2776,7 +3150,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -2784,12 +3157,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/send": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", @@ -2855,6 +3222,11 @@ "node": ">= 0.8.0" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -2894,6 +3266,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, "node_modules/source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", @@ -2921,11 +3298,31 @@ "node": ">= 0.8" } }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -3033,6 +3430,22 @@ "node": ">=6" } }, + "node_modules/tar": { + "version": "6.1.15", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", + "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/terser": { "version": "5.17.7", "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.7.tgz", @@ -3151,6 +3564,11 @@ "node": ">=0.6" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -3340,6 +3758,17 @@ "node": ">=14.17" } }, + "node_modules/uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", + "dependencies": { + "random-bytes": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -3388,6 +3817,11 @@ "punycode": "^2.1.0" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -3424,6 +3858,11 @@ "node": ">=10.13.0" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "node_modules/webpack": { "version": "5.85.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.0.tgz", @@ -3482,6 +3921,15 @@ "node": ">=10.13.0" } }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -3497,6 +3945,14 @@ "node": ">= 8" } }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -3509,8 +3965,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/xtend": { "version": "4.0.2", @@ -3521,6 +3976,11 @@ "node": ">=0.4" } }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", diff --git a/server/package.json b/server/package.json index 6383717..88eb47a 100644 --- a/server/package.json +++ b/server/package.json @@ -11,13 +11,18 @@ }, "dependencies": { "@prisma/client": "^4.15.0", + "bcrypt": "^5.1.1", "cors": "^2.8.5", + "dotenv": "^16.3.1", "express": "^4.18.2", + "express-session": "^1.17.3", "zod": "^3.21.4" }, "devDependencies": { + "@types/bcrypt": "^5.0.0", "@types/cors": "^2.8.13", "@types/express": "^4.17.17", + "@types/express-session": "^1.17.7", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma index 3c01f2e..fa3fe05 100644 --- a/server/prisma/schema.prisma +++ b/server/prisma/schema.prisma @@ -13,12 +13,12 @@ datasource db { model User { id String @id @default(uuid()) - firstName String? - lastName String? - email String @unique - phone String? - eventRegistrationCompleted Boolean @default(false) - communityEvents CommunityEvent[] + firstName String? + lastName String? + email String @unique + phone String? + passwordHash String + communityEvents CommunityEvent[] } model EventType { diff --git a/server/src/index.ts b/server/src/index.ts index b8a8e5a..762a73c 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -3,23 +3,37 @@ import { prisma } from './modules/prisma'; import { errorHandler } from './middleware/errorHandler'; import router from './modules/routes'; import cors from 'cors'; +import session from 'express-session'; +import { env } from './utils/env'; + const app = express(); const port = 3000; // middlewares /* CORS policy for localhost in development. will need to be updated for production. */ -app.use(cors({ - origin: ['http://localhost:5173', 'http://127.0.0.1:5173'] -})) +app.use( + cors({ + origin: ['http://localhost:5173', 'http://127.0.0.1:5173'], + }), +); app.use(express.json()); +app.use( + session({ + secret: env.SESSION_SECRET, + resave: false, + saveUninitialized: true, + cookie: { secure: false }, + }), +); + // routers app.use('/', router); // error handling app.use(errorHandler); -app.listen(port, () => { - console.log(`Server listening on port ${port}!`); +app.listen(env.PORT || port, () => { + console.log(`Server listening on port ${env.PORT || port}!`); }); diff --git a/server/src/modules/auth/controller.ts b/server/src/modules/auth/controller.ts new file mode 100644 index 0000000..c681fa0 --- /dev/null +++ b/server/src/modules/auth/controller.ts @@ -0,0 +1,63 @@ +import { NextFunction, Request, Response } from 'express'; +import { validationParser } from '../../utils/validation'; +import { loginReqSchema, registerReqSchema } from './validations'; +import authService from './service'; + +const authController = { + login: async (req: Request, res: Response, next: NextFunction) => { + try { + const { body } = await validationParser(loginReqSchema, req); + + const user = await authService.login(body.email, body.password); + + req.session.regenerate(function (err) { + if (err) next(err); + + req.session.user = user; + + req.session.save(function (err) { + if (err) return next(err); + console.log(req.session); + res.json({ message: 'Login Successful' }); + }); + }); + } catch (e) { + next(e); + } + }, + + register: async (req: Request, res: Response, next: NextFunction) => { + try { + const { body } = await validationParser(registerReqSchema, req); + await authService.register( + body.email, + body.password, + body.firstName, + body.lastName, + body.phone, + ); + return res.status(201).json({ message: 'User registration successful' }); + } catch (e) { + next(e); + } + }, + + logout: async (req: Request, res: Response, next: NextFunction) => { + try { + req.session.user = null; + req.session.save((err) => { + if (err) return next(err); + + req.session.regenerate((err) => { + if (err) return next(err); + + res.json({ message: 'User was successfully logged out' }); + }); + }); + } catch (e) { + next(e); + } + }, +}; + +export default authController diff --git a/server/src/modules/auth/router.ts b/server/src/modules/auth/router.ts new file mode 100644 index 0000000..f6ffe49 --- /dev/null +++ b/server/src/modules/auth/router.ts @@ -0,0 +1,10 @@ +import { Router, Request, Response, NextFunction } from 'express'; +import authController from './controller'; + +const authRouter = Router(); + +authRouter.post('/login', authController.login); +authRouter.post('/register', authController.register); +authRouter.get('/logout', authController.logout); + +export default authRouter; diff --git a/server/src/modules/auth/service.ts b/server/src/modules/auth/service.ts new file mode 100644 index 0000000..4046364 --- /dev/null +++ b/server/src/modules/auth/service.ts @@ -0,0 +1,38 @@ +import { ConflictError, UnauthorizedError } from '../..//utils/errors'; +import { prisma } from '../prisma'; +import * as bcrypt from 'bcrypt'; +import { AuthInfo } from 'express-session'; + +const authService = { + /** + * Takes in an email and password and checks if the credentials match any user + * in the database. If successful the user auth info is returned else an Unauthorized error + * is thrown. + * + * @param email - user's email + * @param password - user's password + * @returns + */ + login: async (email: string, password: string): Promise => { + const user = await prisma.user.findUnique({ where: { email: email } }); + + if (!user || !(await bcrypt.compare(password, user.passwordHash))) { + throw new UnauthorizedError('Invalid email or password'); + } + + return { id: user.id }; + }, + + register: async(email:string, password:string, firstname:string, lastname:string, phone?: string): Promise=>{ + const existingUser = await prisma.user.findUnique({where:{email:email}}) + + if (existingUser){ + throw new ConflictError("User already exists") + } + const passwordHash = await bcrypt.hash(password, 10); + const newUser = await prisma.user.create({data:{email:email, firstName: firstname, lastName: lastname, phone: phone, passwordHash: passwordHash }}) + return {id: newUser.id} + } +}; + +export default authService; diff --git a/server/src/modules/auth/validations.ts b/server/src/modules/auth/validations.ts new file mode 100644 index 0000000..153b1d2 --- /dev/null +++ b/server/src/modules/auth/validations.ts @@ -0,0 +1,18 @@ +import { z } from 'zod'; + +export const loginReqSchema = z.object({ + body: z.object({ + email: z.string(), + password: z.string(), + }), +}); + +export const registerReqSchema = z.object({ + body: z.object({ + firstName: z.string().optional(), + lastName: z.string().optional(), + email: z.string().email(), + phone: z.string().optional(), + password: z.string(), + }), +}); diff --git a/server/src/modules/community-event/controller.ts b/server/src/modules/community-event/controller.ts index ac7df51..352a930 100644 --- a/server/src/modules/community-event/controller.ts +++ b/server/src/modules/community-event/controller.ts @@ -7,6 +7,7 @@ import { deleteCommunityEventReq, updateCommunityEventReq, } from './validations'; +import { isAuthenticated } from '../../utils/auth'; /** * Community Event Controller @@ -14,8 +15,9 @@ import { const communityEventController = { create: async (req: Request, res: Response, next: NextFunction) => { try { + const user = await isAuthenticated(req.session); const { body } = await validationParser(createCommunityEventReq, req); - const communityEvent = await communityEventService.create(body); + const communityEvent = await communityEventService.create(body, user.id); res.json({ data: communityEventSerializer.default(communityEvent), }); @@ -25,13 +27,19 @@ const communityEventController = { }, update: async (req: Request, res: Response, next: NextFunction) => { try { + const { id } = await isAuthenticated(req.session); // validate request - const { - body, params - } = await validationParser(updateCommunityEventReq, req); + const { body, params } = await validationParser( + updateCommunityEventReq, + req, + ); // call service - const result = await communityEventService.updateById(params.id, body); + const result = await communityEventService.updateById( + params.id, + body, + id, + ); // serialize response res.json({ data: communityEventSerializer.default(result) }); @@ -41,8 +49,9 @@ const communityEventController = { }, findById: async (req: Request, res: Response, next: NextFunction) => { try { + const { id: userId } = await isAuthenticated(req.session); const { id } = req.params; - const result = await communityEventService.findById(id); + const result = await communityEventService.findById(id, userId); res.json({ data: communityEventSerializer.default(result) }); } catch (e) { next(e); @@ -50,7 +59,8 @@ const communityEventController = { }, getAll: async (req: Request, res: Response, next: NextFunction) => { try { - const result = await communityEventService.findAll(); + const { id } = await isAuthenticated(req.session); + const result = await communityEventService.findAll(id); res.json({ data: result.map((event) => communityEventSerializer.default(event)), }); @@ -58,19 +68,21 @@ const communityEventController = { next(e); } }, - delete: async(req:Request, res: Response, next: NextFunction) =>{ + delete: async (req: Request, res: Response, next: NextFunction) => { try { + const { id:userId } = await isAuthenticated(req.session); // validate request - const {params: {id}} = await validationParser(deleteCommunityEventReq, req) - - const result = await communityEventService.deleteById(id) + const { + params: { id }, + } = await validationParser(deleteCommunityEventReq, req); - res.json({data: communityEventSerializer.delete(result)}) + const result = await communityEventService.deleteById(id, userId); - }catch (e){ + res.json({ data: communityEventSerializer.delete(result) }); + } catch (e) { next(e); } - } + }, }; export default communityEventController; diff --git a/server/src/modules/community-event/router.ts b/server/src/modules/community-event/router.ts index a604a9f..a4b99fc 100644 --- a/server/src/modules/community-event/router.ts +++ b/server/src/modules/community-event/router.ts @@ -8,9 +8,9 @@ const communityEventRouter = Router(); communityEventRouter.post('/', communityEventController.create); communityEventRouter.get('/', communityEventController.getAll) +communityEventRouter.get('/:id', communityEventController.findById); communityEventRouter.put('/:id', communityEventController.update); communityEventRouter.delete('/:id', communityEventController.delete) -communityEventRouter.get('/:id', communityEventController.findById); export default communityEventRouter; diff --git a/server/src/modules/community-event/serializer.ts b/server/src/modules/community-event/serializer.ts index 3860845..f6524df 100644 --- a/server/src/modules/community-event/serializer.ts +++ b/server/src/modules/community-event/serializer.ts @@ -10,7 +10,7 @@ export default { id: communityEvent.id, eventType: communityEvent.eventType, ideaConfirmed: communityEvent.ideaConfirmed, - organizer: communityEvent.organizer, + organizer: communityEvent.organizerId, date: communityEvent.date, inPersonEvent: communityEvent.inPersonEvent, onlineEvent: communityEvent.onlineEvent, diff --git a/server/src/modules/community-event/service.ts b/server/src/modules/community-event/service.ts index 3e64c31..6d33cfe 100644 --- a/server/src/modules/community-event/service.ts +++ b/server/src/modules/community-event/service.ts @@ -6,26 +6,44 @@ import { updateCommunityEventReq } from './validations'; import communityEventSerializer from './serializer'; const communityEventService = { - findAll: async () => { + findAll: async (userId: string) => { return await prisma.communityEvent.findMany({ + where: { + organizerId: userId, + }, include: { eventType: true, organizer: true, }, }); }, - findById: async (communityEventId: string) => { - return prisma.communityEvent.findUnique({ - where: { id: communityEventId }, + findById: async (communityEventId: string, userId: string) => { + const exisitngEvent = await prisma.communityEvent.findFirst({ + where: { id: communityEventId, organizerId: userId }, include: { eventType: true, organizer: true, }, }); + + if (!exisitngEvent) { + throw new NotFoundError( + `Community Event with id ${communityEventId} not found`, + ); + } + console.log(exisitngEvent); + return exisitngEvent; }, - create: async (params: Prisma.CommunityEventCreateInput) => { + create: async (params: Prisma.CommunityEventCreateInput, userId: string) => { return prisma.communityEvent.create({ - data: params, + data: { + ...params, + organizer: { + connect: { + id: userId, + }, + }, + }, include: { eventType: true, organizer: true, @@ -43,9 +61,10 @@ const communityEventService = { updateById: async ( communityEventId: string, updateData: z.infer['body'], + userId: string, ) => { - const existingCommunityEvent = !!(await prisma.communityEvent.findUnique({ - where: { id: communityEventId }, + const existingCommunityEvent = !!(await prisma.communityEvent.findFirst({ + where: { id: communityEventId, organizerId: userId }, })); if (!existingCommunityEvent) { @@ -69,9 +88,9 @@ const communityEventService = { * @param communityEventId * @returns */ - deleteById: async (communityEventId: string) => { - const existingCommunityEvent = !!(await prisma.communityEvent.findUnique({ - where: { id: communityEventId }, + deleteById: async (communityEventId: string, userId: string) => { + const existingCommunityEvent = !!(await prisma.communityEvent.findFirst({ + where: { id: communityEventId, organizerId: userId }, })); if (!existingCommunityEvent) { diff --git a/server/src/modules/community-event/types.ts b/server/src/modules/community-event/types.ts index 4a6d58b..05872d4 100644 --- a/server/src/modules/community-event/types.ts +++ b/server/src/modules/community-event/types.ts @@ -16,7 +16,7 @@ export type CommunityEventResponse = Modify< 'typeId' | 'organizerId' | 'announcementPosted' | 'volunteersNeeded' >, { - organizer: User; + organizer: string; eventAnnounced: boolean; numVolunteersNeeded: number; } diff --git a/server/src/modules/event-type/controller.ts b/server/src/modules/event-type/controller.ts index f66b6f8..02932b8 100644 --- a/server/src/modules/event-type/controller.ts +++ b/server/src/modules/event-type/controller.ts @@ -1,14 +1,15 @@ -import { Request, Response, NextFunction } from "express"; +import { Request, Response, NextFunction } from 'express'; import eventTypeSerializer from './serializer'; -import eventTypeService from "./service"; -import { validationParser } from "../../utils/validation"; +import eventTypeService from './service'; +import { validationParser } from '../../utils/validation'; import { createEventTypeReq, deleteEventTypeReq, updateEventTypeReq, -} from "./validations"; +} from './validations'; -import { NewEventType } from "./types"; +import { NewEventType } from './types'; +import { isAuthenticated } from 'src/utils/auth'; /** * Event Type Controller @@ -17,6 +18,7 @@ import { NewEventType } from "./types"; const eventTypeController = { create: async (req: Request, res: Response, next: NextFunction) => { try { + await isAuthenticated(req.session); const { body } = await validationParser(createEventTypeReq, req); const eventType = await eventTypeService.create(body as NewEventType); res.json({ @@ -28,6 +30,7 @@ const eventTypeController = { }, update: async (req: Request, res: Response, next: NextFunction) => { try { + await isAuthenticated(req.session); // validate request const { body: { id, ...update }, @@ -44,6 +47,7 @@ const eventTypeController = { }, findById: async (req: Request, res: Response, next: NextFunction) => { try { + await isAuthenticated(req.session); const { id } = req.params; const result = await eventTypeService.findById(id); res.json({ data: eventTypeSerializer.default(result) }); @@ -53,6 +57,7 @@ const eventTypeController = { }, getAll: async (req: Request, res: Response, next: NextFunction) => { try { + await isAuthenticated(req.session); const result = await eventTypeService.findAll(); res.json({ data: result.map((event) => eventTypeSerializer.default(event)), @@ -61,19 +66,21 @@ const eventTypeController = { next(e); } }, - delete: async(req:Request, res: Response, next: NextFunction) =>{ + delete: async (req: Request, res: Response, next: NextFunction) => { try { + await isAuthenticated(req.session); // validate request - const {params: {id}} = await validationParser(deleteEventTypeReq, req) - - const result = await eventTypeService.deleteById(id) + const { + params: { id }, + } = await validationParser(deleteEventTypeReq, req); - res.json({data: eventTypeSerializer.delete(result)}) + const result = await eventTypeService.deleteById(id); - }catch (e){ + res.json({ data: eventTypeSerializer.delete(result) }); + } catch (e) { next(e); } - } + }, }; -export default eventTypeController; \ No newline at end of file +export default eventTypeController; diff --git a/server/src/modules/routes.ts b/server/src/modules/routes.ts index e16631d..edd5311 100644 --- a/server/src/modules/routes.ts +++ b/server/src/modules/routes.ts @@ -1,6 +1,7 @@ import { Response, Router } from 'express'; import communityEventRouter from './community-event/router'; import eventTypeRouter from './event-type/router'; +import authRouter from './auth/router'; const router = Router(); @@ -12,5 +13,6 @@ router.get('/api', (_, res: Response) => { router.use('/api/community-events', communityEventRouter); router.use('/api/event-types', eventTypeRouter) +router.use('/api/auth', authRouter) export default router; diff --git a/server/src/utils/auth.ts b/server/src/utils/auth.ts new file mode 100644 index 0000000..156c5d3 --- /dev/null +++ b/server/src/utils/auth.ts @@ -0,0 +1,23 @@ +import { Session, SessionData } from 'express-session'; +import { UnauthorizedError } from './errors'; +import { prisma } from '../modules/prisma'; + + +/** + * Takes in a request session and returns a user if session is valid/authenticated + * else it throws an UnauthorizedError + * @param session + * @returns + */ +export async function isAuthenticated(session: Session & Partial) { + if (!session.user) { + throw new UnauthorizedError('Unauthorized user access'); + } + const existingUser = await prisma.user.findUnique({ where: { id: session.user.id } }); + + if(!existingUser){ + throw new UnauthorizedError('Unauthorized user access'); + } + + return existingUser; +} diff --git a/server/src/utils/env.ts b/server/src/utils/env.ts new file mode 100644 index 0000000..b117345 --- /dev/null +++ b/server/src/utils/env.ts @@ -0,0 +1,7 @@ +import * as dotenv from 'dotenv'; +dotenv.config(); + +export const env = { + PORT: process.env.PORT, + SESSION_SECRET: process.env.SESSION_SECRET, +} as const; diff --git a/server/tsconfig.json b/server/tsconfig.json index ccfa79e..f132f9a 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -11,6 +11,7 @@ "target": "ES2020", "sourceMap": true, "outDir": "./dist", + "typeRoots": ["./types","./node_modules/@types" ], "baseUrl": "./", "incremental": true, "skipLibCheck": true, diff --git a/server/types/express-session.d.ts b/server/types/express-session.d.ts new file mode 100644 index 0000000..2eafdf2 --- /dev/null +++ b/server/types/express-session.d.ts @@ -0,0 +1,11 @@ +import "express-session"; + +declare module "express-session" { + interface SessionData { + uid: string; + user: AuthInfo; + } + interface AuthInfo { + id: string + } +} \ No newline at end of file