@ozdao/prometheus-framework 0.2.137 → 0.2.139

package/src/modules/auth/middlewares/authJwt.js

@@ -0,0 +1,80 @@
+const jwt = require("jsonwebtoken");
+
+const middlewareFactory = (db) => {
+  const User = db.user;
+  const Role = db.role;
+
+  const verifyToken = (continueOnFail = false) => {
+    return async (req, res, next) => {
+      try {
+        if (!req.cookies.user) {
+          req.userId = null;
+          if (continueOnFail) {
+            return next();
+          } else {
+            return res.status(401).send({ message: "Unauthorized: No user cookie" });
+          }
+        }
+
+        let user = JSON.parse(req.cookies.user);
+        let token = req.headers["x-access-token"] || user.accessToken;
+
+        if (!token) {
+          req.userId = null;
+          if (continueOnFail) {
+            return next();
+          } else {
+            return res.status(401).send({ message: "Unauthorized: No token provided" });
+          }
+        }
+
+        const decoded = jwt.verify(token, process.env.SECRET_KEY);
+        req.userId = decoded._id;
+
+        next();
+      } catch (err) {
+        console.log(err);
+        req.userId = null;
+        if (continueOnFail) {
+          next();
+        } else {
+          res.status(401).send({ message: "Unauthorized: Invalid token" });
+        }
+      }
+    };
+  };
+
+  const checkRole = roleToCheck => async (req, res, next) => {
+    try {
+      const user = await User.findById(req.userId).exec();
+
+      if (!user) {
+        return res.status(404).send({ message: "User Not found." });
+      }
+
+      const roles = await Role.find({ _id: { $in: user.roles }}).exec();
+
+      for (let role of roles) {
+        if (role.name === roleToCheck) {
+          next();
+          return;
+        }
+      }
+
+      res.status(403).send({ message: `Require ${roleToCheck} Role!` });
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  const isAdmin = checkRole("admin");
+  const isModerator = checkRole("moderator");
+
+  return {
+    verifyToken,
+    isAdmin,
+    isModerator
+  };
+};
+
+module.exports = middlewareFactory;

package/src/modules/{middlewares/server → auth/middlewares}/index.js

@@ -6,15 +6,13 @@ const middlewareIndexFactory = (db) => {
   const verifySignUp = require("./verifySignUp")(db);
   const verifyUser = require("./verifyUser")(db);
   const verifyInvites = require("./verifyInvites")(db);
-  const verifyCategory = require("./verifyCategory")(db);
 
   return {
     authJwt,
     authSecret,
     verifySignUp,
     verifyUser,
-    verifyInvites,
-    verifyCategory
+    verifyInvites
   };
 };
 

package/src/modules/{middlewares/server → auth/middlewares}/verifyAccesses.js

@@ -38,7 +38,6 @@ const middlewareFactory = (db) => {
           // Если пользователь не является членом организации, ограничиваем доступ к опубликованным ресурсам
           req.query.status = 'published';
         } else {
-          // Пользователь является членом организации, проверяем его права доступа
 
           // Находим все департаменты данной организации, к которым относится пользователь
           const departments = await Department.find({ organization: ownerOrgId });
@@ -48,6 +47,7 @@ const middlewareFactory = (db) => {
 
           for (const department of departments) {
             const accessRights = department.accesses[resource];
+
             if (accessRights && accessRights.read) {
               // Если хотя бы в одном департаменте есть права на чтение ресурса, разрешаем доступ
               hasAccess = true;

package/src/modules/auth/routes/auth.routes.js

@@ -2,7 +2,7 @@
 const controllerFactory = require("../controllers/auth.controller");
 const controllerFactoryTwofa = require("../controllers/twofa.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactory = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
@@ -40,7 +40,7 @@ module.exports = function(app, db, origins) {
   app.get(
     "/api/auth/check-accesses",
     [
-      authJwt.verifyToken,
+      authJwt.verifyToken(true),
     ],
      controller.checkAccesses
   );

package/src/modules/auth/routes/twofa.routes.js

@@ -1,7 +1,7 @@
 // Factories
 const controllerFactory = require("../controllers/twofa.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactory = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);

package/src/modules/auth/store/auth.js

@@ -85,6 +85,8 @@
           roles: response.data.roles
         });
 
+        await initialize();
+
         return response.data;
       } catch (error) {
 
@@ -141,6 +143,8 @@
           roles: response.data.roles
         });
 
+        await initialize();
+
         return response.data;
       } catch (error) {
         setError(error);
@@ -153,6 +157,8 @@
       removeCookie('user');
 
       Object.assign(state.user, {
+        _id: undefined,
+        username: '',
         email: '',
         phone: '',
         password: '',
@@ -160,9 +166,12 @@
       });
 
       Object.assign(state.access, {
+        roles: null,
         token: null,
         status: false
       });
+
+      state.accesses = []
     },
 
     async resetPassword(user, type) {

package/src/modules/chats/routes/chats.routes.js

@@ -1,7 +1,7 @@
 // Factories
 const controllerFactory = require('../controllers/chats.controller.js');
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactory = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db, wss) {
   const controller = controllerFactory(db);

package/src/modules/community/routes/blog.routes.js

@@ -1,12 +1,12 @@
 const controllerFactory = require("../controllers/blog.controller");
 
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 const middlewareFactoryCommunity = require('../middlewares/server');
 
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { verifyBlogpost } = middlewareFactoryCommunity(db);
 
   app.get(

package/src/modules/events/routes/events.routes.js

@@ -1,13 +1,13 @@
 // Factories
 const controllerFactory = require("../controllers/events.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 const middlewareFactoryEvents = require('../middlewares/server');
 // Routes
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { verifyEvent } = middlewareFactoryEvents(db);
 
   app.get(

package/src/modules/files/routes/files.routes.js

@@ -1,13 +1,13 @@
 // Factories
 const controllerFactory = require("../controllers/files.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 const middlewareFactoryFiles = require('../middlewares/server');
 
 module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db, publicPath);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { middlewareBusboy } = middlewareFactoryFiles(db, publicPath);
 
   app.post(

package/src/modules/gallery/routes/gallery.routes.js

@@ -1,20 +1,19 @@
 // Factories
 const controllerFactory = require("../controllers/gallery.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
-const middlewareFactoryAccesses = require('@pf/src/modules/middlewares/server/verifyAccesses')
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
+const middlewareFactoryAccesses = require('@pf/src/modules/auth/middlewares/verifyAccesses')
 
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { verifyRead } = middlewareFactoryAccesses(db)
 
-
   app.get(
     "/api/gallery/read",
     [
-      authJwt.verifyToken,
+      authJwt.verifyToken(true),
       verifyRead('gallery'),
     ],
     controller.read

package/src/modules/globals/services/globals.crud.js

@@ -1,12 +1,12 @@
 const globalsQuery = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
-const Cashe = require('@pf/src/modules/globals/services/globals.cashe');
+const Cache = require('@pf/src/modules/globals/services/globals.cache');
 const Logger = require('@pf/src/modules/globals/services/globals.logger');
 
 class CRUD {
   constructor(basePath, app, db, model) {
     this.model = model;
-    this.cache = new Cashe();
+    this.cache = new Cache();
     this.logger = new Logger(db);
 
     this.app = app;

package/src/modules/marketplace/store/marketplace.js

@@ -47,7 +47,7 @@ const state = reactive({
       value: 'views'
     },{
       label: 'Products',
-      value: 'products'
+      value: 'numberOfProducts'
     }]
   }
 });

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -117,7 +117,7 @@
         @click="() => { 
           orders.mutations.resetCustomer(orders.state.current.customer)
         }"
-        class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+        class="bg-white pd-thin h-4r radius-medium w-100 mn-b-thin"
       />
       <Feed
         v-else
@@ -152,7 +152,7 @@
           @click="() => { 
             orders.state.current.customer = user
           }"
-          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+          class="bg-white pd-thin h-4r radius-medium w-100 mn-b-thin"
         />
       </Feed>
       

package/src/modules/orders/components/sections/FormAddCustomer.vue

@@ -15,7 +15,7 @@
       @click="() => { 
         dataCustomer.user = null
       }"
-      class="bg-white pd-thin radius-medium w-100"
+      class="bg-white h-2r pd-thin radius-medium w-100"
     />
 
     <div 
@@ -54,7 +54,7 @@
             dataCustomer.email = user.email
             dataCustomer.socials = user.socials
           }"
-          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+          class="bg-white h-2r pd-thin radius-medium w-100 mn-b-thin"
         />
       </Feed>
     </div>

package/src/modules/orders/controllers/orders.controller.js

@@ -76,6 +76,7 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCre
 const controllerFactory = (db) => {
   const Order = db.order;
   const Customer = db.customer;
+  const Leftover = db.leftover;
 
   // Создание заказа
   const create = async (req, res) => {

package/src/modules/orders/routes/applications.routes.js

@@ -1,11 +1,11 @@
 // Factories
 const controllerFactory = require("../controllers/applications.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
 
   app.post(
     "/applications",

package/src/modules/orders/routes/orders.routes.js

@@ -1,11 +1,11 @@
 // Factories
 const controllerFactory = require("../controllers/orders.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db);
-  const middleware = middlewareFactory(db);
+  const middleware = middlewareFactoryAuth(db);
 
   app.post(
     "/api/orders/create",

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -69,14 +69,16 @@
       <IconTime class="i-medium mn-r-micro"/>
       <span class="mn-r-thin">{{
         organization.distance ? 
-          Math.ceil((5 + 5 + 3 * organization.distance) / 5) * 5 
-          + '-' 
-          + Math.ceil((15 + 5 + 3 * organization.distance) / 5) * 5 
-          + ' MIN' : 'Unavailable' 
+          organization.distance > 50 ? 
+            '3-5 days' : 
+            Math.ceil((5 + 5 + 3 * organization.distance) / 5) * 5 
+            + '-' 
+            + Math.ceil((15 + 5 + 3 * organization.distance) / 5) * 5 
+            + ' MIN' : 'Unavailable' 
         }} 
       </span>
-      <span v-if="organization.distance" class="t-transp mn-r-thin">|</span>
-      <span class="mn-r-thin">{{organization.distance ? organization.distance.toFixed(1) + ' KM' : ''}} </span>
+      <span v-if="organization.distance && organization.distance < 50" class="t-transp mn-r-thin">|</span>
+      <span v-if="organization.distance && organization.distance < 50" class="mn-r-thin">{{organization.distance ? organization.distance.toFixed(1) + ' KM' : ''}} </span>
       <!-- <span class="mn-r-thin">{{organization.nearestSpotDistance}}</span> -->
       <IconPrice class="i-medium mn-r-micro"/>
       <span class="mn-r-thin">{{returnCurrency()}}500 </span>
@@ -88,7 +90,7 @@
       <div class="w-max flex-nowrap flex gap-thin">
         <CardOrderItem  
           @click.stop="$router.push({name: 'Product Organization', params: {_id: organization._id, product: product._id}})" 
-          v-for="product in organization.products.slice(0,10)" 
+          v-for="product in organization.products.slice(0,5)" 
           :key="product._id" 
           :editable="false" 
           :product="product" 

package/src/modules/organizations/components/pages/Members.vue

@@ -120,7 +120,7 @@
         v-if="tab === 'invites'"
       > 
         <Feed
-          :search="true"
+          v-model:items="invitesState"
           :states="{
             empty: {
               title: 'No Invites Found',
@@ -183,6 +183,7 @@ import CardDepartment from '@pf/src/modules/organizations/components/blocks/Card
 import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'
 
 import * as auth      from '@pf/src/modules/auth/store/auth'
+import * as globals      from '@pf/src/modules/globals/store/globals'
 import * as invites from '@pf/src/modules/organizations/store/invites';
 import * as memberships from '@pf/src/modules/organizations/store/memberships';
 import * as organization  from '@pf/src/modules/organizations/store/organizations'
@@ -194,6 +195,8 @@ const organizationData = ref(null)
 
 // Tab logic
 const tab = ref('members')
+// States
+const invitesState = ref([])
 // Popup
 const isOpenMembersAddPopup = ref(false);
 
@@ -222,19 +225,27 @@ const FirstLevelDepartments = computed(() => {
   );
 });
 
-async function handleSendInvite(list) {
-  await invites.actions.create({
-    owner: {
-      type: 'Organization',
-      target: organizationData.value._id
-    },
-    creator: {
-      type: 'User',
-      target: auth.state.user._id
-    },
-    invites: list,
-  });
-  closeMembersAddPopup()
+async function handleSendInvite(list, resolve, reject) {
+  try {
+    const response = await invites.actions.create({
+      owner: {
+        type: 'Organization',
+        target: organizationData.value._id
+      },
+      creator: {
+        type: 'User',
+        target: auth.state.user._id
+      },
+      invites: list,
+    });
+    for (let invite of response.createdInvites) {
+      globals.actions.add(invitesState.value, invite)
+    }
+    closeMembersAddPopup();
+    resolve(); // Вызываем resolve, когда все операции завершены успешно
+  } catch (error) {
+    reject(error); // Вызываем reject, если произошла ошибка
+  }
 }
 
 async function removeMember(index,member) {
@@ -246,7 +257,7 @@ async function removeMember(index,member) {
 
 async function removeInvite(index,invite) {
   if (confirm("Confirm remove of member") == true) {
-    invites.state.invites.splice(index, 1);
+    globals.actions.delete(invitesState.value, invite)
     await invites.actions.delete(invite._id);
   }
 }

package/src/modules/organizations/components/pages/Organization.vue

@@ -220,9 +220,9 @@
 
 	route.query.tab = tabOrganization.value
 
-	watch(tabOrganization, (newValue) => {
-	  router.replace({ query: null});
-	});
+	// watch(tabOrganization, (newValue) => {
+	//   router.replace({ query: null});
+	// });
 </script>
 
 <style lang="scss">

package/src/modules/organizations/components/sections/DetailsTab.vue

@@ -91,7 +91,7 @@
       </div>
 
       <p class="w-max-50r mn-t-regular mn-b-medium p-big">
-     		<Text :text="organization.profile.description || ''" :maxLen="240" />
+     		<Text :text="organization.profile.description || ''" :showToggleText="true" :maxLen="320" />
     	</p>  
 
     	<Chips