{error}
} +Email was changed successfully
+ `; + + return send({ + email, html, + subject: 'Notification' + }) +} +export const emailService = { + sendActivationEmail, + sendConfirmationEmail, + sendNotificationEmail, + send, +} diff --git a/backend/src/services/jwt.service.js b/backend/src/services/jwt.service.js new file mode 100644 index 00000000..2d3e4eb8 --- /dev/null +++ b/backend/src/services/jwt.service.js @@ -0,0 +1,40 @@ +import jwt from "jsonwebtoken"; + +function sign(user) { + const token = jwt.sign(user, process.env.JWT_KEY, { + expiresIn: '15h', + }); + + return token; +} + +function verify(token) { + try { + return jwt.verify(token, process.env.JWT_KEY); + } catch (error) { + return null; + } +} + +function signRefresh(user) { + const token = jwt.sign(user, process.env.JWT_REFRESH_KEY, { + expiresIn: '2d', + }); + + return token; +} + +function verifyRefresh(token) { + try { + return jwt.verify(token, process.env.JWT_REFRESH_KEY); + } catch (error) { + return null; + } +} + +export const jwtService = { + sign, + verify, + signRefresh, + verifyRefresh +} diff --git a/backend/src/services/passwordReset.service.js b/backend/src/services/passwordReset.service.js new file mode 100644 index 00000000..a005a0c0 --- /dev/null +++ b/backend/src/services/passwordReset.service.js @@ -0,0 +1,81 @@ +import crypto from "crypto"; +import { Op } from "sequelize"; +import { ResetToken } from "../models/resetToken.js"; +import { User } from "../models/user.js"; +import { emailService } from "./email.service.js"; +import { ApiError } from "../exceptions/api.error.js"; +import bcrypt from "bcrypt"; + +const TOKEN_TTL = 60 * 60 * 1000; + +function generateToken() { + return crypto.randomBytes(32).toString('hex'); +} + +function hashToken(token) { + return crypto + .createHash('sha256') + .update(token) + .digest('hex'); +} + +async function sendResetEmail(email) { + const user = await User.findOne({ where: { email } }); + + if (!user) { + return; + } + + const plainToken = generateToken(); + const tokenHash = hashToken(plainToken); + + await ResetToken.create({ + userId: user.id, + resetToken: tokenHash, + expiresAt: new Date(Date.now() + TOKEN_TTL), + used: false, + }); + + await emailService.sendConfirmationEmail(user.email, plainToken); +} + + +async function validateResetToken(token) { + const tokenHash = hashToken(token); + + const resetToken = await ResetToken.findOne({ + where: { + resetToken: tokenHash, + used: false, + expiresAt: { + [Op.gt]: new Date(), + }, + }, + include: User, + }); + + if (!resetToken) { + throw ApiError.badRequest('Token is invalid or expired'); + } + + return resetToken; +} + +async function resetPassword(token, newPassword) { + const resetToken = await validateResetToken(token); + + const hashedPassword = await bcrypt.hash(newPassword, 10); + + await resetToken.user.update({ + password: hashedPassword, + }); + + resetToken.used = true; + await resetToken.save(); +} + + +export const passwordResetServices = { + sendResetEmail, + resetPassword +} diff --git a/backend/src/services/token.service.js b/backend/src/services/token.service.js new file mode 100644 index 00000000..90a6d4d8 --- /dev/null +++ b/backend/src/services/token.service.js @@ -0,0 +1,30 @@ +import { Token } from "../models/token.js"; + +async function save(userId, newToken) { + const token = await Token.findOne({ where: { userId } }); + + if (!token) { + await Token.create({ userId, refreshToken: newToken }); + + return; + } + + token.refreshToken = newToken; + await token.save(); +} + + +function getByToken(refreshToken) { + return Token.findOne({ where: { refreshToken } }) +} + +function remove(userId) { + return Token.destroy({ where: { userId } }) +} + + +export const tokenServices = { + save, + getByToken, + remove +} diff --git a/backend/src/services/user.service.js b/backend/src/services/user.service.js new file mode 100644 index 00000000..d2a393ff --- /dev/null +++ b/backend/src/services/user.service.js @@ -0,0 +1,113 @@ +import { ApiError } from "../exceptions/api.error.js"; +import { User } from "../models/user.js"; +import { v4 as uuidv4 } from "uuid"; +import { emailService } from "./email.service.js"; +import bcrypt from 'bcrypt'; +import { Op } from "sequelize"; + +function getAllActivated() { + return User.findAll({ + where: { + activationToken: null, + } + }) +} + +function normalize({ id, name, email }) { + return { id, name, email }; +} + +function findByEmail(email) { + return User.findOne({ where: { email } }) +} + +async function register(name, email, password) { + const activationToken = uuidv4(); + + const existUser = await findByEmail(email); + + if (existUser) { + throw ApiError.badRequest('User already exists', { + email: 'User already exists' + }); + + } + + await User.create({ name, email, password, activationToken }); + + await emailService.sendActivationEmail(email, activationToken); +} + +async function updateName(userId, name) { + if (!name) { + throw ApiError.badRequest(); + } + + const user = await User.findByPk(userId); + if (!user) { + throw ApiError.notFound('No such user'); + } + + user.name = name; + await user.save(); + return user; +} + +async function changePassword(userId, oldPassword, newPassword) { + const user = await User.findByPk(userId); + + if (!user) { + throw ApiError.notFound(); + } + + const match = await bcrypt.compare(oldPassword, user.password); + if (!match) { + throw ApiError.badRequest('Old password is incorrect') + } + + const hashedPassword = await bcrypt.hash(newPassword, 10); + + user.password = hashedPassword; + await user.save(); + + const { name, email } = user; + return { name, email }; +} + +async function changeEmail(userId, newEmail, password) { + const user = await User.findByPk(userId); + + if (!user) { + throw ApiError.notFound(); + } + + const match = await bcrypt.compare(password, user.password); + + if (!match) { + throw ApiError.badRequest('Incorrect password'); + } + + const repeteadEmail = await User.findOne({ where: { email: newEmail, id: { [Op.ne]: userId } } }); + + if (repeteadEmail) { + throw ApiError.badRequest('Validation error', { + email: 'This email is already in use.' + }); + } + + const oldEmail = user.email; + + user.email = newEmail; + await user.save(); + await emailService.sendNotificationEmail(oldEmail); +} + +export const userServices = { + getAllActivated, + normalize, + findByEmail, + register, + updateName, + changePassword, + changeEmail +} diff --git a/backend/src/utils/catchError.js b/backend/src/utils/catchError.js new file mode 100644 index 00000000..bbf87da1 --- /dev/null +++ b/backend/src/utils/catchError.js @@ -0,0 +1,9 @@ +export const catchError = (action) => { + return async function (req, res, next) { + try { + await action(req, res, next) + } catch (error) { + next(error) + } + } +} diff --git a/backend/src/utils/db.js b/backend/src/utils/db.js new file mode 100644 index 00000000..c43be572 --- /dev/null +++ b/backend/src/utils/db.js @@ -0,0 +1,20 @@ +'use strict'; + +import { Sequelize } from "sequelize" + +const { + DB_DATABASE, + DB_USER, + DB_HOST, + DB_PORT, + DB_PASSWORD, +} = process.env; + +export const client = new Sequelize({ + database: DB_DATABASE || 'postgres', + username: DB_USER || 'postgres', + host: DB_HOST || 'localhost', + dialect: 'postgres', + port: DB_PORT || 5432, + password: DB_PASSWORD, +}) diff --git a/frontend_app/.env b/frontend_app/.env new file mode 100644 index 00000000..feca1da9 --- /dev/null +++ b/frontend_app/.env @@ -0,0 +1 @@ +VITE_API_URL=http://localhost:3005 \ No newline at end of file diff --git a/frontend_app/.gitignore b/frontend_app/.gitignore new file mode 100644 index 00000000..1cac5597 --- /dev/null +++ b/frontend_app/.gitignore @@ -0,0 +1,25 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? +.env \ No newline at end of file diff --git a/frontend_app/README.md b/frontend_app/README.md new file mode 100644 index 00000000..4dcad1f9 --- /dev/null +++ b/frontend_app/README.md @@ -0,0 +1,73 @@ +# React + TypeScript + Vite + +This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules. + +Currently, two official plugins are available: + +- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh +- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh + +## React Compiler + +The React Compiler is currently not compatible with SWC. See [this issue](https://github.com/vitejs/vite-plugin-react/issues/428) for tracking the progress. + +## Expanding the ESLint configuration + +If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules: + +```js +export default defineConfig([ + globalIgnores(['dist']), + { + files: ['**/*.{ts,tsx}'], + extends: [ + // Other configs... + + // Remove tseslint.configs.recommended and replace with this + tseslint.configs.recommendedTypeChecked, + // Alternatively, use this for stricter rules + tseslint.configs.strictTypeChecked, + // Optionally, add this for stylistic rules + tseslint.configs.stylisticTypeChecked, + + // Other configs... + ], + languageOptions: { + parserOptions: { + project: ['./tsconfig.node.json', './tsconfig.app.json'], + tsconfigRootDir: import.meta.dirname, + }, + // other options... + }, + }, +]) +``` + +You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules: + +```js +// eslint.config.js +import reactX from 'eslint-plugin-react-x' +import reactDom from 'eslint-plugin-react-dom' + +export default defineConfig([ + globalIgnores(['dist']), + { + files: ['**/*.{ts,tsx}'], + extends: [ + // Other configs... + // Enable lint rules for React + reactX.configs['recommended-typescript'], + // Enable lint rules for React DOM + reactDom.configs.recommended, + ], + languageOptions: { + parserOptions: { + project: ['./tsconfig.node.json', './tsconfig.app.json'], + tsconfigRootDir: import.meta.dirname, + }, + // other options... + }, + }, +]) +``` diff --git a/frontend_app/eslint.config.js b/frontend_app/eslint.config.js new file mode 100644 index 00000000..5e6b472f --- /dev/null +++ b/frontend_app/eslint.config.js @@ -0,0 +1,23 @@ +import js from '@eslint/js' +import globals from 'globals' +import reactHooks from 'eslint-plugin-react-hooks' +import reactRefresh from 'eslint-plugin-react-refresh' +import tseslint from 'typescript-eslint' +import { defineConfig, globalIgnores } from 'eslint/config' + +export default defineConfig([ + globalIgnores(['dist']), + { + files: ['**/*.{ts,tsx}'], + extends: [ + js.configs.recommended, + tseslint.configs.recommended, + reactHooks.configs.flat.recommended, + reactRefresh.configs.vite, + ], + languageOptions: { + ecmaVersion: 2020, + globals: globals.browser, + }, + }, +]) diff --git a/frontend_app/index.html b/frontend_app/index.html new file mode 100644 index 00000000..a4786c7c --- /dev/null +++ b/frontend_app/index.html @@ -0,0 +1,12 @@ + + + + + +{error}
} +{error}
+ ) : ( ++ Your account is now active +
+ )} + + ); +}; diff --git a/frontend_app/src/pages/HomePage.tsx b/frontend_app/src/pages/HomePage.tsx new file mode 100644 index 00000000..81eb77f8 --- /dev/null +++ b/frontend_app/src/pages/HomePage.tsx @@ -0,0 +1 @@ +export const HomePage = () =>{error}
} + + ); +}; diff --git a/frontend_app/src/pages/NotFoundPage.tsx b/frontend_app/src/pages/NotFoundPage.tsx new file mode 100644 index 00000000..87fe719a --- /dev/null +++ b/frontend_app/src/pages/NotFoundPage.tsx @@ -0,0 +1,3 @@ +export const NotFoundPage = () => { + return+ Invalid or expired reset link +
+ ); + } + + return ( + <> +{error}
} + + ); +}; diff --git a/frontend_app/src/pages/PasswordResetRequestPage.tsx b/frontend_app/src/pages/PasswordResetRequestPage.tsx new file mode 100644 index 00000000..2ef8b9c5 --- /dev/null +++ b/frontend_app/src/pages/PasswordResetRequestPage.tsx @@ -0,0 +1,96 @@ +import { Navigate, useNavigate } from "react-router-dom"; +import { Formik, Form, Field } from "formik"; +import cn from "classnames"; + +import { usePageError } from "../hooks/usePageError"; +import { authService } from "../services/authService"; +import { useAuth } from "../components/AuthContext"; +import { AxiosError } from "axios"; + +const EMAIL_PATTERN = /^[\w.+-]+@([\w-]+\.){1,3}[\w-]{2,}$/; + +function validateEmail(value: string) { + if (!value) return "Email is required"; + if (!EMAIL_PATTERN.test(value)) return "Email is not valid"; +} + +export const PasswordResetRequestPage = () => { + const navigate = useNavigate(); + + const [error, setError] = usePageError(""); + const { isChecked, currentUser } = useAuth(); + + if (isChecked && currentUser) { + return{error}
} + + ); +}; diff --git a/frontend_app/src/pages/PasswordResetSentPage.tsx b/frontend_app/src/pages/PasswordResetSentPage.tsx new file mode 100644 index 00000000..63a6e5a6 --- /dev/null +++ b/frontend_app/src/pages/PasswordResetSentPage.tsx @@ -0,0 +1,25 @@ +import { Navigate } from "react-router-dom"; +import { useAuth } from "../components/AuthContext"; + +export const PasswordResetSentPage = () => { + const { isChecked, currentUser } = useAuth(); + + // already logged in users should not be here + if (isChecked && currentUser) { + return+ We have sent you an email with a password reset link. +
+ ++ If you don’t see the email, check your spam folder. +
+{error}
} +We have sent you an email with the activation link
+{error}
} + + ); +}; diff --git a/frontend_app/src/pages/UsersPage.tsx b/frontend_app/src/pages/UsersPage.tsx new file mode 100644 index 00000000..dddd3de4 --- /dev/null +++ b/frontend_app/src/pages/UsersPage.tsx @@ -0,0 +1,50 @@ +import { useEffect, useState } from "react"; +import { usePageError } from "../hooks/usePageError"; +import { userService } from "../services/userService"; +import type { User } from "../types/user"; +import { AxiosError } from "axios"; +import { useLocation, useNavigate } from "react-router-dom"; +import { useAuth } from "../components/AuthContext"; + +export const UsersPage = () => { + const { logout } = useAuth(); + const navigate = useNavigate(); + const location = useLocation(); + const [error, setError] = usePageError(""); + const [users, setUsers] = useState{error}
} +