@ozdao/prometheus-framework 0.2.221 → 0.2.223

package/src/modules/integrations/stripe/controllers/services/stripe.service.js

@@ -52,6 +52,7 @@ class servicePaymentStripe extends servicePayment {
         });
 
         let newPrice;
+        let paymentLink;
 
         // Check if any active price matches the new price
         const matchingPrice = activePrices.data.find(price => price.unit_amount === event.specialData.ticketPrice * 100);
@@ -69,38 +70,22 @@ class servicePaymentStripe extends servicePayment {
                 nickname: 'default',
                 active: true // Make the new price active
             });
-        } else {
-            // Deactivate all active prices except the matching one
-            const deactivatePromises = activePrices.data
-                .filter(price => price.id !== matchingPrice.id)
-                .map(price => stripe.prices.update(price.id, { active: false }));
 
-            await Promise.all(deactivatePromises);
-
-            // Create a new price with the same details as the matching price
-            newPrice = await stripe.prices.create({
-                product: product.id,
-                unit_amount: matchingPrice.unit_amount,
-                currency: matchingPrice.currency,
-                nickname: 'default',
-                active: true // Make the new price active
+            // Create new payment link
+            paymentLink = await stripe.paymentLinks.create({
+                line_items: [{ 
+                    price: newPrice.id, 
+                    quantity: 1,
+                    adjustable_quantity: {
+                        enabled: true
+                    } 
+                }],
+                metadata: {
+                    product: event._id.toString()
+                }
             });
-        }
-
-        // Create new payment link
-        const paymentLink = await stripe.paymentLinks.create({
-            line_items: [{ 
-                price: newPrice.id, 
-                quantity: 1,
-                adjustable_quantity: {
-                    enabled: true
-                } 
-            }],
-            metadata: {
-                product: event._id.toString()
-            }
-        });
-
+        } 
+        
         return { product, price: newPrice, paymentLink };
     }
 

package/src/modules/landing/components/pages/Governance.vue

@@ -1,6 +1,7 @@
 <template>
-	<div class="pd-thin">
-    <SectionHeroToken class="mn-b-extra h-min-100"/>
+	<div>
+    <SectionHeroToken class="mn-b-extra h-100"/>
+    <div class="pd-thin">
     <SectionFeaturesImages class="mn-b-thin"/>
     <SectionFeatures
       :textData="{
@@ -98,6 +99,7 @@
         }
       }"
     />
+    </div>
     <!-- Partials (need to remove) -->
   </div>
 </template>

package/src/modules/landing/components/sections/SectionHeroToken.vue

@@ -27,40 +27,42 @@
 <template>
 	<div
 		id="heroGovernance" 
-		class="pos-relative bg-black o-hidden t-white t-center pd-extra radius-big flex-column flex-center flex"
+		class="pos-relative bg-black o-hidden t-white t-center pd-extra flex-column flex-center flex"
 	>
 		<div class="sheen h-5r mn-b-small radius-extra o-hidden pos-relative ">
 	  	<img loading="lazy" src="/logo/wdt.svg" class="w-100 h-100">
 	  </div>
 
 		<h1 
-			class="w-max-35r mn-b-medium" 
+			class="w-max-50r mn-b-medium" 
 			v-html="t('TITLE')"
 		/>
 
 		<p 
-			class="w-max-40r mn-b-big t-transp p-big" 
+			class="w-max-50r mn-b-big t-transp p-big" 
 			v-html="t('DESCRIPTION')"
 		/>
 
 		<div 
-			class="t-white gap-small cols-2-fit-content"
+			class="t-white gap-thin z-index-1 cols-2"
 		>
 			<router-link 
 				:to="{
 					name: 'Sign In'
 				}"
-				class="w-max bg-light t-dark br-light button"
-				v-html="t('SUBACTION')"
-			/>
+				class="w-100 bg-light t-dark br-light button"
+			>
+				{{t('SUBACTION')}}
+			</router-link>
 
 			<router-link  
 				:to="{
 					name: 'Marketplace'
 				}"
-				class="w-max bg-dark t-white button"
-				v-html="t('ACTION')"
-			/>
+				class="w-100 bg-dark t-white button"
+			>
+				{{t('ACTION')}}
+			</router-link>
 		</div>
 
 		<AnimatedGrid class="w-100 h-100 pos-absolute pos-t-0 pos-r-0 z-index-0" />

package/src/modules/landing/components/sections/SectionsSection.vue

@@ -4,25 +4,25 @@
   
   <div class="cols-4 gap-thin">
     <router-link to="/marketplace" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/1.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/1.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section1.title')}}</h3>
       <p class="t-transp">{{t('section1.text')}}</p>
     </router-link >
 
     <router-link to="/spots" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/2.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/2.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section2.title')}}</h3>
       <p class="t-transp">{{t('section2.text')}}</p>
     </router-link>
 
     <router-link to="/community" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/3.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/3.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section3.title')}}</h3>
       <p class="t-transp">{{t('section3.text')}}</p>
     </router-link>
 
     <router-link to="/governance" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/4.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/4.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section4.title')}}</h3>
       <p class="t-transp">{{t('section4.text')}}</p>
     </router-link>
@@ -62,8 +62,5 @@
 </script>
 
 <style lang="scss">
-.section-image {
-  width: 100%;
-  object-fit: cover;
-}
+
 </style>

package/src/modules/landing/router/landing.js

@@ -18,7 +18,8 @@ const landing = [
       title: {
         en: 'Governance',
         ru: 'Управления'
-      }
+      },
+      header_theme: 'dark',
     },
     component: () => import(/* webpackChunkName: 'Governance' */ '@pf/src/modules/landing/components/pages/Governance.vue'),
   },

package/src/modules/orders/store/orders.js

@@ -1,9 +1,7 @@
 // Dependencies
 import { reactive, ref, computed, toRefs, watch  } from "vue";
-// Axios
-import axios from 'axios';
 // Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // Globals
 import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // Init State

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

@@ -139,6 +139,35 @@
           <p class="p-medium mn-b-small">Please select organization accesses for user in department:</p>
           
           <div class="cols-1 gap-thin">
+            <h4>Events</h4>
+            <Checkbox
+              label="Read events"
+              name="readProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.read"
+              @update:radio="updated => (departments.state.department.accesses.events.read = !departments.state.department.accesses.events.read)"
+            />
+            <Checkbox
+              label="Create events"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.create"
+              @update:radio="updated => (departments.state.department.accesses.events.create = !departments.state.department.accesses.events.create)"
+            />
+            <Checkbox
+              label="Edit events"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.edit"
+              @update:radio="updated => (departments.state.department.accesses.events.edit = !departments.state.department.accesses.events.edit)"
+            />
+            <Checkbox
+              label="Delete events"
+              name="deleteProducts"
+              class="w-100 bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.delete"
+              @update:radio="updated => (departments.state.department.accesses.events.delete = !departments.state.department.accesses.events.delete)"
+            />
             <h4>Gallery</h4>
             <Checkbox
               label="Read gallery"
@@ -147,6 +176,13 @@
               :radio="departments.state.department.accesses.gallery.read"
               @update:radio="updated => (departments.state.department.accesses.gallery.read = !departments.state.department.accesses.gallery.read)"
             />
+            <Checkbox
+              label="Create photos"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.gallery.create"
+              @update:radio="updated => (departments.state.department.accesses.gallery.create = !departments.state.department.accesses.gallery.create)"
+            />
             <Checkbox
               label="Edit gallery"
               name="editProducts"

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

@@ -2,6 +2,8 @@
 	<div class="">
 		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
 		
+		{{auth.state.accesses}}
+
 		<Menu 
 			class="bg-light mn-b-semi"
 		>
@@ -97,7 +99,7 @@
 		  <MenuItem 
 		  	v-if="hasAccess(route.params._id, 'events', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Backoffice Events', 
+		  		name: 'Events Backoffice', 
 		  		params: {
 		  			_id: route.params._id
 		  		}

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

@@ -29,7 +29,6 @@ const controllerFactory = (db) => {
       [sortParam]: sortOrder === 'desc' ? -1 : 1,
       "_id": 1
     };
-    console.log(sort)
     // if (sortParam === 'distance') sort.numberOfSpots = -1
     //////////////////////////////////////
     // 2. Pagination Condition
@@ -66,7 +65,34 @@ const controllerFactory = (db) => {
       ...(req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : []),
       ...(req.query.member ? [{"memberships.user": new ObjectId(req.query.member), "memberships.role": 'member' } ] : [] ),
       ...(req.query.subscriber ? [{"memberships.user": new ObjectId(req.query.subscriber), "memberships.role": 'subscriber'} ] : [] ),
-      ...(req.query.postable ? [{$or: [{$and: [{ types: { $elemMatch: { $eq: 'public' } } }, { "memberships.user": new ObjectId(req.query.postable) } ] }, {$and: [{types: {$elemMatch: {$in: ['exclusive', 'hidden'] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: 'subscriber' } } ] } ] } ] : [] ),
+      ...(
+        req.query.postable ? [{ 
+          $or: [{ 
+            owner: new ObjectId(req.query.postable) 
+          },{ 
+            $and: [{ 
+              types: { 
+                $elemMatch: { $eq: 'public' } 
+              } 
+            }, { 
+              "memberships.user": new ObjectId(req.query.postable) 
+            }] 
+          }, { 
+            $and: [{ 
+              types: { 
+                $elemMatch: { 
+                  $in: ['exclusive', 'hidden'] 
+                } }
+              }, { 
+                "memberships.user": new ObjectId(req.query.postable) 
+              }, { 
+                "memberships.role": { 
+                  $ne: 'subscriber' 
+                } 
+              }] 
+          }] 
+        }] : []
+      ),
       ...(req.query.types ?  [{ types: { $in: req.query.types } }] : []),  // Если req.query.types - строка
       // to remove
       ...(req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : []),
@@ -323,7 +349,6 @@ const controllerFactory = (db) => {
     ];
 
     try {
-      console.log(stages)
       const organizations = await Organization.aggregate(stages);
       res.status(200).send(organizations);
     } catch(err) {
@@ -456,36 +481,4 @@ const controllerFactory = (db) => {
   };
 };
 
-async function getGeoLocation(req, res) {
-  let { location, address, city, state, country } = req.query;
-
-  if (!location && (address || city || state || country)) {
-    let geoLocation;
-
-    try {
-      const geoResponse = await client.geocode({
-        params: {
-          address: `${state}, ${country}`,
-          key: 'AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI',
-        },
-      });
-
-      if (geoResponse.data.results && geoResponse.data.results.length > 0) {
-        return geoResponse.data.results[0].geometry.location;
-      } else {
-        return res.status(400).send({ message: 'Unable to geocode the provided location.' });
-      }
-    } catch (err) {
-      console.log(err)
-      return res.status(500).send({ message: 'Error occurred while geocoding.' });
-    }
-  } else if (location) {
-    if (typeof location === 'string') {
-      location = JSON.parse(location);
-    }
-
-    return { lat: location.coordinates[1], lng: location.coordinates[0] };
-  }
-}
-
 module.exports = controllerFactory;

package/src/modules/organizations/middlewares/verifyAccesses.js

@@ -0,0 +1,117 @@
+const middlewareFactory = (db) => {
+  const User = db.user;
+  const Organization = db.organization;
+  const Department = db.department;
+
+  const verifyAccess = (resource, accessType) => {
+    return async (req, res, next) => {
+      try {
+        const userId = req.userId ? new db.mongoose.Types.ObjectId(req.userId) : null;
+
+        let ownerData = req.body.owner || req.query.owner;
+
+        let accessResult = {
+          isAuthenticated: userId !== null,
+          isOrgOwner: false,
+          isOrgMember: false,
+          isAuthorized: false,
+          isPersonalOwner: false
+        };
+
+        // Проверка, является ли owner объектом
+        if (typeof ownerData === 'object' && ownerData !== null) {
+          if (ownerData.type === 'Organization') {
+            ownerData = ownerData.target;
+          } else if (ownerData.type === 'User') {
+            accessResult.isPersonalOwner = ownerData.target === userId.toString();
+          }
+        }
+
+        // Если это личный ресурс пользователя
+        if (accessResult.isPersonalOwner) {
+          accessResult.isAuthorized = true;
+          req.accessResult = accessResult;
+          return next();
+        }
+
+        // Если owner - организация
+        if (!accessResult.isPersonalOwner) {
+          console.log('owner data', ownerData)
+          const ownerOrgId = new db.mongoose.Types.ObjectId(ownerData);
+
+          // Проверка на владельца организации
+          accessResult.isOrgOwner = await Organization.exists({
+            _id: ownerOrgId,
+            owner: userId
+          });
+
+          if (accessResult.isOrgOwner) {
+            accessResult.isAuthorized = true;
+            req.accessResult = accessResult;
+            return next();
+          }
+
+          // Проверка членства в организации
+          const departments = await Department.find({
+            organization: ownerOrgId,
+            'members.user': userId
+          });
+
+          accessResult.isOrgMember = departments.length > 0;
+
+          if (accessResult.isOrgMember) {
+            // Проверка прав доступа
+            accessResult.isAuthorized = departments.some(department => {
+              const accessRights = department.accesses[resource];
+              return accessRights && accessRights[accessType];
+            });
+          }
+        }
+
+        req.accessResult = accessResult;
+        next();
+      } catch (err) {
+        console.error('Access control errorCode:', err);
+        return res.status(403).json({ errorCode: 'ACCESS_DENIED' });
+      }
+    };
+  };
+
+  const handleAccessResult = (options = {}) => {
+    return (req, res, next) => {
+      const { accessResult } = req;
+      console.log('accesses is', accessResult);
+      if (!accessResult) {
+        return res.status(500).json({ errorCode: 'INTERNAL_ERROR' });
+      }
+
+      // Проверка аутентификации
+      if (!accessResult.isAuthenticated && !options.allowUnauthenticated) {
+        return res.status(401).json({ errorCode: 'UNAUTHORIZED' });
+      }
+
+      // Обработка различных сценариев доступа
+      if (accessResult.isAuthorized || accessResult.isPersonalOwner) {
+        // Пользователь авторизован или является личным владельцем, разрешаем доступ
+        return next();
+      } else if (options.allowPublished && req.method === 'GET') {
+        // Разрешаем доступ только к опубликованным ресурсам для GET-запросов
+        req.query.status = 'published';
+        return next();
+      } else if (options.customCheck && options.customCheck(accessResult, req)) {
+        // Пользовательская проверка доступа
+        return next();
+      }
+
+      // Если ни одно из условий не выполнено, отказываем в доступе
+      return res.status(403).json({ errorCode: 'ACCESS_DENIED' });
+    };
+  };
+
+  return {
+    verifyAccess,
+    handleAccessResult
+  };
+};
+
+module.exports = middlewareFactory;

package/src/modules/organizations/models/department.model.js

@@ -1,3 +1,5 @@
+const accessesSchema = require('./schemas/accesses.schema.js');
+
 module.exports = (mongoose) => {
   // Схема отдела
   const departmentSchema = new mongoose.Schema({
@@ -27,92 +29,7 @@ module.exports = (mongoose) => {
       default: false,
     },
 
-    accesses: {
-      members: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      gallery: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      leftovers: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      products: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      orders: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        confirm: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      departments: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-    },
+    accesses: accessesSchema,
 
     // Marketplace options
     delivery: [String],

package/src/modules/organizations/models/organization.model.js

@@ -1,5 +1,8 @@
 const applyEngagementSchema = require('@pf/src/modules/globals/models/schemas/engagement.schema.js');
 
+const accessesSchema = require('./schemas/accesses.schema.js');
+
+
 module.exports = (db) => {
   const OrganizationSchema = new db.mongoose.Schema({
     // Creator and owner of organizations
@@ -17,6 +20,9 @@ module.exports = (db) => {
       type: Array,
       required: true,
     },
+    
+    accesses: accessesSchema,
+
     // Information for profile
     profile: {
       photo: String,
@@ -44,10 +50,6 @@ module.exports = (db) => {
       instagram: String,
       youtube: String
     },
-    // departments 
-    structure: {
-      type: [Object],
-    },
     // Computed Rating
     rating: {
       popularity: {