Merge pull request 'Fix export' (#101) from dsf-fix-1 into master

Reviewed-on: #101

server/routers/dogsitters-finder/auth.js

@@ -1,74 +0,0 @@
-const { Router } = require("express");
-const hash = require("pbkdf2-password")();
-const { promisify } = require("node:util");
-const jwt = require('jsonwebtoken')
-
-const { getAnswer } = require("../../utils/common");
-
-const { AuthModel } = require("./model/todo/auth");
-const { TOKEN_KEY } = require('./const')
-const { UserModel } = require("./model/todo/user");
-
-const { requiredValidate } = require('./utils')
-
-const router = Router();
-
-router.post(
-  "/signup",
-  requiredValidate("login", "password", "email"),
-  async (req, res, next) => {
-    const { login, password, email } = req.body
-
-    const user = await AuthModel.findOne({ login });
-
-    if (user) {
-      throw new Error("Пользователь с таким логином уже существует");
-    }
-
-    hash({ password }, async function (err, pass, salt, hash) {
-      if (err) return next(err);
-
-      const user = await UserModel.create({ login, email });
-      await AuthModel.create({ login, hash, salt, userId: user.id });
-
-      res.json(getAnswer(null, { ok: true }))
-    })
-  }
-)
-
-function authenticate(login, pass, cb) {
-    AuthModel.findOne({ login }).populate('userId').exec().then((user) => {
-    if (!user) return cb(null, null)
-
-    hash({ password: pass, salt: user.salt }, function (err, pass, salt, hash) {
-      if (err) return cb(err)
-      if (hash === user.hash) return cb(null, user)
-      cb(null, null)
-    })
-  })
-}
-
-const auth = promisify(authenticate)
-
-router.post('/signin', requiredValidate('login', 'password'), async (req, res) => {
-    const { login, password } = req.body
-
-    const user = await auth(login, password)
-
-    if (!user) {
-        throw new Error("Неверный логин или пароль")
-    }
-
-    const accessToken = jwt.sign({
-        ...JSON.parse(JSON.stringify(user.userId)),
-    }, TOKEN_KEY, {
-        expiresIn: '12h'
-    })
-
-    res.json(getAnswer(null, {
-        user: user.userId,
-        token: accessToken,
-    }))
-})
-
-module.exports = router

server/routers/dogsitters-finder/const.js

@@ -1,3 +1,2 @@
-exports.DSF_AUTH_PASSWD_MODEL_NAME = 'DSF_AUTH_PASSWD'
 exports.DSF_AUTH_USER_MODEL_NAME = 'DSF_AUTH_USER'
 exports.DSF_INTERACTION_MODEL_NAME = 'DSF_INTERACTION'

server/routers/dogsitters-finder/index.js

@@ -8,20 +8,20 @@ router.post("/auth", (request, response) => {
   const { phoneNumber, password } = request.body;
   console.log(phoneNumber, password);
   if (phoneNumber === "89999999999" || phoneNumber === "89559999999") {
-    response.send(require("../json/auth/success.json"));
+    response.send(require("./json/auth/success.json"));
   } else {
-    response.status(401).send(require("../json/auth/error.json"));
+    response.status(401).send(require("./json/auth/error.json"));
   }
 });
 
 router.post("/auth/2fa", (request, response) => {
   const { phoneNumber, code } = request.body;
   if (code === "0000" && phoneNumber === "89999999999") {
-    response.send(require("../json/2fa/dogsitter.success.json"));
+    response.send(require("./json/2fa/dogsitter.success.json"));
   } else if (code === "0000" && phoneNumber === "89559999999") {
-    response.send(require("../json/2fa/owner.success.json"));
+    response.send(require("./json/2fa/owner.success.json"));
   } else {
-    response.status(401).send(require("../json/2fa/error.json"));
+    response.status(401).send(require("./json/2fa/error.json"));
   }
 });
 
@@ -29,11 +29,11 @@ router.post("/register", (request, response) => {
   const { firstName, secondName, phoneNumber, password, role } = request.body;
   console.log(phoneNumber, password, role);
   if (phoneNumber === "89999999999" || phoneNumber === "89559999999") {
-    response.status(401).send(require("../json/register/error.json"));
+    response.status(401).send(require("./json/register/error.json"));
   } else if (role === "dogsitter") {
-    response.send(require("../json/register/dogsitter.success.json"));
+    response.send(require("./json/register/dogsitter.success.json"));
   } else {
-    response.send(require("../json/register/owner.success.json"));
+    response.send(require("./json/register/owner.success.json"));
   }
 });
 
@@ -58,12 +58,14 @@ router.get("/auth/session", (request, response) => {
     const decoded = jwt.verify(token, secretKey);
 
     if (decoded.role === "dogsitter") {
-      response.send(require("../json/role/dogsitter.success.json"));
+      response.send(require("./json/role/dogsitter.success.json"));
     } else {
-      response.send(require("../json/role/owner.success.json"));
+      response.send(require("./json/role/owner.success.json"));
     }
   } catch (e) {
     console.log("token e:", e);
     return response.status(403).json({ error: "Invalid token" });
   }
-});
+});
+
+module.exports = router

server/routers/dogsitters-finder/model/auth.js

@@ -1,44 +0,0 @@
-const { Schema, model } = require("mongoose");
-
-const {
-  DSF_AUTH_PASSWD_MODEL_NAME,
-  DSF_AUTH_USER_MODEL_NAME,
-} = require("../../const");
-
-const schema = new Schema({
-  login: { 
-    type: String, 
-    required: true, 
-    unique: true
-  },
-  hash: { 
-    type: String, 
-    required: true 
-  },
-  salt: { 
-    type: String, 
-    required: true 
-  },
-  userId: { 
-    type: Schema.Types.ObjectId, 
-    ref: DSF_AUTH_USER_MODEL_NAME 
-  },
-  created: {
-    type: Date,
-    default: () => new Date().toISOString(),
-  },
-});
-
-schema.set("toJSON", {
-  virtuals: true,
-  versionKey: false,
-  transform: function (doc, ret) {
-    delete ret._id;
-  },
-});
-
-schema.virtual("id").get(function () {
-  return this._id.toHexString();
-});
-
-exports.AuthModel = model(DSF_AUTH_PASSWD_MODEL_NAME, schema);

server/routers/gamehub/index.js

@@ -21,7 +21,7 @@ router.get("/favourites", (request, response) => {
 });
 
 // router.get("/shopping-cart", (request, response) => {
-//   response.send(require("../json/shopping-cart/success.json"));
+//   response.send(require("./json/shopping-cart/success.json"));
 // });
 
 router.get("/shopping-cart", (request, response) => {
@@ -175,35 +175,39 @@ router.post("/add-to-cart", async (req, res) => {
 
 module.exports = router;
 
-const createElement = (key, value, buttonTitle) => `
+const createElement = (key, value, buttonTitle, basePath) => `
     <label>
         <input name="${key}" type="radio" ${
   stubs[key] === value ? "checked" : ""
-} onclick="fetch('/api/admin/set/${key}/${value}')"/>
+} onclick="fetch('${basePath}/admin/set/${key}/${value}')"/>
         ${buttonTitle || value}
     </label>
 `;
 
 router.get("/admin/home", (request, response) => {
+  const basePath = request.baseUrl; // Получаем базовый путь маршрутизатора
   response.send(`
         <div>
             <fieldset>
                 <legend>Настройка данных для /home</legend>
-                ${createElement("home", "success", "Отдать успешный ответ")}
+                ${createElement("home", "success", "Отдать успешный ответ", basePath)}
-                ${createElement("home", "empty", "Отдать пустой массив")}
+                ${createElement("home", "empty", "Отдать пустой массив", basePath)}
-                ${createElement("home", "error", "Отдать ошибку")}
+                ${createElement("home", "error", "Отдать ошибку", basePath)}
             </fieldset>
         </div>    
     `);
 });
 
-
 router.get("/admin/game-page", (request, response) => {
   response.send(`
         <div>
             <fieldset>
                 <legend>Настройка данных для /game-page</legend>
-                ${createElement("game-page", "success", "Отдать успешный ответ")}
+                ${createElement(
+                  "game-page",
+                  "success",
+                  "Отдать успешный ответ"
+                )}
                 ${createElement("game-page", "empty", "Отдать пустой массив")}
                 ${createElement("game-page", "error", "Отдать ошибку")}
 
@@ -217,7 +221,11 @@ router.get("/admin/categories", (request, response) => {
         <div>
             <fieldset>
                 <legend>Настройка данных для /categories</legend>
-                ${createElement("categories", "success", "Отдать успешный ответ")}
+                ${createElement(
+                  "categories",
+                  "success",
+                  "Отдать успешный ответ"
+                )}
                 ${createElement("categories", "empty", "Отдать пустой массив")}
                 ${createElement("categories", "error", "Отдать ошибку")}
                 </fieldset>
@@ -230,7 +238,11 @@ router.get("/admin/favourites", (request, response) => {
         <div>
             <fieldset>
                 <legend>Настройка данных для /favourites</legend>
-                ${createElement("favourites", "success", "Отдать успешный ответ")}
+                ${createElement(
+                  "favourites",
+                  "success",
+                  "Отдать успешный ответ"
+                )}
                 ${createElement("favourites", "empty", "Отдать пустой массив")}
                 ${createElement("favourites", "error", "Отдать ошибку")}
             </fieldset>