Initial commit

main
Саске Учиха 2 years ago
commit 4b895006c8

@ -0,0 +1,13 @@
## О репозитории
Ararat International School - платформа по обучению игры в шахматы.
### Стэк:
- Tailwind css
- React.js
- Express.js
- Mobx (временно)
#### V 0.0
- Инициализация

@ -0,0 +1,27 @@
/* eslint-env node */
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:react-hooks/recommended',
],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
project: true,
tsconfigRootDir: __dirname,
},
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
'@typescript-eslint/no-non-null-assertion': 'off',
},
}

24
client/.gitignore vendored

@ -0,0 +1,24 @@
# 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?

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>AraratChess</title>
</head>
<body class="bg-gray-100">
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

File diff suppressed because it is too large Load Diff

@ -0,0 +1,35 @@
{
"name": "araratchess",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"dependencies": {
"@types/axios": "^0.14.0",
"axios": "^1.4.0",
"mobx": "^6.9.1",
"mobx-react-lite": "^4.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@vitejs/plugin-react": "^4.0.1",
"autoprefixer": "^10.4.14",
"eslint": "^8.44.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.1",
"postcss": "^8.4.26",
"tailwindcss": "^3.3.3",
"typescript": "^5.0.2",
"vite": "^4.4.0"
}
}

@ -0,0 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -0,0 +1,9 @@
import RegisterForm from './components/RegisterForm'
function App() {
return (
<RegisterForm/>
)
}
export default App

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

@ -0,0 +1,32 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
import {FC, useState, useContext} from 'react'
import { Context } from '../main';
import Logo from '../assets/logo.png'
const LoginForm: FC = () => {
const [email, setEmail] = useState<string>('');
const [password, setPassword] = useState<string>('');
const {store} = useContext(Context);
return (
<section className="flex items-center h-screen">
<div className='bg-white container mx-auto flex flex-col p-10 max-w-2xl'>
<img className='w-52 self-center mb-5' src={ Logo } alt="logo" />
<h1 className='text-2xl font-semibold tracking-wider text-gray-800 capitalize '>Login to your account</h1>
<p className='mt-4 text-gray-500 mb-5'>Let's get you all set up so you can verify your personal account and begin setting up your profile.</p>
<div className="flex flex-col mb-5">
<label className="block text-sm text-gray-600 " htmlFor="email">Email:</label>
<input id='email' className='block w-full px-5 py-3 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md focus:border-[#fbceb1] focus:ring-[#fbceb1] focus:outline-none focus:ring focus:ring-opacity-40' onChange={e => setEmail(e.target.value)} value={email} type='email' placeholder='Email'/>
</div>
<div className="flex flex-col mb-5">
<label className="block text-sm text-gray-600 " htmlFor="password">Password:</label>
<input id='password' className='block w-full px-5 py-3 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md focus:border-[#fbceb1] focus:ring-[#fbceb1] focus:outline-none focus:ring focus:ring-opacity-40' onChange={e => setPassword(e.target.value)} value={password} type='password' placeholder='Password'/>
</div>
<button className='flex items-center justify-center mt-2 w-full px-6 py-3 text-sm tracking-wide text-white hover:text-[#fbceb1] capitalize transition-colors duration-300 transform bg-gray-800 rounded-md focus:outline-none focus:ring focus:ring-gray-300 focus:ring-opacity-50' onClick={() => store.login(email, password)}>Login</button>
</div>
</section>
)
}
export default LoginForm;

@ -0,0 +1,42 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
import {FC, useState, useContext} from 'react'
import { Context } from '../main';
import Logo from '../assets/logo.png'
const RegisterForm: FC = () => {
const [email, setEmail] = useState<string>('');
const [name, setName] = useState<string>('');
const [sname, setSname] = useState<string>('');
const [password, setPassword] = useState<string>('');
const {store} = useContext(Context);
return (
<section className="flex items-center h-screen">
<div className='bg-white container mx-auto flex flex-col p-10 max-w-2xl'>
<img className='w-52 self-center mb-5' src={ Logo } alt="logo" />
<h1 className='text-2xl font-semibold tracking-wider text-gray-800 capitalize '>Register To Get Started</h1>
<p className='mt-4 text-gray-500 mb-5'>Let's get you all set up so you can verify your personal account and begin setting up your profile.</p>
<div className="flex flex-col mb-5">
<label className="block text-sm text-gray-600 " htmlFor="email">Email:</label>
<input id='email' className='block w-full px-5 py-3 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md focus:border-[#fbceb1] focus:ring-[#fbceb1] focus:outline-none focus:ring focus:ring-opacity-40' onChange={e => setEmail(e.target.value)} value={email} type='email' placeholder='Email'/>
</div>
<div className="flex flex-col mb-5">
<label className="block text-sm text-gray-600 " htmlFor="name">First Name:</label>
<input id='name' className='block w-full px-5 py-3 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md focus:border-[#fbceb1] focus:ring-[#fbceb1] focus:outline-none focus:ring focus:ring-opacity-40' onChange={e => setName(e.target.value)} value={name} type='text' placeholder='First Name'/>
</div>
<div className="flex flex-col mb-5">
<label className="block text-sm text-gray-600 " htmlFor="sname">Last Name:</label>
<input id='sname' className='block w-full px-5 py-3 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md focus:border-[#fbceb1] focus:ring-[#fbceb1] focus:outline-none focus:ring focus:ring-opacity-40' onChange={e => setSname(e.target.value)} value={sname} type='text' placeholder='Last Name'/>
</div>
<div className="flex flex-col mb-5">
<label className="block text-sm text-gray-600 " htmlFor="password">Password:</label>
<input id='password' className='block w-full px-5 py-3 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md focus:border-[#fbceb1] focus:ring-[#fbceb1] focus:outline-none focus:ring focus:ring-opacity-40' onChange={e => setPassword(e.target.value)} value={password} type='password' placeholder='Password'/>
</div>
<button className='flex items-center justify-center mt-2 w-full px-6 py-3 text-sm tracking-wide text-white hover:text-[#fbceb1] capitalize transition-colors duration-300 transform bg-gray-800 rounded-md focus:outline-none focus:ring focus:ring-gray-300 focus:ring-opacity-50' onClick={() => store.registration(email, name, sname, password)}>Register</button>
</div>
</section>
)
}
export default RegisterForm;

@ -0,0 +1,15 @@
import axios from "axios";
export const API_URL = `https://chess.beknazaryanstudio.ru:8080/api`
const $api = axios.create({
withCredentials: true,
baseURL: API_URL
})
$api.interceptors.request.use(config => {
config.headers.Authorization = `Bearer ${localStorage.getItem('token')}`; // eslint-disable-line @typescript-eslint/restrict-template-expressions
return config;
})
export default $api;

@ -0,0 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@ -0,0 +1,21 @@
import React, { createContext } from 'react'
import ReactDOM from 'react-dom/client'
import App from './App.tsx'
import './index.css'
import Store from './store/store.ts'
interface State {
store: Store
}
const store = new Store();
export const Context = createContext<State>({store});
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<Context.Provider value={{store}}>
<App />
</Context.Provider>
</React.StrictMode>,
)

@ -0,0 +1,5 @@
export interface User {
_id: string;
email: string;
role: string;
}

@ -0,0 +1,7 @@
import { User } from "../User";
export interface AuthResponse {
accessToken: string;
refreshToken: string;
user: User;
}

@ -0,0 +1,17 @@
import $api from "../http";
import { AxiosResponse } from 'axios';
import { AuthResponse } from "../models/response/AuthResponse";
export default class AuthService {
static async registration(email: string, name: string, sname: string, password: string): Promise<AxiosResponse<AuthResponse>> {
return $api.post<AuthResponse>('/auth/registration', {email, name, sname, password})
}
static async login(email: string, password: string): Promise<AxiosResponse<AuthResponse>> {
return $api.post<AuthResponse>('/auth/login', {email, password})
}
static async logout(): Promise<void> {
return $api.post('/auth/logout')
}
}

@ -0,0 +1,55 @@
import { User } from "../models/User"
import { makeAutoObservable } from "mobx";
import AuthService from "../services/AuthService";
export default class Store {
user = {} as User;
isAuth = false;
constructor() {
makeAutoObservable(this);
}
setAuth(bool: boolean) {
this.isAuth = bool;
}
setUser(user: User) {
this.user = user;
}
async registration (email: string, name: string, sname: string, password: string) {
try {
const response = await AuthService.registration(email, name, sname, password);
console.log(response);
localStorage.setItem('token', response.data.accessToken);
this.setAuth(true);
this.setUser(response.data.user)
} catch (e) {
console.log(e)
}
}
async login (email: string, password: string) {
try {
const response = await AuthService.login(email, password);
console.log(response);
localStorage.setItem('token', response.data.accessToken);
this.setAuth(true);
this.setUser(response.data.user)
} catch (e) {
console.log(e)
}
}
async logout () {
try {
await AuthService.logout();
localStorage.removeItem('token');
this.setAuth(false);
this.setUser({} as User);
} catch (e) {
console.log(e)
}
}
}

@ -0,0 +1 @@
/// <reference types="vite/client" />

@ -0,0 +1,12 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [
"./index.html",
"./src/**/*.{js,ts,jsx,tsx}",
],
theme: {
extend: {},
},
plugins: [],
}

@ -0,0 +1,25 @@
{
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
},
"include": ["src"],
"references": [{ "path": "./tsconfig.node.json" }]
}

@ -0,0 +1,10 @@
{
"compilerOptions": {
"composite": true,
"skipLibCheck": true,
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
}

@ -0,0 +1,10 @@
import { defineConfig } from 'vite'
import react from '@vitejs/plugin-react'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
server: {
port: 3000,
},
})

38
server/.gitignore vendored

@ -0,0 +1,38 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# testing
/coverage
# next.js
/.next/
/out/
# production
/build
# misc
.DS_Store
*.pem
# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*
# local env files
.env*.local
# vercel
.vercel
# typescript
*.tsbuildinfo
next-env.d.ts
/.fleet

@ -0,0 +1,6 @@
{
"serverPort": 8089,
"dbUrl": "db",
"JWTAccessSecret": "jwt-ararat-access-sercet-dygqwuygoduwqygdqwugyid",
"JWTRefreshSecret": "jwt-ararat-refresh-sercet-dqwyugfuftyiqwdutyfivd"
}

@ -0,0 +1,12 @@
import nodemailer from 'nodemailer';
const transporter = nodemailer.createTransport({
host: '127.0.0.1',
port: 1025,
auth: {
user: 'project.2',
pass: 'secret.2'
}
});
export default transporter;

@ -0,0 +1,68 @@
import AuthService from '../services/AuthService.js';
import {validationResult} from 'express-validator';
import ApiError from './ErrorController.js';
class AuthController {
async register(req, res, next) {
try {
const errors = validationResult(req);
if(!errors.isEmpty()) {
return next(ApiError.BadRequest('Ошибка при валидации', errors.array()));
}
const {email, name, sname, password} = req.body;
const user = await AuthService.register({email, name, sname, password});
res.cookie('refreshToken', user.refreshToken, {maxAge: 30 * 24 * 60 * 60 * 1000, httpOnly: true });
return res.json(user);
} catch (e) {
next(e);
}
}
async login(req, res, next) {
try {
const {email, password} = req.body;
const user = await AuthService.login({email, password});
res.cookie('refreshToken', user.refreshToken, {maxAge: 30 * 24 * 60 * 60 * 1000, httpOnly: true });
return res.json(user);
} catch (e) {
next(e);
}
}
async confirm(req, res, next) {
try {
const { id } = req.body;
const confirmation = await AuthService.confirm({ id });
return res.json(confirmation);
} catch (e) {
next(e);
}
}
async logout(req, res, next) {
try {
const { refreshToken } = req.cookies;
const token = await AuthService.logout(refreshToken);
res.clearCookie('refreshToken');
return res.json(token);
} catch (e) {
next(e);
}
}
async refresh(req, res, next) {
try {
const { refreshToken } = req.cookies;
const user = await AuthService.refresh(refreshToken);
res.cookie('refreshToken', user.refreshToken, {maxAge: 30 * 24 * 60 * 60 * 1000, httpOnly: true });
return res.json(user);
} catch (e) {
next(e);
}
}
async test(req, res, next) {
try {
res.json('test');
} catch (e) {
next(e);
}
}
}
export default new AuthController();

@ -0,0 +1,22 @@
export default class ApiError extends Error {
status;
errors;
constructor(status, message, errors = []) {
super(message);
this.status = status;
this.errors = errors;
}
static UnauthorizedError() {
return new ApiError(401, 'Пользователь не авторизован')
}
static ForbiddenError() {
return new ApiError(403, 'Нет доступа')
}
static BadRequest(message, errors = []) {
return new ApiError(400, message, errors)
}
}

@ -0,0 +1,11 @@
export default class UserDto {
_id;
email;
role
constructor(model) {
this._id = model._id;
this.email = model.email;
this.role = model.role;
}
}

@ -0,0 +1,36 @@
import express from "express";
import mongoose from "mongoose";
import config from "config";
import cors from "cors";
import errorMiddleware from "./middlewares/errorMiddleware.js";
import cookieParser from "cookie-parser";
//routers
import authRouter from "./routers/auth.router.js"
const PORT = config.get('serverPort');
const app = express();
app.use(express.json());
app.use(cookieParser())
app.use(cors({origin:['http://www.localhost:3000', 'http://localhost:3000', 'https://chess.beknazaryanstudio.ru', 'https://www.chess.beknazaryanstudio.ru'], credentials: true}));
app.use('/api/auth', authRouter);
app.use(errorMiddleware);
const start = async () => {
try {
await mongoose.connect(config.get('dbUrl', {
useNewUrlParser: true,
useUnifieldTopology: true
}));
app.listen(PORT, () => {
console.log(`Сервер успешно запущен на порту ${PORT}`);
})
} catch (e) {
console.log(e);
}
}
start();

@ -0,0 +1,60 @@
import transporter from "../config/nodemailer.js";
async function sendConfirm(id, email) {
try {
let message = await transporter.sendMail({
from: '"Confirmation " <admin@localhost>',
to: email,
subject: "Подтверждение регистрации | Confirmation",
html:
`
<head>
<style>
button {
transition-duration: 0.4s;
}
button:hover {
box-shadow: 0 0px 2px 0 rgba(0,0,0,0.24), 0 0px 11px 0 rgba(0,0,0,0.19);
}
</style>
</head>
<body>
<center>&nbsp;<br /><center>
<table style="height: 445px; width: 400px;">
<tbody>
<tr style="height: 31px;">
<td style="width: 16.0833px; height: 31px;">&nbsp;</td>
<td style="width: 350.033px; text-align: center; height: 31px;">
<hr style="border-top: 1px solid #ededed;" /></td>
<td style="width: 13.4833px; text-align: center; height: 31px;">&nbsp;</td>
</tr>
<tr style="height: 85.8333px;">
<td style="width: 16.0833px; height: 85.8333px;">&nbsp;</td>
<td style="width: 350.033px; height: 85.8333px;"><span style="color: #333333; font-size: 16px; font-family: Tahoma;">Подтвердите свою почту, чтобы завершить регистрацию.<br /></span>
<p><span style="color: #666666; font-size: 14px; font-family: Tahoma;">Этот адрес электронной почты был указан при регистрации. Если это были не Вы, проигнорируйте это письмо.<br /></span></p>
</td>
<td style="width: 13.4833px; height: 85.8333px;">&nbsp;</td>
</tr>
<tr style="height: 24px;">
<td style="width: 16.0833px; height: 24px;">&nbsp;</td>
<td style="width: 350.033px; height: 24px;"><hr style="border-top: 1px solid #ededed;" /><br /><center>
<a href="http://localhost:3000/confirm/${id}" target="_blank" rel="noopener">
<button style="background-color: #2368c7; color: white; border: 1px solid #3B82F6; padding: 8px; border-radius: 6px; cursor: pointer; font-size: 15px; font-family: Tahoma;">Подтвердить регистрацию</button>
</a>
</center><center></center><center><br /><br /><span style="color: #4d4f51; font-size: 11px; font-family: Tahoma;">Если Вы не видите кнопку, подтвердите свой аккаунт по ссылке: <a href="http://localhost:3000/confirm/${id}" target="_blank">http://localhost:3000/confirm/${id}</a><br></span></center></td>
<td style="width: 13.4833px; height: 24px;">&nbsp;</td>
</tr>
</tbody>
</table>
</body>
`,
});
return message;
} catch (e) {
console.log(e);
}
}
export default sendConfirm;

@ -0,0 +1,31 @@
import jwt from 'jsonwebtoken';
import ApiError from '../controllers/ErrorController.js';
import TokenService from '../services/TokenService.js';
import config from "config";
export default function (req, res, next) {
if(req.method === 'OPTIONS') {
next();
}
try {
const authHeader = req.headers.authorization;
if(!authHeader) {
return next(ApiError.UnauthorizedError());
}
const accessToken = authHeader.split(' ')[1];
if(!accessToken) {
return next(ApiError.UnauthorizedError());
}
const decodedData = TokenService.validateAccessToken(accessToken);
if(!decodedData) {
return next(ApiError.UnauthorizedError());
}
req.user = decodedData;
next();
} catch (e) {
return next(ApiError.UnauthorizedError());
}
}

@ -0,0 +1,9 @@
import ApiError from "../controllers/ErrorController.js";
export default function(err, req, res, next) {
if(err instanceof ApiError) {
return res.status(err.status).json({error: err.message, errors: err.errors});
}
console.log(err);
return res.status(500).json({error: 'Произошла неизвестная ошибка, попробуйте позже'});
}

@ -0,0 +1,34 @@
import jwt from 'jsonwebtoken';
import ApiError from '../controllers/ErrorController.js';
import config from "config";
export default function(roles) {
return function(req, res, next) {
if(req.method === 'OPTIONS') {
next();
}
try {
const authHeader = req.headers.authorization;
if(!authHeader) {
return next(ApiError.UnauthorizedError());
}
const accessToken = authHeader.split(' ')[1];
if(!accessToken) {
return next(ApiError.UnauthorizedError());
}
const decodedData = TokenService.validateAccessToken(accessToken);
if(!decodedData) {
return next(ApiError.UnauthorizedError());
}
if(!roles.includes(decodedData.role)) {
return next(ApiError.ForbiddenError());
}
next();
} catch (e) {
return next(ApiError.UnauthorizedError());
}
}
}

@ -0,0 +1,8 @@
import mongoose, { Schema, model, ObjectId } from "mongoose";
const Token = new Schema({
user: {type: ObjectId, ref: 'User'},
refreshToken: {type: String, required: true},
});
export default mongoose.model('Token', Token);

@ -0,0 +1,13 @@
import mongoose, { Schema, model, ObjectId } from "mongoose";
const User = new Schema({
email: {type: String, required: true, unique: true},
name: {type: String, required: true},
sname: {type: String, required: true},
verify: {type: Boolean, default: false},
password: {type: String, required: true},
avatar: {type: String},
role: {type: String, default: "USER"},
});
export default mongoose.model('User', User);

File diff suppressed because it is too large Load Diff

@ -0,0 +1,27 @@
{
"name": "server",
"version": "1.0.0",
"description": "",
"main": "index.js",
"type": "module",
"scripts": {
"dev": "nodemon index.js"
},
"author": "",
"license": "ISC",
"dependencies": {
"bcrypt": "^5.1.0",
"config": "^3.3.8",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"express": "^4.18.2",
"express-validator": "^6.14.2",
"jsonwebtoken": "^9.0.1",
"mongodb": "^5.7.0",
"mongoose": "^6.6.5",
"nodemailer": "^6.8.0"
},
"devDependencies": {
"nodemon": "^3.0.1"
}
}

@ -0,0 +1,25 @@
import { Router } from "express";
import AuthController from '../controllers/AuthController.js';
import {check} from 'express-validator';
import authMiddleware from "../middlewares/authMiddleware.js";
import roleMiddleware from "../middlewares/roleMiddleware.js";
const router = new Router();
router.post('/registration',
[
check('email', "Неверный email").isEmail(),
check('name', "Не указано имя").notEmpty(),
check('sname', "Не указана фамилия").notEmpty(),
check('password', "Пароль должен быть длинною 6-20 символов").isLength({min: 6, max: 20}),
],
AuthController.register
);
router.post('/login', AuthController.login);
router.post('/confirm', AuthController.confirm);
router.get('/refresh', AuthController.refresh);
router.post('/logout', AuthController.logout);
//
//router.post('/test', roleMiddleware(['USERR', 'USER']), AuthController.test);
export default router;

@ -0,0 +1,91 @@
import User from '../models/User.js';
import bcrypt from 'bcrypt';
import TokenService from './TokenService.js';
import UserDto from '../dtos/UserDto.js';
import jwt from 'jsonwebtoken';
import config from "config";
import sendConfirm from '../messages/confirmEmail.js';
import ApiError from '../controllers/ErrorController.js';
class AuthService {
async register(user) {
const candidate = await User.findOne({email: user.email});
if(candidate) {
throw ApiError.BadRequest('Пользователь с введенным email уже существует');
}
const hashPassword = await bcrypt.hash(user.password, 5);
const createdUser = await User.create({...user, password: hashPassword});
await sendConfirm(createdUser.id, createdUser.email);
const userDto = new UserDto(createdUser);
const tokens = TokenService.generateTokens({...userDto});
await TokenService.saveToken(userDto._id, tokens.refreshToken);
return {...tokens, user: userDto};
}
async login(user) {
const getUser = await User.findOne({email: user.email});
if(!getUser) {
throw ApiError.BadRequest('Пользователя с введенным email не существует');
}
const isPasswordValid = bcrypt.compareSync(user.password , getUser.password);
if(!isPasswordValid) {
throw ApiError.BadRequest('Не верный пароль');
}
if(!getUser.verify) {
throw ApiError.BadRequest('Для входа, необходимо подтвердить почту');
}
const userDto = new UserDto(getUser);
const tokens = TokenService.generateTokens({...userDto});
await TokenService.saveToken(userDto._id, tokens.refreshToken);
return {...tokens, user: userDto};
}
async confirm( { id } ) {
const candidate = await User.findById(id);
if(!candidate) {
throw ApiError.BadRequest('Не верная ссылка для подтверждения аккаунта');
}
if(candidate.verify) {
throw ApiError.BadRequest('Этот аккаунт уже подтвержден');
}
candidate.verify = true;
await candidate.save();
return {message: "Аккаунт успешно подтвержден, вы можете перейти к форме авторизации"};
}
async logout(refreshToken) {
const token = await TokenService.removeToken(refreshToken);
return token;
}
async refresh(refreshToken) {
if(!refreshToken) {
throw ApiError.UnauthorizedError();
}
const user = TokenService.validateRefreshToken(refreshToken);
const getToken = await TokenService.findToken(refreshToken);
if(!user || !getToken ) {
throw ApiError.UnauthorizedError();
}
const getUser = await User.findById(user._id)
const userDto = new UserDto(getUser);
const tokens = TokenService.generateTokens({...userDto});
await TokenService.saveToken(userDto._id, tokens.refreshToken);
return {...tokens, user: userDto};
}
}
export default new AuthService();

@ -0,0 +1,52 @@
import jwt from 'jsonwebtoken';
import config from "config";
import Token from '../models/Token.js';
class TokenService {
generateTokens(payload) {
const accessToken = jwt.sign(payload, config.get("JWTAccessSecret"), {expiresIn: "30m"});
const refreshToken = jwt.sign(payload, config.get("JWTRefreshSecret"), {expiresIn: "30d"});
return { accessToken, refreshToken }
}
validateAccessToken(token) {
try {
const user = jwt.verify(token, config.get("JWTAccessSecret"))
return user;
} catch (e) {
return null;
}
}
validateRefreshToken(token) {
try {
const user = jwt.verify(token, config.get("JWTRefreshSecret"))
return user;
} catch (e) {
return null;
}
}
async saveToken(userId, refreshToken) {
const candidate = await Token.findOne({ user: userId });
if (candidate) {
candidate.refreshToken = refreshToken;
return candidate.save();
}
const token = await Token.create({ user: userId, refreshToken });
return token;
}
async removeToken(refreshToken) {
const deletedToken = await Token.deleteOne({ refreshToken });
return deletedToken;
}
async findToken(refreshToken) {
const token = await Token.findOne({ refreshToken });
return token;
}
}
export default new TokenService();
Loading…
Cancel
Save