From 3c71c060e1c59f91c6ac3aad3384a98087a48ce8 Mon Sep 17 00:00:00 2001 From: AJMALAJU3 Date: Sun, 16 Feb 2025 20:09:57 +0530 Subject: [PATCH 01/23] feat: Implement basic UI structure with responsive design --- Frontend/src/components/auth/Login.tsx | 2 +- .../src/components/profile/ProfileFeed.tsx | 32 +++++++++++++++ .../src/components/profile/ProfileInfo.tsx | 40 +++++++++++++++++++ Frontend/src/components/users/AppSidebar.tsx | 1 - Frontend/src/layouts/Layout.tsx | 6 ++- Frontend/src/pages/users/Profile.tsx | 9 ++++- 6 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 Frontend/src/components/profile/ProfileFeed.tsx create mode 100644 Frontend/src/components/profile/ProfileInfo.tsx diff --git a/Frontend/src/components/auth/Login.tsx b/Frontend/src/components/auth/Login.tsx index 212b3f3..57a5cfa 100644 --- a/Frontend/src/components/auth/Login.tsx +++ b/Frontend/src/components/auth/Login.tsx @@ -10,7 +10,7 @@ const Login: FC = () => { const [signin, setSignin] = useState<"register" | "login">("login"); const navigate = useNavigate() return ( -
+
{/* Sidebar */}
diff --git a/Frontend/src/components/profile/ProfileFeed.tsx b/Frontend/src/components/profile/ProfileFeed.tsx new file mode 100644 index 0000000..53078f7 --- /dev/null +++ b/Frontend/src/components/profile/ProfileFeed.tsx @@ -0,0 +1,32 @@ +import { FC, useState } from 'react' + +const TAB_OPTIONS = ["Posts", "Replies", "Upvoted"] as const; +const ProfileFeed: FC = () => { + const [activeTab, setActiveTab] = useState<"Posts" | "Replies" | "Upvoted">("Posts"); + + return ( +
+
+ {TAB_OPTIONS.map((tab) => ( +
+ + {activeTab === tab && ( +
+ )} +
+ + ))} +
+
+ ); +}; + +export default ProfileFeed; diff --git a/Frontend/src/components/profile/ProfileInfo.tsx b/Frontend/src/components/profile/ProfileInfo.tsx new file mode 100644 index 0000000..dc629f3 --- /dev/null +++ b/Frontend/src/components/profile/ProfileInfo.tsx @@ -0,0 +1,40 @@ +import { ChevronLeft, Plus, Settings } from 'lucide-react' +import { FC } from 'react' + +const ProfileInfo: FC = () => { + return ( +
+
+
+ +

Profile

+
+ +
+ +
+ +
+ +
+

Full Name

+
+

@username

+

. Joined Febraury 2025

+
+
+

0 Posts

+

0 Views

+

0 Upvotes

+
+
+ + +
+ ) +} + +export default ProfileInfo diff --git a/Frontend/src/components/users/AppSidebar.tsx b/Frontend/src/components/users/AppSidebar.tsx index 3821890..bc55c6a 100644 --- a/Frontend/src/components/users/AppSidebar.tsx +++ b/Frontend/src/components/users/AppSidebar.tsx @@ -11,7 +11,6 @@ import { SidebarMenuItem, } from "@/components/ui/sidebar"; -// Menu items. const items = [ { title: "Home", diff --git a/Frontend/src/layouts/Layout.tsx b/Frontend/src/layouts/Layout.tsx index 8ce87e4..d67beeb 100644 --- a/Frontend/src/layouts/Layout.tsx +++ b/Frontend/src/layouts/Layout.tsx @@ -6,8 +6,10 @@ export default function Layout() { return ( -
- +
+
+ +
diff --git a/Frontend/src/pages/users/Profile.tsx b/Frontend/src/pages/users/Profile.tsx index a16ab77..8f3c12e 100644 --- a/Frontend/src/pages/users/Profile.tsx +++ b/Frontend/src/pages/users/Profile.tsx @@ -1,7 +1,14 @@ +import ProfileFeed from "@/components/profile/ProfileFeed"; +import ProfileInfo from "@/components/profile/ProfileInfo"; import { FC } from "react"; const Profile: FC = () => { - return
Profile
; + return ( +
+ + +
+ ) }; export default Profile; From de183fe8314804f64bdf903f7720e119af63bf54 Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Sun, 16 Feb 2025 23:20:14 +0530 Subject: [PATCH 02/23] feat: add signup in auth service interface --- Backend/src/services/interface/IAuthService.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Backend/src/services/interface/IAuthService.ts b/Backend/src/services/interface/IAuthService.ts index e69de29..bf1632a 100644 --- a/Backend/src/services/interface/IAuthService.ts +++ b/Backend/src/services/interface/IAuthService.ts @@ -0,0 +1,7 @@ +import { IUser } from "../../models/interface/IUser"; + + + +export interface IAuthService { + signup(user: IUser): Promise +} \ No newline at end of file From f623a742c2fb782075035c0a6c41db4d135b8148 Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Mon, 17 Feb 2025 00:15:59 +0530 Subject: [PATCH 03/23] docs: Added coding standards to readme --- readme.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/readme.md b/readme.md index f911e26..5780d3a 100644 --- a/readme.md +++ b/readme.md @@ -24,6 +24,10 @@ Welcome to the INKER Blog project! We're excited to have you here. This guide wi - [Branch Management](#branch-management) - [Making Changes](#making-changes) - [Submitting PRs](#submitting-prs) +- [πŸš€ Coding Standards](#-coding-standards) + - [General Guidelines](#general-guidelines) + - [Naming Conventions](#naming-conventions) + - [Git Commit Standards](#naming-conventions) - [⚑ Quick Start Commands](#-quick-start-commands) - [Support](#-support) @@ -102,6 +106,54 @@ curl -X GET http://localhost:3000 4. Add a descriptive title and detailed description 5. Link any related issues +## πŸš€ Coding Standards + +Maintaining a consistent coding style ensures code readability and maintainability. Please follow these guidelines: + +### General Guidelines + +- Follow the **SOLID** principles and **MVC architecture**. +- Keep functions and components **small** and **focused on a single responsibility**. +- Write **clean and self-documenting** code with meaningful variable and function names. +- Avoid unnecessary **comments**β€”the code should be **self-explanatory**. +- Ensure **no console logs** or debugging statements are left before committing. + +### Naming Conventions + +- **Files & Folders:** + - Use `kebab-case` for folders (e.g., `user-profile`). + - Use `dot-separated` names for files inside folders (e.g., `user.controller.ts`, `auth.service.ts`, `blog.model.ts`). +- **Variables & Functions:** + - Use `camelCase` for variables and functions (e.g., `fetchUserData`). + - Use `PascalCase` for React components and classes (e.g., `UserProfile`). +- **Database Schema Fields:** + - Use `snake_case` for database fields (e.g., `profile_picture`). +- **Constants:** + - Use `UPPER_CASE` for constants (e.g., `DEFAULT_PAGE_SIZE`). + +### Git Commit Standards + +Use **Conventional Commits** format for consistency: +: + +markdown +Copy +Edit +#### Common Commit Types: +- `feat`: New feature added (`feat: add user authentication`) +- `fix`: Bug fix (`fix: resolve login issue`) +- `chore`: Maintenance work (`chore: update dependencies`) +- `docs`: Documentation update (`docs: improve README`) +- `style`: Code style changes (formatting, missing semicolons, etc.) +- `refactor`: Code improvements without changing functionality +- `test`: Adding or modifying tests + +Example commits: +```bash +git commit -m "feat: implement JWT authentication" +git commit -m "fix: resolve profile picture upload bug" +git commit -m "docs: add API usage instructions" + ## ⚑ Quick Start Commands ```bash From 5ebde67affa471887de4b00bc0ce4ec3509633ee Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 10:15:03 +0530 Subject: [PATCH 04/23] feat: add password hasing functionality --- Backend/package-lock.json | 585 +++++++++++++++++++++++++++++- Backend/package.json | 2 + Backend/src/utils/hashPassword.ts | 7 + 3 files changed, 589 insertions(+), 5 deletions(-) create mode 100644 Backend/src/utils/hashPassword.ts diff --git a/Backend/package-lock.json b/Backend/package-lock.json index c85cba6..17d79ad 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -9,11 +9,13 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "bcrypt": "^5.1.1", "cors": "^2.8.5", "express": "^4.21.2", "mongoose": "^8.10.0" }, "devDependencies": { + "@types/bcrypt": "^5.0.2", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", "@types/node": "^22.13.1", @@ -63,6 +65,26 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "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==", + "license": "BSD-3-Clause", + "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/@mongodb-js/saslprep": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.0.tgz", @@ -100,6 +122,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/bcrypt": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@types/bcrypt/-/bcrypt-5.0.2.tgz", + "integrity": "sha512-6atioO8Y75fNcbmj0G7UjI9lXN2pQ/IGJ2FWT4a/btd0Lk9lQalHLKhkgKVZ3r+spnmWUKfbMi1GEe9wyHQfNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", @@ -233,6 +265,12 @@ "@types/webidl-conversions": "*" } }, + "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==", + "license": "ISC" + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -272,6 +310,50 @@ "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==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "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==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -286,6 +368,26 @@ "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==", + "license": "ISC" + }, + "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==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "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", @@ -303,9 +405,22 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, "license": "MIT" }, + "node_modules/bcrypt": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz", + "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==", + "hasInstallScript": true, + "license": "MIT", + "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.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -347,7 +462,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -439,13 +553,36 @@ "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==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "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==", + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, "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, "license": "MIT" }, + "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==", + "license": "ISC" + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -511,6 +648,12 @@ "ms": "2.0.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==", + "license": "MIT" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -530,6 +673,15 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-libc": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -560,6 +712,12 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "license": "MIT" }, + "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==", + "license": "MIT" + }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -709,6 +867,36 @@ "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==", + "license": "ISC", + "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==", + "license": "ISC", + "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==", + "license": "ISC" + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -733,6 +921,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "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.7", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", @@ -770,6 +979,27 @@ "node": ">= 0.4" } }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "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", @@ -817,6 +1047,12 @@ "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==", + "license": "ISC" + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -845,6 +1081,42 @@ "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==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -864,6 +1136,17 @@ "dev": true, "license": "ISC" }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -902,6 +1185,15 @@ "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==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -934,6 +1226,30 @@ "node": ">=12.0.0" } }, + "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==", + "license": "MIT", + "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==", + "license": "ISC", + "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", @@ -1020,7 +1336,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -1029,6 +1344,52 @@ "node": "*" } }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "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==", + "license": "MIT", + "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==", + "license": "ISC", + "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==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mongodb": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.0.tgz", @@ -1172,6 +1533,54 @@ "node": ">= 0.6" } }, + "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==", + "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "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-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/node-fetch/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==", + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/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==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/nodemon": { "version": "3.1.9", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", @@ -1226,6 +1635,21 @@ "dev": true, "license": "MIT" }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "license": "ISC", + "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", @@ -1236,6 +1660,19 @@ "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==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "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", @@ -1269,6 +1706,15 @@ "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==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -1278,6 +1724,15 @@ "node": ">= 0.8" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-to-regexp": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", @@ -1365,6 +1820,20 @@ "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==", + "license": "MIT", + "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", @@ -1378,6 +1847,22 @@ "node": ">=8.10.0" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1408,7 +1893,6 @@ "version": "7.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -1471,6 +1955,12 @@ "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==", + "license": "ISC" + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -1555,6 +2045,12 @@ "integrity": "sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==", "license": "MIT" }, + "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==", + "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", @@ -1586,6 +2082,41 @@ "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==", + "license": "MIT", + "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==", + "license": "MIT", + "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==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -1599,6 +2130,23 @@ "node": ">=4" } }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", + "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/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1737,6 +2285,12 @@ "node": ">= 0.8" } }, + "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==", + "license": "MIT" + }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -1784,6 +2338,27 @@ "node": ">=18" } }, + "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==", + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "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==", + "license": "ISC" + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", diff --git a/Backend/package.json b/Backend/package.json index ad43714..62b54db 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -13,11 +13,13 @@ "license": "ISC", "type": "commonjs", "dependencies": { + "bcrypt": "^5.1.1", "cors": "^2.8.5", "express": "^4.21.2", "mongoose": "^8.10.0" }, "devDependencies": { + "@types/bcrypt": "^5.0.2", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", "@types/node": "^22.13.1", diff --git a/Backend/src/utils/hashPassword.ts b/Backend/src/utils/hashPassword.ts new file mode 100644 index 0000000..5921efb --- /dev/null +++ b/Backend/src/utils/hashPassword.ts @@ -0,0 +1,7 @@ +import bcrypt from 'bcrypt' + +export async function hashPassword(value: string): Promise { + const salt = 10 + const result = await bcrypt.hash(value, salt) + return result +} \ No newline at end of file From 16e0bab2ebaee1b871591c86f473dd757138aa7f Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 10:45:38 +0530 Subject: [PATCH 05/23] feat: add otp email sending funcitonality --- Backend/package-lock.json | 23 ++++++++++++++++++++++- Backend/package.json | 4 +++- Backend/src/configs/mail.congfig.ts | 11 +++++++++++ Backend/src/utils/sendEmail.ts | 26 ++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 Backend/src/configs/mail.congfig.ts create mode 100644 Backend/src/utils/sendEmail.ts diff --git a/Backend/package-lock.json b/Backend/package-lock.json index 17d79ad..dedc5ab 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -12,13 +12,15 @@ "bcrypt": "^5.1.1", "cors": "^2.8.5", "express": "^4.21.2", - "mongoose": "^8.10.0" + "mongoose": "^8.10.0", + "nodemailer": "^6.10.0" }, "devDependencies": { "@types/bcrypt": "^5.0.2", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", "@types/node": "^22.13.1", + "@types/nodemailer": "^6.4.17", "nodemon": "^3.1.9", "ts-node": "^10.9.2", "typescript": "^5.7.3" @@ -213,6 +215,16 @@ "undici-types": "~6.20.0" } }, + "node_modules/@types/nodemailer": { + "version": "6.4.17", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.17.tgz", + "integrity": "sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/qs": { "version": "6.9.18", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", @@ -1581,6 +1593,15 @@ "webidl-conversions": "^3.0.0" } }, + "node_modules/nodemailer": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", + "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==", + "license": "MIT-0", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/nodemon": { "version": "3.1.9", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", diff --git a/Backend/package.json b/Backend/package.json index 62b54db..36ee8a7 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -16,13 +16,15 @@ "bcrypt": "^5.1.1", "cors": "^2.8.5", "express": "^4.21.2", - "mongoose": "^8.10.0" + "mongoose": "^8.10.0", + "nodemailer": "^6.10.0" }, "devDependencies": { "@types/bcrypt": "^5.0.2", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", "@types/node": "^22.13.1", + "@types/nodemailer": "^6.4.17", "nodemon": "^3.1.9", "ts-node": "^10.9.2", "typescript": "^5.7.3" diff --git a/Backend/src/configs/mail.congfig.ts b/Backend/src/configs/mail.congfig.ts new file mode 100644 index 0000000..5642ead --- /dev/null +++ b/Backend/src/configs/mail.congfig.ts @@ -0,0 +1,11 @@ +import nodemailer from 'nodemailer' + +const transporter = nodemailer.createTransport({ + service: 'gmail', + auth: { + // user: SENDER_EMAIL, + //pass: PASSKEY + } +}) + +export default transporter \ No newline at end of file diff --git a/Backend/src/utils/sendEmail.ts b/Backend/src/utils/sendEmail.ts new file mode 100644 index 0000000..c3f2562 --- /dev/null +++ b/Backend/src/utils/sendEmail.ts @@ -0,0 +1,26 @@ +import transporter from "../configs/mail.congfig" + +export const sendOtpEmail = async (email: string, otp: number) => { + try{ + + const mailOptions = { + from: '', + to: email, + subject: 'inker OTP Verificaiton', + html: ` +

OTP Verification

+

Your OTP is: ${otp}

+

Use this OTP to verify your email. Do not share it with anyone.


+

If you did not request this verification, you can ignore this email.

+

~ Inker

+ ` + } + + const info = await transporter.sendMail(mailOptions) + console.log("OTP mail send successfully", info.response) + }catch(err){ + console.error('Error sending verification email:', err); + throw new Error("Error sending otp email") + } + +} \ No newline at end of file From 306b7e62c097ec9876679bcc9b18bf6f1c1f2f5c Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 10:51:50 +0530 Subject: [PATCH 06/23] feat: add signup to auth service --- .../services/implementation/auth.service.ts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Backend/src/services/implementation/auth.service.ts b/Backend/src/services/implementation/auth.service.ts index e69de29..40e39b8 100644 --- a/Backend/src/services/implementation/auth.service.ts +++ b/Backend/src/services/implementation/auth.service.ts @@ -0,0 +1,31 @@ +import { IUser } from "../../models/interface/IUser"; +import { IUserRepository } from "../../repositories/interface/IUserRepository"; +import { IAuthService } from "../interface/IAuthService"; +import { hashPassword } from "../../utils/hashPassword"; +import generateOtp from "../../utils/generateOtp"; + +import { sendOtpEmail } from "../../utils/sendEmail"; + + + +export class AuthService implements IAuthService { + constructor(private _userRepository: IUserRepository){} + + async signup(user: IUser): Promise { + const userExist = await this._userRepository.findByEmail(user.email) + + if(userExist){ + throw new Error("User already exist") + } + + user.password = await hashPassword(user.password as string) + + const otp = generateOtp() + + await sendOtpEmail(user.email, otp) + + //store user data and otp to redis + + return user.email + } +} \ No newline at end of file From bc37d822f9b1f4f2dc8cdd96f3d54694bc6ca2b8 Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 10:54:11 +0530 Subject: [PATCH 07/23] feat: add signup to interface of auth controller --- Backend/src/controllers/interface/IAuthController.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Backend/src/controllers/interface/IAuthController.ts b/Backend/src/controllers/interface/IAuthController.ts index e69de29..67bbf1d 100644 --- a/Backend/src/controllers/interface/IAuthController.ts +++ b/Backend/src/controllers/interface/IAuthController.ts @@ -0,0 +1,6 @@ +import { Request, Response, NextFunction } from "express"; + + +export interface IAuthController { + signup(req: Request, res: Response, next: NextFunction): Promise +} \ No newline at end of file From f447d72bd6fb620f545abb7836cef5428844c3cc Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 10:57:42 +0530 Subject: [PATCH 08/23] feat: add signup to auth service implementation --- .../implementation/auth.controller.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Backend/src/controllers/implementation/auth.controller.ts b/Backend/src/controllers/implementation/auth.controller.ts index e69de29..bf52a47 100644 --- a/Backend/src/controllers/implementation/auth.controller.ts +++ b/Backend/src/controllers/implementation/auth.controller.ts @@ -0,0 +1,21 @@ +import { Request, Response, NextFunction } from "express"; +import { IAuthService } from "../../services/interface/IAuthService"; +import { IAuthController } from "../interface/IAuthController"; + + + +export class AuthController implements IAuthController{ + constructor(private _authService: IAuthService){} + + async signup(req: Request, res: Response, next: NextFunction): Promise { + try{ + const user = await this._authService.signup(req.body) + + res.status(200).json({ + email: user + }) + }catch(err){ + next(err) + } + } +} \ No newline at end of file From bd689e522d4e1a6cfc25585f93ad4372eace8e4e Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 10:59:14 +0530 Subject: [PATCH 09/23] refactore: optimized generate otp method --- Backend/src/utils/generateOtp.ts | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Backend/src/utils/generateOtp.ts diff --git a/Backend/src/utils/generateOtp.ts b/Backend/src/utils/generateOtp.ts new file mode 100644 index 0000000..422f7e1 --- /dev/null +++ b/Backend/src/utils/generateOtp.ts @@ -0,0 +1,6 @@ + +const generateOtp = () => { + return Math.floor(100000 + Math.random() * 999999) +} + +export default generateOtp \ No newline at end of file From 22a071e3527632b24182f66439ffc037062087f2 Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 11:14:40 +0530 Subject: [PATCH 10/23] feat: setup redis configuration --- Backend/src/configs/redis.config.ts | 27 +++++++ Backend/src/index.ts | 2 + package-lock.json | 112 ++++++++++++++++++++++++++++ package.json | 5 ++ 4 files changed, 146 insertions(+) create mode 100644 Backend/src/configs/redis.config.ts create mode 100644 package-lock.json create mode 100644 package.json diff --git a/Backend/src/configs/redis.config.ts b/Backend/src/configs/redis.config.ts new file mode 100644 index 0000000..8015b2e --- /dev/null +++ b/Backend/src/configs/redis.config.ts @@ -0,0 +1,27 @@ +import { createClient, RedisClientType } from "redis" + +let redisClient: RedisClientType + +function connectRedis(){ +redisClient = createClient({ + socket: { + host: '127.0.0.1', + port: 6379 + } +}) + +redisClient.on('connect', () => { + console.log(`Connected to redis`) +}) + +redisClient.on('error', (err) => { + console.error('Redis connection error:', err) +}) + +redisClient.connect(); +} + +export { + connectRedis, + redisClient +} \ No newline at end of file diff --git a/Backend/src/index.ts b/Backend/src/index.ts index b512e1e..350962d 100644 --- a/Backend/src/index.ts +++ b/Backend/src/index.ts @@ -2,12 +2,14 @@ import express from "express" import cors from "cors" import { Request, Response } from "express" import { connectDb } from "./configs/mongo.config" +import { connectRedis } from "./configs/redis.config" const PORT = 3000 const app = express() app.use(cors()) connectDb() +connectRedis() app.get('/',(req:Request,res:Response)=>{ /* diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..e245713 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,112 @@ +{ + "name": "Inker", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "redis": "^4.7.0" + } + }, + "node_modules/@redis/bloom": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", + "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/client": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.6.0.tgz", + "integrity": "sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==", + "license": "MIT", + "dependencies": { + "cluster-key-slot": "1.1.2", + "generic-pool": "3.9.0", + "yallist": "4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@redis/graph": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz", + "integrity": "sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/json": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.7.tgz", + "integrity": "sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/search": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.2.0.tgz", + "integrity": "sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/time-series": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.1.0.tgz", + "integrity": "sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/generic-pool": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", + "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/redis": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/redis/-/redis-4.7.0.tgz", + "integrity": "sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==", + "license": "MIT", + "workspaces": [ + "./packages/*" + ], + "dependencies": { + "@redis/bloom": "1.2.0", + "@redis/client": "1.6.0", + "@redis/graph": "1.1.1", + "@redis/json": "1.0.7", + "@redis/search": "1.2.0", + "@redis/time-series": "1.1.0" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..e35840b --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "redis": "^4.7.0" + } +} From f59766c9e5e501ce00f5940e3539bb63036a9f4a Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 11:21:27 +0530 Subject: [PATCH 11/23] feat: add redis to signup in auth service implementation --- .../src/services/implementation/auth.service.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Backend/src/services/implementation/auth.service.ts b/Backend/src/services/implementation/auth.service.ts index 40e39b8..4b97e9d 100644 --- a/Backend/src/services/implementation/auth.service.ts +++ b/Backend/src/services/implementation/auth.service.ts @@ -3,11 +3,11 @@ import { IUserRepository } from "../../repositories/interface/IUserRepository"; import { IAuthService } from "../interface/IAuthService"; import { hashPassword } from "../../utils/hashPassword"; import generateOtp from "../../utils/generateOtp"; - import { sendOtpEmail } from "../../utils/sendEmail"; +import { redisClient } from "../../configs/redis.config"; - +//! Implementation for Auth Service export class AuthService implements IAuthService { constructor(private _userRepository: IUserRepository){} @@ -24,7 +24,18 @@ export class AuthService implements IAuthService { await sendOtpEmail(user.email, otp) - //store user data and otp to redis + const response = await redisClient.setEx( + user.email, + 300, + JSON.stringify({ + ...user, + otp + }) + ); + + if (!response) { + throw new Error("Internal server error"); + } return user.email } From ebd9bb455358fd7f5a6507ad53b7d0fb2fc6121b Mon Sep 17 00:00:00 2001 From: SujithVSuresh Date: Mon, 17 Feb 2025 12:58:33 +0530 Subject: [PATCH 12/23] feat: add redis service to docker compose --- Backend/package-lock.json | 108 ++++++++++++++++++++++++++- Backend/package.json | 4 +- Backend/src/configs/redis.config.ts | 2 +- docker-compose.yml | 11 +++ package-lock.json | 112 ---------------------------- package.json | 5 -- 6 files changed, 122 insertions(+), 120 deletions(-) delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/Backend/package-lock.json b/Backend/package-lock.json index dedc5ab..e4f19fd 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -13,7 +13,8 @@ "cors": "^2.8.5", "express": "^4.21.2", "mongoose": "^8.10.0", - "nodemailer": "^6.10.0" + "nodemailer": "^6.10.0", + "redis": "^4.7.0" }, "devDependencies": { "@types/bcrypt": "^5.0.2", @@ -21,6 +22,7 @@ "@types/express": "^5.0.0", "@types/node": "^22.13.1", "@types/nodemailer": "^6.4.17", + "@types/redis": "^4.0.10", "nodemon": "^3.1.9", "ts-node": "^10.9.2", "typescript": "^5.7.3" @@ -96,6 +98,65 @@ "sparse-bitfield": "^3.0.3" } }, + "node_modules/@redis/bloom": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", + "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/client": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.6.0.tgz", + "integrity": "sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==", + "license": "MIT", + "dependencies": { + "cluster-key-slot": "1.1.2", + "generic-pool": "3.9.0", + "yallist": "4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@redis/graph": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz", + "integrity": "sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/json": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.7.tgz", + "integrity": "sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/search": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.2.0.tgz", + "integrity": "sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/time-series": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.1.0.tgz", + "integrity": "sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==", + "license": "MIT", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", @@ -239,6 +300,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/redis": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-4.0.10.tgz", + "integrity": "sha512-7CLy5b5fzzEGVcOccgZjoMlNpPhX6d10jEeRy2YWbFuaMNrSPc9ExRsMYsd+0VxvEHucf4EWx24Ja7cSU1FGUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "redis": "*" + } + }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", @@ -574,6 +645,15 @@ "node": ">=10" } }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -954,6 +1034,15 @@ "node": ">=10" } }, + "node_modules/generic-pool": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", + "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/get-intrinsic": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", @@ -1868,6 +1957,23 @@ "node": ">=8.10.0" } }, + "node_modules/redis": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/redis/-/redis-4.7.0.tgz", + "integrity": "sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==", + "license": "MIT", + "workspaces": [ + "./packages/*" + ], + "dependencies": { + "@redis/bloom": "1.2.0", + "@redis/client": "1.6.0", + "@redis/graph": "1.1.1", + "@redis/json": "1.0.7", + "@redis/search": "1.2.0", + "@redis/time-series": "1.1.0" + } + }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", diff --git a/Backend/package.json b/Backend/package.json index 36ee8a7..15f7704 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -17,7 +17,8 @@ "cors": "^2.8.5", "express": "^4.21.2", "mongoose": "^8.10.0", - "nodemailer": "^6.10.0" + "nodemailer": "^6.10.0", + "redis": "^4.7.0" }, "devDependencies": { "@types/bcrypt": "^5.0.2", @@ -25,6 +26,7 @@ "@types/express": "^5.0.0", "@types/node": "^22.13.1", "@types/nodemailer": "^6.4.17", + "@types/redis": "^4.0.10", "nodemon": "^3.1.9", "ts-node": "^10.9.2", "typescript": "^5.7.3" diff --git a/Backend/src/configs/redis.config.ts b/Backend/src/configs/redis.config.ts index 8015b2e..e83cf4e 100644 --- a/Backend/src/configs/redis.config.ts +++ b/Backend/src/configs/redis.config.ts @@ -5,7 +5,7 @@ let redisClient: RedisClientType function connectRedis(){ redisClient = createClient({ socket: { - host: '127.0.0.1', + host: 'redis', port: 6379 } }) diff --git a/docker-compose.yml b/docker-compose.yml index 12cd7b6..82f8030 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,7 @@ services: command: npm run dev depends_on: - mongo # Ensures express starts after MongoDB + - redis react-app: container_name: frontend-react-app @@ -37,5 +38,15 @@ services: - MONGO_INITDB_ROOT_USERNAME=admin - MONGO_INITDB_ROOT_PASSWORD=password # Set MongoDB root credentials + + redis: + container_name: "redis_container" + image: "redis:latest" + ports: + - "6379:6379" + volumes: + - redis_data:/data # Persist redis storage + volumes: mongo-data: # Declare volume for persistent storage + redis_data: diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index e245713..0000000 --- a/package-lock.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "name": "Inker", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "dependencies": { - "redis": "^4.7.0" - } - }, - "node_modules/@redis/bloom": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", - "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/@redis/client": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.6.0.tgz", - "integrity": "sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==", - "license": "MIT", - "dependencies": { - "cluster-key-slot": "1.1.2", - "generic-pool": "3.9.0", - "yallist": "4.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@redis/graph": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz", - "integrity": "sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/@redis/json": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.7.tgz", - "integrity": "sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/@redis/search": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.2.0.tgz", - "integrity": "sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/@redis/time-series": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.1.0.tgz", - "integrity": "sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==", - "license": "MIT", - "peerDependencies": { - "@redis/client": "^1.0.0" - } - }, - "node_modules/cluster-key-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", - "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", - "license": "Apache-2.0", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/generic-pool": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", - "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==", - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/redis": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/redis/-/redis-4.7.0.tgz", - "integrity": "sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==", - "license": "MIT", - "workspaces": [ - "./packages/*" - ], - "dependencies": { - "@redis/bloom": "1.2.0", - "@redis/client": "1.6.0", - "@redis/graph": "1.1.1", - "@redis/json": "1.0.7", - "@redis/search": "1.2.0", - "@redis/time-series": "1.1.0" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index e35840b..0000000 --- a/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "redis": "^4.7.0" - } -} From d5018bdc4bc368dda8ec6d1ca2f703ca728f3274 Mon Sep 17 00:00:00 2001 From: Shammasahamedp Date: Mon, 17 Feb 2025 15:57:11 +0530 Subject: [PATCH 13/23] style: change mail.config.ts file --- Backend/src/configs/env.config.ts | 23 +++++++++++++++++++ .../{mail.congfig.ts => mail.config.ts} | 0 Backend/src/configs/mongo.config.ts | 3 ++- .../src/models/implementation/user.model.ts | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Backend/src/configs/env.config.ts rename Backend/src/configs/{mail.congfig.ts => mail.config.ts} (100%) diff --git a/Backend/src/configs/env.config.ts b/Backend/src/configs/env.config.ts new file mode 100644 index 0000000..bce7e6a --- /dev/null +++ b/Backend/src/configs/env.config.ts @@ -0,0 +1,23 @@ +export const env = { + get PORT() { + return process.env.PORT + }, + get MONGO_URI() { + return process.env.MONGO_URI + }, + get JWT_ACCESS_SECRET() { + return process.env.JWT_ACCESS_SECRET; + }, + get JWT_REFRESH_SECRET(){ + return process.env.JWT_REFRESH_SECRET; + }, + get REDIS_URI() { + return process.env.REDIS_URI; + }, + get CLOUDINARY_API_KEY() { + return process.env.CLOUDINARY_API_KEY!; + }, + get CLOUDINARY_API_SECRET() { + return process.env.CLOUDINARY_API_SECRET!; + }, +} \ No newline at end of file diff --git a/Backend/src/configs/mail.congfig.ts b/Backend/src/configs/mail.config.ts similarity index 100% rename from Backend/src/configs/mail.congfig.ts rename to Backend/src/configs/mail.config.ts diff --git a/Backend/src/configs/mongo.config.ts b/Backend/src/configs/mongo.config.ts index bdae084..33de598 100644 --- a/Backend/src/configs/mongo.config.ts +++ b/Backend/src/configs/mongo.config.ts @@ -7,4 +7,5 @@ export async function connectDb(){ } catch (error) { console.log('Mongo Error, ',error) } -} \ No newline at end of file +} + diff --git a/Backend/src/models/implementation/user.model.ts b/Backend/src/models/implementation/user.model.ts index 4955ed0..d0fa637 100644 --- a/Backend/src/models/implementation/user.model.ts +++ b/Backend/src/models/implementation/user.model.ts @@ -7,6 +7,7 @@ const userSchema = new Schema( username: { type: String, required: true, + unique: true }, name: { type: String, @@ -14,6 +15,7 @@ const userSchema = new Schema( email: { type: String, required: true, + unique: true }, password: { type: String, From 1e28d99f4613fc1dde7b72b60f4abbdb59c512d2 Mon Sep 17 00:00:00 2001 From: Shammasahamedp Date: Mon, 17 Feb 2025 18:53:56 +0530 Subject: [PATCH 14/23] feat: implemented jwt functions and auth router --- Backend/package-lock.json | 94 ++++++++++++++++++++++++++++++ Backend/package.json | 1 + Backend/src/index.ts | 5 +- Backend/src/routers/auth.router.ts | 16 +++++ Backend/src/utils/jwt.ts | 37 ++++++++++++ 5 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 Backend/src/utils/jwt.ts diff --git a/Backend/package-lock.json b/Backend/package-lock.json index e4f19fd..5360b1b 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -12,6 +12,7 @@ "bcrypt": "^5.1.1", "cors": "^2.8.5", "express": "^4.21.2", + "jsonwebtoken": "^9.0.2", "mongoose": "^8.10.0", "nodemailer": "^6.10.0", "redis": "^4.7.0" @@ -573,6 +574,11 @@ "node": ">=16.20.1" } }, + "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", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -798,6 +804,14 @@ "node": ">= 0.4" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -1318,6 +1332,51 @@ "node": ">=0.12.0" } }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jsonwebtoken/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/kareem": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.6.3.tgz", @@ -1327,6 +1386,41 @@ "node": ">=12.0.0" } }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", diff --git a/Backend/package.json b/Backend/package.json index 15f7704..897ce14 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -16,6 +16,7 @@ "bcrypt": "^5.1.1", "cors": "^2.8.5", "express": "^4.21.2", + "jsonwebtoken": "^9.0.2", "mongoose": "^8.10.0", "nodemailer": "^6.10.0", "redis": "^4.7.0" diff --git a/Backend/src/index.ts b/Backend/src/index.ts index 350962d..588cdfa 100644 --- a/Backend/src/index.ts +++ b/Backend/src/index.ts @@ -3,6 +3,7 @@ import cors from "cors" import { Request, Response } from "express" import { connectDb } from "./configs/mongo.config" import { connectRedis } from "./configs/redis.config" +import authRouter from "./routers/auth.router" const PORT = 3000 const app = express() app.use(cors()) @@ -20,6 +21,8 @@ app.get('/',(req:Request,res:Response)=>{ res.status(200).json({message:"success"}) return -}) +}); + +app.use('/auth', authRouter) app.listen(PORT, () => console.log(`Server started at ${PORT} βœ…`)) diff --git a/Backend/src/routers/auth.router.ts b/Backend/src/routers/auth.router.ts index e69de29..2ac5bf9 100644 --- a/Backend/src/routers/auth.router.ts +++ b/Backend/src/routers/auth.router.ts @@ -0,0 +1,16 @@ +import { Router } from "express"; +import { AuthController } from "../controllers/implementation/auth.controller"; +import { AuthService } from "../services/implementation/auth.service"; +import { UserRepository } from "../repositories/implementation/user.repository"; + + +const authRouter = Router(); + +const userRepository = new UserRepository(); +const authService = new AuthService(userRepository); +const authController = new AuthController(authService); + +authRouter.post('/register',authController.signup); +authRouter.post('/login',authController.signin); + +export default authRouter; \ No newline at end of file diff --git a/Backend/src/utils/jwt.ts b/Backend/src/utils/jwt.ts new file mode 100644 index 0000000..d69c1f3 --- /dev/null +++ b/Backend/src/utils/jwt.ts @@ -0,0 +1,37 @@ +import jwt from "jsonwebtoken" + + +const ACCESS_KEY = process.env.JWT_ACCESS_SECRET +const REFRESH_KEY = process.env.JWT_REFRESH_SECRET + +const ACCESS_TOKEN_EXPIRY = '1h' +const REFRESH_TOKEN_EXPIRY = '7d' +export function generateAccessToken (payload:Object,expiresIn:string = ACCESS_TOKEN_EXPIRY):string{ + + return jwt.sign(payload,ACCESS_KEY,{expiresIn}) + +} + +export function generateRefreshToken (payload:Object,expiresIn:string = REFRESH_TOKEN_EXPIRY):string{ + + return jwt.sign(payload,REFRESH_KEY,{expiresIn}) + +} + + + +export function verifyAccessToken (token:string):object|null{ + try { + return jwt.verify(token,ACCESS_TOKEN_EXPIRY) + } catch (error:unknown) { + return null + } +} + +export function verifyRefreshToken (token:string):object|null{ + try { + return jwt.verify(token,REFRESH_KEY) + } catch (error:unknown) { + return null + } +} \ No newline at end of file From 39e2e549c8d6af858f759f6bd8fa001593813fb1 Mon Sep 17 00:00:00 2001 From: Melbin Mathew Date: Mon, 17 Feb 2025 18:54:53 +0530 Subject: [PATCH 15/23] feat: add sign-in to auth-service and auth-controller --- Backend/package-lock.json | 23 ++++++++++++++++++ Backend/package.json | 1 + .../implementation/auth.controller.ts | 19 +++++++++++++++ .../controllers/interface/IAuthController.ts | 1 + .../services/implementation/auth.service.ts | 24 +++++++++++++++++++ .../src/services/interface/IAuthService.ts | 1 + 6 files changed, 69 insertions(+) diff --git a/Backend/package-lock.json b/Backend/package-lock.json index e4f19fd..196bc7e 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -10,6 +10,7 @@ "license": "ISC", "dependencies": { "bcrypt": "^5.1.1", + "cookie-parser": "^1.4.7", "cors": "^2.8.5", "express": "^4.21.2", "mongoose": "^8.10.0", @@ -705,6 +706,28 @@ "node": ">= 0.6" } }, + "node_modules/cookie-parser": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", + "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", + "license": "MIT", + "dependencies": { + "cookie": "0.7.2", + "cookie-signature": "1.0.6" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/cookie-parser/node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", diff --git a/Backend/package.json b/Backend/package.json index 15f7704..196559f 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -14,6 +14,7 @@ "type": "commonjs", "dependencies": { "bcrypt": "^5.1.1", + "cookie-parser": "^1.4.7", "cors": "^2.8.5", "express": "^4.21.2", "mongoose": "^8.10.0", diff --git a/Backend/src/controllers/implementation/auth.controller.ts b/Backend/src/controllers/implementation/auth.controller.ts index bf52a47..2a0290f 100644 --- a/Backend/src/controllers/implementation/auth.controller.ts +++ b/Backend/src/controllers/implementation/auth.controller.ts @@ -18,4 +18,23 @@ export class AuthController implements IAuthController{ next(err) } } + + async signin(req: Request, res: Response, next: NextFunction): Promise { + try{ + const { email, password } = req.body; + + const tokens = await this._authService.signin(email, password); + + res.cookie("refreshToken", tokens.refreshToken, { + httpOnly: true, + secure: false, + maxAge: 7 * 24 * 60 * 60 * 1000, + sameSite: "strict" + }); + + res.status(200).json({accessToken: tokens.accessToken}); + }catch(err){ + next(err) + } + } } \ No newline at end of file diff --git a/Backend/src/controllers/interface/IAuthController.ts b/Backend/src/controllers/interface/IAuthController.ts index 67bbf1d..b7a55eb 100644 --- a/Backend/src/controllers/interface/IAuthController.ts +++ b/Backend/src/controllers/interface/IAuthController.ts @@ -3,4 +3,5 @@ import { Request, Response, NextFunction } from "express"; export interface IAuthController { signup(req: Request, res: Response, next: NextFunction): Promise + signin(req: Request, res: Response, next: NextFunction): Promise } \ No newline at end of file diff --git a/Backend/src/services/implementation/auth.service.ts b/Backend/src/services/implementation/auth.service.ts index 4b97e9d..a5007ba 100644 --- a/Backend/src/services/implementation/auth.service.ts +++ b/Backend/src/services/implementation/auth.service.ts @@ -5,6 +5,8 @@ import { hashPassword } from "../../utils/hashPassword"; import generateOtp from "../../utils/generateOtp"; import { sendOtpEmail } from "../../utils/sendEmail"; import { redisClient } from "../../configs/redis.config"; +import bcrypt from 'bcrypt'; +import { generateAccessToken, generateRefreshToken } from '../../utils/jwt'; //! Implementation for Auth Service @@ -39,4 +41,26 @@ export class AuthService implements IAuthService { return user.email } + + async signin(email: string, password: string): Promise<{ accessToken: string, refreshToken: string }> { + + const user = await this._userRepository.findByEmail(email); + + if(!user){ + throw new Error("User not found"); + } + + const isMatch = await bcrypt.compare(password, user.password as string); + + if(!isMatch){ + throw new Error("Incorrect password"); + } + + const payload = { id: user._id, email: user.email }; + + const accessToken = generateAccessToken(payload); + const refreshToken = generateRefreshToken(payload); + + return { accessToken, refreshToken }; + } } \ No newline at end of file diff --git a/Backend/src/services/interface/IAuthService.ts b/Backend/src/services/interface/IAuthService.ts index bf1632a..bd5b7d8 100644 --- a/Backend/src/services/interface/IAuthService.ts +++ b/Backend/src/services/interface/IAuthService.ts @@ -4,4 +4,5 @@ import { IUser } from "../../models/interface/IUser"; export interface IAuthService { signup(user: IUser): Promise + signin(email: string, passowrd: string): Promise<{accessToken: string, refreshToken: string}> } \ No newline at end of file From 244c53c8edf4561d41127833b2df90222da58d3b Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 11:03:51 +0530 Subject: [PATCH 16/23] docs: Added forking guide to readme --- readme.md | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index 5780d3a..c6e6810 100644 --- a/readme.md +++ b/readme.md @@ -42,10 +42,27 @@ Before you begin, ensure you have installed: ### Installation Steps -1. **Clone the repository** - ```bash - git clone https://github.com/your-username/inker-blog.git - cd inker-blog +**Forking the repository** + + +1. Go to the [Inker Respository test branch](https://github.com/TheByteFlow/Inker/tree/test). +2. Click on the fork option on the top right under the navbar. +3. Click on Create a new fork. +4. Uncheck the "Copy the master branch only" option. +5. Click on the Create fork option. + +The forked repository will be available in "your repositories". + + +**Cloning the repository** + + +1. Go to your repositories and you can see the forked repository of Inker. +2. Click on the "Code" option and copy the repository url. +3. Go to your desired file location in the command prompt (terminal for linux). +4. Enter the command + ```bash + git clone the-url-you-copied ``` ## πŸ› οΈ Development Setup @@ -79,7 +96,13 @@ curl -X GET http://localhost:3000 1. **Create your feature branch** ```bash - git checkout -b test origin/test ``` + git checkout -b origin/frontend/test + ``` + or + + ```bash + git checkout -b origin/backend/test + ``` 2. **Keep your branch updated** ```bash From be3677f3e8230fa494ba3bbd20314c1426beef9a Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 12:39:40 +0530 Subject: [PATCH 17/23] fix: import name of mail transport util fixed --- Backend/package-lock.json | 19 +++++++++++++++++++ Backend/package.json | 1 + Backend/src/utils/sendEmail.ts | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Backend/package-lock.json b/Backend/package-lock.json index 82ebf70..ec7ef3a 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -22,6 +22,7 @@ "@types/bcrypt": "^5.0.2", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", + "@types/jsonwebtoken": "^9.0.8", "@types/node": "^22.13.1", "@types/nodemailer": "^6.4.17", "@types/redis": "^4.0.10", @@ -261,6 +262,17 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/jsonwebtoken": { + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.8.tgz", + "integrity": "sha512-7fx54m60nLFUVYlxAB1xpe9CBWX2vSrk50Y6ogRJ1v5xxtba7qXTg5BgYDN5dq+yuQQ9HaVlHJyAAt1/mxryFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/ms": "*", + "@types/node": "*" + } + }, "node_modules/@types/mime": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", @@ -268,6 +280,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", + "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "22.13.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz", diff --git a/Backend/package.json b/Backend/package.json index e632511..a613c8d 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -26,6 +26,7 @@ "@types/bcrypt": "^5.0.2", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", + "@types/jsonwebtoken": "^9.0.8", "@types/node": "^22.13.1", "@types/nodemailer": "^6.4.17", "@types/redis": "^4.0.10", diff --git a/Backend/src/utils/sendEmail.ts b/Backend/src/utils/sendEmail.ts index c3f2562..8c9b349 100644 --- a/Backend/src/utils/sendEmail.ts +++ b/Backend/src/utils/sendEmail.ts @@ -1,4 +1,4 @@ -import transporter from "../configs/mail.congfig" +import transporter from "../configs/mail.config" export const sendOtpEmail = async (email: string, otp: number) => { try{ From 5198e473fac3fd60be2349735ccc6cb0ebe6ffdc Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 13:34:17 +0530 Subject: [PATCH 18/23] fix: type error fixed in the jwt auth --- Backend/.env | 2 ++ Backend/src/services/implementation/auth.service.ts | 2 +- Backend/src/utils/jwt.ts | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 Backend/.env diff --git a/Backend/.env b/Backend/.env new file mode 100644 index 0000000..8fed611 --- /dev/null +++ b/Backend/.env @@ -0,0 +1,2 @@ +JWT_ACCESS_SECRET=8f3d9c6a1e5b47d8a2f4e9c3b6d7a1f2 +JWT_REFRESH_SECRET=b5e1c7d9f3a2e4d8f6c9a1b7d2e3f4c8 \ No newline at end of file diff --git a/Backend/src/services/implementation/auth.service.ts b/Backend/src/services/implementation/auth.service.ts index a5007ba..9cba13a 100644 --- a/Backend/src/services/implementation/auth.service.ts +++ b/Backend/src/services/implementation/auth.service.ts @@ -56,7 +56,7 @@ export class AuthService implements IAuthService { throw new Error("Incorrect password"); } - const payload = { id: user._id, email: user.email }; + const payload = { id: user._id, role: user.role, email: user.email }; const accessToken = generateAccessToken(payload); const refreshToken = generateRefreshToken(payload); diff --git a/Backend/src/utils/jwt.ts b/Backend/src/utils/jwt.ts index d69c1f3..e8e32a8 100644 --- a/Backend/src/utils/jwt.ts +++ b/Backend/src/utils/jwt.ts @@ -1,8 +1,9 @@ import jwt from "jsonwebtoken" +import { env } from "../configs/env.config" -const ACCESS_KEY = process.env.JWT_ACCESS_SECRET -const REFRESH_KEY = process.env.JWT_REFRESH_SECRET +const ACCESS_KEY = env.JWT_ACCESS_SECRET as string +const REFRESH_KEY = env.JWT_REFRESH_SECRET as string const ACCESS_TOKEN_EXPIRY = '1h' const REFRESH_TOKEN_EXPIRY = '7d' @@ -22,7 +23,7 @@ export function generateRefreshToken (payload:Object,expiresIn:string = REFRES export function verifyAccessToken (token:string):object|null{ try { - return jwt.verify(token,ACCESS_TOKEN_EXPIRY) + return jwt.verify(token,ACCESS_KEY) as object } catch (error:unknown) { return null } @@ -30,7 +31,7 @@ export function verifyAccessToken (token:string):object|null{ export function verifyRefreshToken (token:string):object|null{ try { - return jwt.verify(token,REFRESH_KEY) + return jwt.verify(token,REFRESH_KEY) as object } catch (error:unknown) { return null } From 5c4aa6b6e513be8754863357be785bb3cd1488e2 Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 13:38:52 +0530 Subject: [PATCH 19/23] style: changed the file names of the utils --- Backend/src/utils/{generateOtp.ts => generate-otp.util.ts} | 0 Backend/src/utils/{hashPassword.ts => hash-password.util.ts} | 0 Backend/src/utils/{jwt.ts => jwt.util.ts} | 0 Backend/src/utils/{sendEmail.ts => send-email.util.ts} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename Backend/src/utils/{generateOtp.ts => generate-otp.util.ts} (100%) rename Backend/src/utils/{hashPassword.ts => hash-password.util.ts} (100%) rename Backend/src/utils/{jwt.ts => jwt.util.ts} (100%) rename Backend/src/utils/{sendEmail.ts => send-email.util.ts} (100%) diff --git a/Backend/src/utils/generateOtp.ts b/Backend/src/utils/generate-otp.util.ts similarity index 100% rename from Backend/src/utils/generateOtp.ts rename to Backend/src/utils/generate-otp.util.ts diff --git a/Backend/src/utils/hashPassword.ts b/Backend/src/utils/hash-password.util.ts similarity index 100% rename from Backend/src/utils/hashPassword.ts rename to Backend/src/utils/hash-password.util.ts diff --git a/Backend/src/utils/jwt.ts b/Backend/src/utils/jwt.util.ts similarity index 100% rename from Backend/src/utils/jwt.ts rename to Backend/src/utils/jwt.util.ts diff --git a/Backend/src/utils/sendEmail.ts b/Backend/src/utils/send-email.util.ts similarity index 100% rename from Backend/src/utils/sendEmail.ts rename to Backend/src/utils/send-email.util.ts From a98f6168516bcab84718027e90f6645170e26ffa Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 14:02:08 +0530 Subject: [PATCH 20/23] fix: jwt sign function type error fixed --- Backend/.env | 3 ++ Backend/package-lock.json | 13 +++++ Backend/package.json | 1 + Backend/src/index.ts | 11 ++++ .../services/implementation/auth.service.ts | 8 +-- Backend/src/utils/jwt.util.ts | 52 ++++++++----------- Backend/src/utils/validate-env.util.ts | 19 +++++++ 7 files changed, 74 insertions(+), 33 deletions(-) create mode 100644 Backend/src/utils/validate-env.util.ts diff --git a/Backend/.env b/Backend/.env index 8fed611..37b7236 100644 --- a/Backend/.env +++ b/Backend/.env @@ -1,2 +1,5 @@ +PORT=3000 +MONGO_URI=mongodb://localhost:27017/Inker +REDIS_URI=redis://127.0.0.1:6379 JWT_ACCESS_SECRET=8f3d9c6a1e5b47d8a2f4e9c3b6d7a1f2 JWT_REFRESH_SECRET=b5e1c7d9f3a2e4d8f6c9a1b7d2e3f4c8 \ No newline at end of file diff --git a/Backend/package-lock.json b/Backend/package-lock.json index ec7ef3a..e8b87d3 100644 --- a/Backend/package-lock.json +++ b/Backend/package-lock.json @@ -12,6 +12,7 @@ "bcrypt": "^5.1.1", "cookie-parser": "^1.4.7", "cors": "^2.8.5", + "dotenv": "^16.4.7", "express": "^4.21.2", "jsonwebtoken": "^9.0.2", "mongoose": "^8.10.0", @@ -832,6 +833,18 @@ "node": ">=0.3.1" } }, + "node_modules/dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", diff --git a/Backend/package.json b/Backend/package.json index a613c8d..3f6f02d 100644 --- a/Backend/package.json +++ b/Backend/package.json @@ -16,6 +16,7 @@ "bcrypt": "^5.1.1", "cookie-parser": "^1.4.7", "cors": "^2.8.5", + "dotenv": "^16.4.7", "express": "^4.21.2", "jsonwebtoken": "^9.0.2", "mongoose": "^8.10.0", diff --git a/Backend/src/index.ts b/Backend/src/index.ts index 588cdfa..e294d4c 100644 --- a/Backend/src/index.ts +++ b/Backend/src/index.ts @@ -1,9 +1,20 @@ +//* libraries and packages import express from "express" import cors from "cors" +import dotenv from 'dotenv' import { Request, Response } from "express" + +import { validateEnv } from "./utils/validate-env.util" +dotenv.config() +validateEnv() + +//* configs import { connectDb } from "./configs/mongo.config" import { connectRedis } from "./configs/redis.config" + +//* routers import authRouter from "./routers/auth.router" + const PORT = 3000 const app = express() app.use(cors()) diff --git a/Backend/src/services/implementation/auth.service.ts b/Backend/src/services/implementation/auth.service.ts index 9cba13a..853dabe 100644 --- a/Backend/src/services/implementation/auth.service.ts +++ b/Backend/src/services/implementation/auth.service.ts @@ -1,12 +1,12 @@ import { IUser } from "../../models/interface/IUser"; import { IUserRepository } from "../../repositories/interface/IUserRepository"; import { IAuthService } from "../interface/IAuthService"; -import { hashPassword } from "../../utils/hashPassword"; -import generateOtp from "../../utils/generateOtp"; -import { sendOtpEmail } from "../../utils/sendEmail"; +import { hashPassword } from "../../utils/hash-password.util"; +import generateOtp from "../../utils/generate-otp.util"; +import { sendOtpEmail } from "../../utils/send-email.util"; import { redisClient } from "../../configs/redis.config"; import bcrypt from 'bcrypt'; -import { generateAccessToken, generateRefreshToken } from '../../utils/jwt'; +import { generateAccessToken, generateRefreshToken } from '../../utils/jwt.util'; //! Implementation for Auth Service diff --git a/Backend/src/utils/jwt.util.ts b/Backend/src/utils/jwt.util.ts index e8e32a8..066f334 100644 --- a/Backend/src/utils/jwt.util.ts +++ b/Backend/src/utils/jwt.util.ts @@ -1,38 +1,32 @@ -import jwt from "jsonwebtoken" -import { env } from "../configs/env.config" +import jwt from "jsonwebtoken"; +import { env } from "../configs/env.config"; +const ACCESS_KEY = env.JWT_ACCESS_SECRET as string; +const REFRESH_KEY = env.JWT_REFRESH_SECRET as string; -const ACCESS_KEY = env.JWT_ACCESS_SECRET as string -const REFRESH_KEY = env.JWT_REFRESH_SECRET as string +const ACCESS_TOKEN_EXPIRY = "1h"; +const REFRESH_TOKEN_EXPIRY = "7d"; -const ACCESS_TOKEN_EXPIRY = '1h' -const REFRESH_TOKEN_EXPIRY = '7d' -export function generateAccessToken (payload:Object,expiresIn:string = ACCESS_TOKEN_EXPIRY):string{ - - return jwt.sign(payload,ACCESS_KEY,{expiresIn}) - +export function generateAccessToken(payload: Object): string { + return jwt.sign(payload, ACCESS_KEY, { expiresIn: ACCESS_TOKEN_EXPIRY }); } -export function generateRefreshToken (payload:Object,expiresIn:string = REFRESH_TOKEN_EXPIRY):string{ - - return jwt.sign(payload,REFRESH_KEY,{expiresIn}) - +export function generateRefreshToken(payload: Object): string { + return jwt.sign(payload, REFRESH_KEY, { expiresIn: REFRESH_TOKEN_EXPIRY }); } - - -export function verifyAccessToken (token:string):object|null{ - try { - return jwt.verify(token,ACCESS_KEY) as object - } catch (error:unknown) { - return null - } +export function verifyAccessToken(token: string) { + try { + return jwt.verify(token, ACCESS_KEY); + } catch (error: unknown) { + return null; + } } -export function verifyRefreshToken (token:string):object|null{ - try { - return jwt.verify(token,REFRESH_KEY) as object - } catch (error:unknown) { - return null - } -} \ No newline at end of file +export function verifyRefreshToken(token: string) { + try { + return jwt.verify(token, REFRESH_KEY); + } catch (error: unknown) { + return null; + } +} diff --git a/Backend/src/utils/validate-env.util.ts b/Backend/src/utils/validate-env.util.ts new file mode 100644 index 0000000..c32266e --- /dev/null +++ b/Backend/src/utils/validate-env.util.ts @@ -0,0 +1,19 @@ +import { env } from "../configs/env.config"; + +export function validateEnv() { + if(!env.PORT) { + throw new Error("PORT is not found in the env") + } + if(!env.MONGO_URI) { + throw new Error("MONGO_URI is not found in the env") + } + if(!env.REDIS_URI) { + throw new Error("REDIS_URI is not found in the env") + } + if(!env.JWT_ACCESS_SECRET) { + throw new Error("JWT_ACCESS_SECRET is not found in the env") + } + if(!env.JWT_REFRESH_SECRET) { + throw new Error("JWT_REFRESH_SECRET is not found in the env") + } +} \ No newline at end of file From db74705d8c3de6e6422797e57a0e83038dc269be Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 14:09:35 +0530 Subject: [PATCH 21/23] refactor: changed the mongo and redis uri to env --- Backend/src/configs/mongo.config.ts | 5 ++++- Backend/src/configs/redis.config.ts | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Backend/src/configs/mongo.config.ts b/Backend/src/configs/mongo.config.ts index 33de598..e370988 100644 --- a/Backend/src/configs/mongo.config.ts +++ b/Backend/src/configs/mongo.config.ts @@ -1,8 +1,11 @@ import mongoose from 'mongoose' +import { env } from './env.config' + +const MONGO_URI = env.MONGO_URI as string export async function connectDb(){ try { - await mongoose.connect('mongodb://admin:password@mongo:27017/inker?authSource=admin') + await mongoose.connect(MONGO_URI) console.log('Connected to mongodb πŸš€') } catch (error) { console.log('Mongo Error, ',error) diff --git a/Backend/src/configs/redis.config.ts b/Backend/src/configs/redis.config.ts index e83cf4e..f1e7681 100644 --- a/Backend/src/configs/redis.config.ts +++ b/Backend/src/configs/redis.config.ts @@ -1,13 +1,11 @@ import { createClient, RedisClientType } from "redis" +import { env } from "./env.config" let redisClient: RedisClientType function connectRedis(){ redisClient = createClient({ - socket: { - host: 'redis', - port: 6379 - } + url: env.REDIS_URI }) redisClient.on('connect', () => { From 2e2695661bf82e9dc96ebc096597fd878c84571f Mon Sep 17 00:00:00 2001 From: shreedev44 Date: Tue, 18 Feb 2025 15:39:33 +0530 Subject: [PATCH 22/23] fix: ignored env file from repo --- .gitignore | 2 +- Backend/.env | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 Backend/.env diff --git a/.gitignore b/.gitignore index 60b66b7..0bd853a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ dist-ssr *.njsproj *.sln *.sw? - +*.env node_modules/ dist/ diff --git a/Backend/.env b/Backend/.env deleted file mode 100644 index 37b7236..0000000 --- a/Backend/.env +++ /dev/null @@ -1,5 +0,0 @@ -PORT=3000 -MONGO_URI=mongodb://localhost:27017/Inker -REDIS_URI=redis://127.0.0.1:6379 -JWT_ACCESS_SECRET=8f3d9c6a1e5b47d8a2f4e9c3b6d7a1f2 -JWT_REFRESH_SECRET=b5e1c7d9f3a2e4d8f6c9a1b7d2e3f4c8 \ No newline at end of file From d450054ff4f2e7e2ffaa0448df8d6a4d31fc96a0 Mon Sep 17 00:00:00 2001 From: Ahsan allaj pk Date: Tue, 18 Feb 2025 18:54:34 +0530 Subject: [PATCH 23/23] feat: added vercel.json for routing --- Frontend/src/vercel.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Frontend/src/vercel.json diff --git a/Frontend/src/vercel.json b/Frontend/src/vercel.json new file mode 100644 index 0000000..341d033 --- /dev/null +++ b/Frontend/src/vercel.json @@ -0,0 +1,5 @@ +{ + "rewrites": [ + { "source": "/(.*)", "destination": "/" } + ] +} \ No newline at end of file