Merge pull request 'Добавлены стабы для двуфакторной авторизации' (#53) from dogsitters-finder into master

Reviewed-on: #53

.gitignore

@@ -2,3 +2,4 @@ node_modules/
 .env
 .idea
 coverage/
+server/log/

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20
 
-RUN mkdir -p /usr/src/app/server/
+RUN mkdir -p /usr/src/app/server/log/
 WORKDIR /usr/src/app/
 
 COPY ./server /usr/src/app/server

docker-compose.yaml

@@ -2,6 +2,7 @@ version: "3"
 
 volumes:
     ms_volume8:
+    ms_logs:
 
 services:
     mongoDb:
@@ -15,6 +16,8 @@ services:
         # build: .
         image: bro.js/ms/bh:$TAG
         restart: always
+        volumes:
+            - ms_logs:/usr/src/app/server/log
         ports:
             - 8044:8044
         environment:

package.json

@@ -23,33 +23,34 @@
   "license": "MIT",
   "homepage": "https://bitbucket.org/online-mentor/multi-stub#readme",
   "dependencies": {
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
-    "bcrypt": "^5.1.0",
+    "bcrypt": "^5.1.1",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.20.3",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.7",
-    "cors": "^2.8.5",
     "cross-env": "^7.0.3",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.7",
-    "express": "^4.18.2",
+    "express": "5.0.1",
-    "express-jwt": "^8.4.1",
+    "express-jwt": "^8.5.1",
-    "express-session": "^1.17.3",
+    "express-session": "^1.18.1",
-    "jsdom": "^22.1.0",
+    "jsdom": "^25.0.1",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.2",
-    "mongodb": "^3.6.8",
+    "mongodb": "^6.12.0",
-    "mongoose": "^8.7.1",
+    "mongoose": "^8.9.2",
+    "morgan": "^1.10.0",
     "pbkdf2-password": "^1.2.1",
-    "socket.io": "^4.7.1",
+    "rotating-file-stream": "^3.2.5",
-    "uuid": "^9.0.0"
+    "socket.io": "^4.8.1",
+    "uuid": "^11.0.3"
   },
   "devDependencies": {
-    "@eslint/js": "^9.12.0",
+    "@eslint/js": "^9.17.0",
-    "@types/node": "18.17.1",
+    "@types/node": "22.10.2",
-    "eslint": "^9.12.0",
+    "eslint": "^9.17.0",
-    "globals": "^15.11.0",
+    "globals": "^15.14.0",
     "jest": "^29.7.0",
     "mockingoose": "^2.16.2",
-    "nodemon": "3.0.1",
+    "nodemon": "3.1.9",
     "supertest": "^7.0.0"
   }
 }

server/error.js

@@ -6,6 +6,7 @@ module.exports = (err, req, res, next) => {
             success: false, error: 'Токен авторизации не найден',
         })
     }
+
     res.status(400).send({
         success: false, error: err.message || 'Что-то пошло не так',
     })

server/index.js

@@ -1,57 +1,97 @@
-const express = require('express')
+const express = require("express")
-const bodyParser = require('body-parser')
+const bodyParser = require("body-parser")
-const cookieParser = require('cookie-parser')
+const cookieParser = require("cookie-parser")
-const session = require('express-session')
+const session = require("express-session")
+const morgan = require("morgan")
+const path = require("path")
+const rfs = require("rotating-file-stream")
 
 const app = express()
-const cors = require('cors')
+require("dotenv").config()
-require('dotenv').config()
-
 exports.app = app
 
-const config = require('../.serverrc')
+const accessLogStream = rfs.createStream("access.log", {
-const { setIo } = require('./io')
+  size: "10M",
+  interval: "1d",
+  compress: "gzip",
+  path: path.join(__dirname, "log"),
+})
+
+const errorLogStream = rfs.createStream("error.log", {
+  size: "10M",
+  interval: "1d",
+  compress: "gzip",
+  path: path.join(__dirname, "log"),
+})
+
+const config = require("../.serverrc")
+const { setIo } = require("./io")
 
 app.use(cookieParser())
-app.options('*', cors())
+app.use(
-app.use(cors())
+  morgan("combined", {
+    stream: accessLogStream,
+    skip: function (req, res) {
+      return res.statusCode >= 400
+    },
+  })
+)
+
+// log all requests to access.log
+app.use(
+  morgan("combined", {
+    stream: errorLogStream,
+    skip: function (req, res) {
+        console.log('statusCode', res.statusCode, res.statusCode <= 400)
+        return res.statusCode < 400
+    },
+  })
+)
+
 const server = setIo(app)
 
 const sess = {
-    secret: 'super-secret-key',
+  secret: "super-secret-key",
   resave: true,
   saveUninitialized: true,
-    cookie: {
+  cookie: {},
-    },
 }
-if (app.get('env') === 'production') {
+if (app.get("env") === "production") {
-    app.set('trust proxy', 1)
+  app.set("trust proxy", 1)
   sess.cookie.secure = true
 }
 app.use(session(sess))
 
-app.use(bodyParser.json({
+app.use(
-    limit: '50mb',
+  bodyParser.json({
-}))
+    limit: "50mb",
-app.use(bodyParser.urlencoded({
+  })
-    limit: '50mb',
+)
+app.use(
+  bodyParser.urlencoded({
+    limit: "50mb",
     extended: true,
-}))
+  })
-app.use(require('./root'))
+)
+app.use(require("./root"))
 
 /**
  * Добавляйте сюда свои routers.
  */
-app.use('/kfu-m-24-1', require('./routers/kfu-m-24-1'))
+app.use("/kfu-m-24-1", require("./routers/kfu-m-24-1"))
-app.use('/epja-2024-1', require('./routers/epja-2024-1'))
+app.use("/epja-2024-1", require("./routers/epja-2024-1"))
-app.use('/todo', require('./routers/todo/routes'))
+app.use("/todo", require("./routers/todo/routes"))
-app.use('/dogsitters-finder', require('./routers/dogsitters-finder'))
+app.use("/dogsitters-finder", require("./routers/dogsitters-finder"))
-app.use('/kazan-explore', require('./routers/kazan-explore'))
+app.use("/kazan-explore", require("./routers/kazan-explore"))
-app.use('/edateam', require('./routers/edateam-legacy'))
+app.use("/edateam", require("./routers/edateam-legacy"))
-app.use('/dry-wash', require('./routers/dry-wash'))
+app.use("/dry-wash", require("./routers/dry-wash"))
-app.use('/freetracker', require('./routers/freetracker'))
+app.use("/freetracker", require("./routers/freetracker"))
-app.use('/dhs-testing', require('./routers/dhs-testing'))
+app.use("/dhs-testing", require("./routers/dhs-testing"))
+app.use("/gamehub", require("./routers/gamehub")) 
 
-app.use(require('./error'))
 
-server.listen(config.port, () => console.log(`Listening on http://localhost:${config.port}`))
+app.use(require("./error"))
+
+server.listen(config.port, () =>
+  console.log(`Listening on http://localhost:${config.port}`)
+)

server/root.js

@@ -10,6 +10,7 @@ const folderPath = path.resolve(__dirname, './routers')
 const folders = fs.readdirSync(folderPath)
 
 router.get('/', async (req, res) => {
+  // throw new Error('check error message')
   res.send(`
         <h1>multy stub is working v${pkg.version}</h1>
         <ul>
@@ -19,8 +20,7 @@ router.get('/', async (req, res) => {
         <h2>models</h2>
         <ul>${
           (await Promise.all(
-            (
+            (await mongoose.modelNames()).map(async (name) => {
-              await mongoose.modelNames()).map(async (name) => {
                 const count = await mongoose.model(name).countDocuments()
                 return `<li>${name} - ${count}</li>`
               }

server/routers/dogsitters-finder/index.js

@@ -1,35 +1,40 @@
-const router = require('express').Router();
+const router = require("express").Router();
 
 router.get("/users", (request, response) => {
-    response.send(require("./json/users/users.json"))
+  response.send(require("./json/users/users.json"));
-})
+});
 
 router.post("/auth", (request, response) => {
   const { phoneNumber, password } = request.body;
   console.log(phoneNumber, password);
-    if (phoneNumber === '89999999999') {
+  if (phoneNumber === "89999999999") {
-        response.send(require("./json/auth/dogsitter.success.json"))
+    response.send(require("./json/auth/dogsitter.success.json"));
+  } else if (phoneNumber === "89555555555") {
+    response.status(400).send(require("./json/auth/error.json"));
+  } else {
+    response.send(require("./json/auth/owner.success.json"));
   }
-    else if (phoneNumber === '89555555555') {
+});
-        response.status(400).send(require("./json/auth/error.json"))
+
+router.post("/auth/2fa", (request, response) => {
+  const { code } = request.body;
+  if (code === "0000") {
+    response.send(require("./json/2fa/success.json"));
+  } else {
+    response.status(400).send(require("./json/2fa/error.json"));
   }
-    else {
+});
-        response.send(require("./json/auth/owner.success.json"))
-    }
-})
 
 router.post("/register", (request, response) => {
   const { firstName, secondName, phoneNumber, password, role } = request.body;
   console.log(phoneNumber, password, role);
-    if (phoneNumber === '89283244141' || phoneNumber === '89872855893') {
+  if (phoneNumber === "89283244141" || phoneNumber === "89872855893") {
-        response.status(400).send(require("./json/register/error.json"))
+    response.status(400).send(require("./json/register/error.json"));
+  } else if (role === "dogsitter") {
+    response.send(require("./json/register/dogsitter.success.json"));
+  } else {
+    response.send(require("./json/register/owner.success.json"));
   }
-    else if (role === 'dogsitter') {
+});
-        response.send(require("./json/register/dogsitter.success.json"))
-    }
-    else {
-        response.send(require("./json/register/owner.success.json"))
-    }
-})
 
 module.exports = router;

server/routers/dogsitters-finder/json/2fa/error.json

@@ -0,0 +1,4 @@
+{
+  "status": "error",
+  "message": "Invalid code."
+}

server/routers/dogsitters-finder/json/2fa/success.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "message": "Two-factor authentication passed."
+}

server/routers/dry-wash/arm-master.js

@@ -0,0 +1,87 @@
+const router = require('express').Router()
+const {MasterModel} = require('./model/master')
+const mongoose = require("mongoose")
+
+
+router.get('/masters', async (req, res,next) => {
+    try {
+        const master = await MasterModel.find({})
+        res.status(200).send({success: true, body: master})
+    } catch (error) {
+        next(error)
+    }
+})
+
+router.delete('/masters/:id', async (req, res,next) => {
+    const { id } = req.params;
+
+    if (!mongoose.Types.ObjectId.isValid(id)){
+        throw new Error('ID is required')
+    }
+
+    try {
+        const master = await MasterModel.findByIdAndDelete(id, {
+            new: true,
+        });
+        if (!master) {
+            throw new Error('master not found')
+        }
+        res.status(200).send({success: true, body: master})
+    } catch (error) {
+        next(error)
+    }
+})
+
+
+router.post('/masters',  async (req, res,next) => {
+
+    const {name, phone} =  req.body
+
+    if (!name || !phone ){
+        throw new Error('Enter name and phone')
+    }
+    try {
+        const master =  await MasterModel.create({name, phone})
+        res.status(200).send({success: true, body: master})
+    } catch (error) {
+        next(error)
+    }
+})
+
+
+router.patch('/masters/:id', async (req, res, next) => {
+    const { id } = req.params;
+
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+        throw new Error('ID is required')
+    }
+
+    const { name, phone } = req.body;
+
+    if (!name && !phone) {
+        throw new Error('Enter name and phone')
+    }
+
+
+    try {
+        const updateData = {};
+        if (name) updateData.name = name;
+        if (phone) updateData.phone = phone;
+
+        const master = await MasterModel.findByIdAndUpdate(
+            id,
+            updateData,
+            { new: true }
+        );
+
+        if (!master) {
+            throw new Error('master not found')
+        }
+
+        res.status(200).send({ success: true, body: master });
+    } catch (error) {
+        next(error);
+    }
+});
+
+module.exports = router

server/routers/dry-wash/arm-orders.js

@@ -0,0 +1,9 @@
+const router = require('express').Router()
+
+router.get('/orders', (req, res) => {
+    res
+        .status(200)
+        .send(require(`./json/arm-orders/success.json`))
+})
+
+module.exports = router

server/routers/dry-wash/arm.js

@@ -1,37 +0,0 @@
-const router = require('express').Router()
-const {MasterModel} = require('./model/master')
-
-router.post('/master',  async (req, res,next) => {
-
-   const {name, phone} =  req.body
-
-   if (!name || !phone ){
-        throw new Error('Enter name  and phone')
-   }
-    try {
-        const master =  await MasterModel.create({name, phone})
-        res.status(200).send({success: true, body: master})
-    } catch (error) {
-        next(error)
-    }
-})
-
-
-
-router.get('/masters', async (req, res,next) => {
-    try {
-        const master = await MasterModel.find({})
-        res.status(200).send({success: true, body: master})
-    } catch (error) {
-        next(error)
-    }
-})
-
-
-router.get('/orders', (req, res) => {
-    res
-        .status(200)
-        .send(require(`./json/arm-orders/success.json`))
-})
-
-module.exports = router

server/routers/dry-wash/index.js

@@ -1,8 +1,10 @@
 const router = require('express').Router()
-const armRouter  = require('./arm')
+const armMasterRouter  = require('./arm-master')
+const armOrdersRouter  = require('./arm-orders')
 
 
-router.use('/arm', armRouter)
+router.use('/arm', armMasterRouter)
+router.use('/arm', armOrdersRouter)
 
 
 module.exports = router

server/routers/dry-wash/postman/dry-wash.postman_collection.json

@@ -16,7 +16,7 @@
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"name\":\"Anton\",\n    \"phone\": \"89172420577\"\n}",
+							"raw": "{\n    \"name\":\"Anto234\",\n    \"phone\": \"89172420577\"\n}",
 							"options": {
 								"raw": {
 									"language": "json"
@@ -42,13 +42,60 @@
 						"method": "GET",
 						"header": [],
 						"url": {
-							"raw": "{{host}}/arm/masters",
+							"raw": "{{host}}/arm/master-list",
 							"host": [
 								"{{host}}"
 							],
 							"path": [
 								"arm",
-								"masters"
+								"master-list"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "delete master",
+					"request": {
+						"method": "DELETE",
+						"header": [],
+						"url": {
+							"raw": "{{host}}/arm/masters/{{id}}",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"arm",
+								"masters",
+								"{{id}}"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "update master",
+					"request": {
+						"method": "PATCH",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n    \"name\":\"Anto234\",\n    \"phone\": \"89172420577\"\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{host}}/arm/masters/{{id}}",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"arm",
+								"masters",
+								"{{id}}"
 							]
 						}
 					},

server/routers/gamehub/index.js

@@ -0,0 +1,19 @@
+const router = require("express").Router();
+
+router.get("/game-page", (request, response) => {
+  response.send(require("./json/gamepage/success.json"));
+});
+
+router.get("/categories", (request, response) => {
+  response.send(require("./json/categories/success.json"));
+});
+
+router.get("/shopping-cart", (request, response) => {
+  response.send(require("./json/shopping-cart/success.json"));
+});
+
+router.get("/home", (request, response) => {
+  response.send(require("./json/home-page-data/success.json"));
+});
+
+module.exports = router;

server/routers/gamehub/json/categories/success.json

@@ -0,0 +1,150 @@
+{   
+    "success": true,
+    "data": {
+    "games1": [
+        {
+            "id": 1,
+            "title": "How to Survive",
+            "price": 259,
+            "old_price": 500,
+            "image": "sales_game1",
+            "os": "windows"
+        },
+        {
+            "id": 2,
+            "title": "Red Solstice 2 Survivors",
+            "price": 561,
+            "image": "sales_game2",
+            "os": "windows"
+        },
+        {
+            "id": 3,
+            "title": "Sons Of The Forests",
+            "price": 820,
+            "old_price": 1100,
+            "image": "new_game2",
+            "os": "windows"
+        },
+        {
+            "id": 4,
+            "title": "The Witcher 3: Wild Hunt",
+            "price": 990,
+            "old_price": 1200,
+            "image": "leaders_game4",
+            "os": "windows"
+        },
+        {
+            "id": 5,
+            "title": "Atomic Heart",
+            "price": 1200,
+            "old_price": 2500,
+            "image": "leaders_game5",
+            "os": "windows"
+        },
+        {
+            "id": 6,
+            "title": "Crab Game",
+            "price": 600,
+            "old_price": 890,
+            "image": "leaders_game6",
+            "os": "windows"
+        }
+    ],
+    "games2": [
+        {
+            "id": 1,
+            "title": "Alpha League",
+            "price": 299,
+            "image": "new_game1",
+            "os": "windows"
+        },
+        {
+            "id": 2,
+            "title": "Sons Of The Forests",
+            "price": 820,
+            "old_price": 1100,
+            "image": "new_game2",
+            "os": "windows"
+        },
+        {
+            "id": 3,
+            "title": "Pacific Drives",
+            "price": 1799,
+            "image": "new_game3",
+            "os": "windows"
+        },
+        {
+            "id": 4,
+            "title": "The Witcher 3: Wild Hunt",
+            "price": 990,
+            "old_price": 1200,
+            "image": "leaders_game4",
+            "os": "windows"
+        },
+        {
+            "id": 5,
+            "title": "Atomic Heart",
+            "price": 1200,
+            "old_price": 2500,
+            "image": "leaders_game5",
+            "os": "windows"
+        },
+        {
+            "id": 6,
+            "title": "Crab Game",
+            "price": 600,
+            "old_price": 890,
+            "image": "leaders_game6",
+            "os": "windows"
+        }
+    ],
+    "games3": [
+        {
+            "id": 1,
+            "title": "Elden Ring",
+            "price": 3295,
+            "old_price": 3599,
+            "image": "leaders_game2",
+            "os": "windows"
+        },
+        {
+            "id": 2,
+            "title": "Counter-Strike 2",
+            "price": 479,
+            "image": "leaders_game1",
+            "os": "windows"
+        },
+        {
+            "id": 3,
+            "title": "PUBG: BATTLEGROUNDS",
+            "price": 199,
+            "image": "leaders_game3",
+            "os": "windows"
+        },
+        {
+            "id": 4,
+            "title": "The Witcher 3: Wild Hunt",
+            "price": 990,
+            "old_price": 1200,
+            "image": "leaders_game4",
+            "os": "windows"
+        },
+        {
+            "id": 5,
+            "title": "Atomic Heart",
+            "price": 1200,
+            "old_price": 2500,
+            "image": "leaders_game5",
+            "os": "windows"
+        },
+        {
+            "id": 6,
+            "title": "Crab Game",
+            "price": 600,
+            "old_price": 890,
+            "image": "leaders_game6",
+            "os": "windows"
+        }
+    ]
+}
+}

server/routers/gamehub/json/gamepage/success.json

@@ -0,0 +1,24 @@
+{
+    "success": true,
+    "data": {
+      "comments": [
+        {
+          "username": "Пользователь1",
+          "text": "Текст комментария 1"
+        },
+        {
+          "username": "Пользователь2",
+          "text": "Текст комментария 2"
+        },
+        {
+          "username": "Пользователь3",
+          "text": "Текст комментария 3"
+        },
+        {
+          "username": "Пользователь4",
+          "text": "Текст комментария 4"
+        }
+      ]
+    }
+  }
+  

server/routers/gamehub/json/home-page-data/success.json

@@ -0,0 +1,91 @@
+{
+  "success": true,
+  "data": {
+    "topSail": [
+      {
+        "image": "game1",
+        "text": "$10"
+      },
+      {
+        "image": "game2",
+        "text": "$10"
+      },
+      {
+        "image": "game3",
+        "text": "$10"
+      },
+      {
+        "image": "game4",
+        "text": "$10"
+      },
+      {
+        "image": "game5",
+        "text": "$10"
+      },
+      {
+        "image": "game6",
+        "text": "$10"
+      },
+      {
+        "image": "game7",
+        "text": "$10"
+      },
+      {
+        "image": "game8",
+        "text": "$10"
+      }
+    ],
+    "categories": [
+      {
+        "image": "category1",
+        "text": "гонки"
+      },
+      {
+        "image": "category2",
+        "text": "глубокий сюжет"
+      },
+      {
+        "image": "category3",
+        "text": "симуляторы"
+      },
+      {
+        "image": "category4",
+        "text": "открытый мир"
+      },
+      {
+        "image": "category5",
+        "text": "экшен"
+      },
+      {
+        "image": "category6",
+        "text": "стратегии"
+      },
+      {
+        "image": "category7",
+        "text": "шутеры"
+      },
+      {
+        "image": "category8",
+        "text": "приключения"
+      }
+    ],
+    "news": [
+      {
+        "image": "news1",
+        "text": "Разработчики Delta Force: Hawk Ops представили крупномасштабный режим Havoc Warfare"
+      },
+      {
+        "image": "news2",
+        "text": "Первый трейлер Assassin’s Creed Shadows — с темнокожим самураем в феодальной Японии"
+      },
+      {
+        "image": "news3",
+        "text": "Призрак Цусимы» вышел на ПК — и уже ставит рекорды для Sony"
+      },
+      {
+        "image": "news4",
+        "text": "Авторы Skull and Bones расширяют планы на второй сезо"
+      }
+    ]
+  }
+}

server/routers/gamehub/json/shopping-cart/success.json

@@ -0,0 +1,37 @@
+{
+    "success":true,
+    "data":
+    [
+        {
+            "id": 1,
+            "title": "Mortal Kombat 11",
+            "image": "mortal",
+            "alt": "Игра Мортал Комбат 11, картинка",
+            "releaseDate": "23 апр. 2019",
+            "description": "MORTAL KOMBAT 11 ULTIMATE ВКЛЮЧАЕТ В СЕБЯ БАЗОВУЮ ИГРУ МК11, КОМВАТ РАСК 1, ДОПОЛНЕНИЕ «ПОСЛЕДСТВИЯ» И НЕДАВНО ДОБАВЛЕННЫЙ НАБОР «КОМБАТ 2».",
+            "price": 300 
+            
+        },
+        {
+            "id": 2,
+            "title": "EA SPORTS™ FIFA 23",
+            "image": "fifa",
+            "alt": "Игра Фифа, картинка",
+            "releaseDate": "30 сен. 2022",
+            "description": "В FIFA 23 всемирная игра становится еще лучше с технологией HyperMotion2, мужским и женским FIFA World Cup™, женскими командами, кроссплатформенной игрой и множеством прочих возможностей.",
+            "price": 300 
+            
+        },
+        {
+            "id": 3,
+            "title": "Ведьмак: Дикая Охота",
+            "image": "ved",
+            "alt": "Игра Ведьмак, картинка",
+            "releaseDate": "18 мая 2015",
+            "description": "Вы — Геральт из Ривии, наемный убийца чудовищ. Вы путешествуете по миру, в котором бушует война и на каждом шагу подстерегают чудовища. Вам предстоит выполнить заказ и найти Цири — Дитя Предназначения, живое оружие, способное изменить облик этого мира.",
+            "price": 300 
+            
+        }
+    ]
+}
+