@ozdao/martyrs 0.2.477 → 0.2.479

package/src/modules/organizations/controllers/utils/queryProcessorOrganizations.js

@@ -1,80 +1,58 @@
-const ObjectId = require('mongoose').Types.ObjectId;
-const { Client } = require('@googlemaps/google-maps-services-js');
-
+import * as googleMapsServicesJs from '@googlemaps/google-maps-services-js';
+import { Types } from 'mongoose';
+const ObjectId = { Types }.Types.ObjectId;
+const { Client } = googleMapsServicesJs;
 const client = new Client({});
-
-
-const getRequestedLookups = query => 
-  query.lookup ? (Array.isArray(query.lookup) ? query.lookup : [query.lookup]) : [];
-
-
+const getRequestedLookups = query => (query.lookup ? (Array.isArray(query.lookup) ? query.lookup : [query.lookup]) : []);
 const getLookupStages = (requestedLookups, configs) => {
   if (!requestedLookups) return [];
-  
-  const lookupsArray = Array.isArray(requestedLookups) 
-    ? requestedLookups 
-    : requestedLookups.split(',');
-    
+  const lookupsArray = Array.isArray(requestedLookups) ? requestedLookups : requestedLookups.split(',');
   return lookupsArray
     .map(lookup => configs[lookup])
     .filter(Boolean)
     .flatMap(config => [
-      { $lookup: config.lookup },  // Оберните lookup в объект с $lookup
-      ...(config.additionalStages || [])
+      { $lookup: config.lookup }, // Оберните lookup в объект с $lookup
+      ...(config.additionalStages || []),
     ]);
-}
-
-const getLocationStages = async (query) => {
+};
+const getLocationStages = async query => {
   if (!hasLocationParams(query)) {
     return { stages: [], userLocation: null };
   }
-
   const location = await resolveLocation(query);
   const radius = getRadius(query);
-  const geoStages = radius ? [
-    {
-      $match: {
-        "spots.location.coordinates": {
-          $geoWithin: {
-            $centerSphere: [[location.coordinates[0], location.coordinates[1]], radius]
-          }
-        }
-      }
-    }
-  ] : [];
-
+  const geoStages = radius
+    ? [
+        {
+          $match: {
+            'spots.location.coordinates': {
+              $geoWithin: {
+                $centerSphere: [[location.coordinates[0], location.coordinates[1]], radius],
+              },
+            },
+          },
+        },
+      ]
+    : [];
   return {
     stages: [...geoStages, ...getDistanceStages(location)],
-    userLocation: location
+    userLocation: location,
   };
 };
-
-const getRadius = (query) => {
+const getRadius = query => {
   if (query.locationRadius) return parseFloat(query.locationRadius) / 6378.1;
   if (query.city) return 25 / 6378.1;
   if (query.state) return 50 / 6378.1;
   return null;
 };
-
-const hasLocationParams = query => 
-  query.location || query.address || query.city || query.state || query.country;
-
-const resolveLocation = async (query) => {
+const hasLocationParams = query => query.location || query.address || query.city || query.state || query.country;
+const resolveLocation = async query => {
   if (query.location) {
-    const parsedLocation = typeof query.location === 'string' ? 
-      JSON.parse(query.location) : query.location;
-    
-    const coordinates = parsedLocation.lng ? 
-      [parsedLocation.lng, parsedLocation.lat] : 
-      parsedLocation.coordinates;
-
+    const parsedLocation = typeof query.location === 'string' ? JSON.parse(query.location) : query.location;
+    const coordinates = parsedLocation.lng ? [parsedLocation.lng, parsedLocation.lat] : parsedLocation.coordinates;
     return { coordinates: coordinates.map(coord => parseFloat(coord)) };
   }
-
-  const searchString = [query.address, query.city, query.state, query.country]
-    .filter(Boolean)
-    .join(', ');
-  
+  const searchString = [query.address, query.city, query.state, query.country].filter(Boolean).join(', ');
   try {
     const geoResponse = await client.geocode({
       params: {
@@ -82,28 +60,25 @@ const resolveLocation = async (query) => {
         key: process.env.GOOGLE_MAPS_API_KEY,
       },
     });
-
     if (!geoResponse.data.results?.length) {
       throw new Error('Unable to geocode the provided location.');
     }
-
     const { lng, lat } = geoResponse.data.results[0].geometry.location;
     return { coordinates: [lng, lat] };
   } catch (err) {
     throw new Error('Error occurred while geocoding.');
   }
 };
-
-const getDistanceStages = (location) => [
+const getDistanceStages = location => [
   {
     $addFields: {
       spots: {
         $map: {
-          input: "$spots",
-          as: "spot",
+          input: '$spots',
+          as: 'spot',
           in: {
             $mergeObjects: [
-              "$$spot",
+              '$$spot',
               {
                 distance: {
                   $function: {
@@ -128,123 +103,125 @@ const getDistanceStages = (location) => [
                       var d = R * c;
                       return d;
                     }`,
-                    args: ["$$spot.location.coordinates", location.coordinates, false],
-                    lang: "js"
-                  }
-                }
-              }
-            ]
-          }
-        }
-      }
-    }
+                    args: ['$$spot.location.coordinates', location.coordinates, false],
+                    lang: 'js',
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    },
   },
   {
     $addFields: {
-      distance: { $min: "$spots.distance" },
+      distance: { $min: '$spots.distance' },
       distanceExist: {
-        $cond: { 
-          if: { $eq: [{ $type: "$distance" }, "double"] }, 
-          then: true, 
-          else: false 
-        }
-      }
-    }
-  }
+        $cond: {
+          if: { $eq: [{ $type: '$distance' }, 'double'] },
+          then: true,
+          else: false,
+        },
+      },
+    },
+  },
 ];
-
-const getPriceConditions = (prices) => {
+const getPriceConditions = prices => {
   if (!prices) return [];
-  
   const priceRanges = prices.split(',');
   const priceConditions = priceRanges.map(priceRange => {
-    if (priceRange.startsWith('<')) return { "products.price": { $lt: parseInt(priceRange.slice(1)) } };
-    if (priceRange.startsWith('>')) return { "products.price": { $gt: parseInt(priceRange.slice(1)) } };
+    if (priceRange.startsWith('<')) return { 'products.price': { $lt: parseInt(priceRange.slice(1)) } };
+    if (priceRange.startsWith('>')) return { 'products.price': { $gt: parseInt(priceRange.slice(1)) } };
     const [min, max] = priceRange.split('-').map(Number);
-    return { "products.price": { $gte: min, $lte: max } };
+    return { 'products.price': { $gte: min, $lte: max } };
   });
-
   return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
 };
-
-const getContainConditions = (contain) => {
+const getContainConditions = contain => {
   if (!contain) return [];
-  
   const conditions = contain.map(property => ({
-    [property]: { $exists: true, $not: { $size: 0 } }
+    [property]: { $exists: true, $not: { $size: 0 } },
   }));
-
   // Return a flat object rather than an array with a $match object
   return conditions.length > 0 ? [{ $match: { $and: conditions } }] : [];
 };
-
-const getBasicMatchConditions = (query) => [
+const getBasicMatchConditions = query => [
   ...(query._id ? [{ _id: new ObjectId(query._id) }] : []),
   ...(query.owner ? [{ owner: new ObjectId(query.owner) }] : []),
   ...(query.types ? [{ types: { $in: query.types } }] : []),
-  ...(query.member ? [{
-      memberships: {
-        $elemMatch: {
-          user: new ObjectId(query.member),
-          role: 'member'
-        }
-      }
-    }] : []),
-    ...(query.subscriber ? [{
-      memberships: {
-        $elemMatch: {
-          user: new ObjectId(query.subscriber),
-          role: 'subscriber'
-        }
-      }
-    }] : []),
-  ...(query.categories?.split(',').length > 0 ? [{ "products.category": { $in: query.categories?.split(',') } }] : []),
-  ...(query.delivery?.split(',').length > 0 ? [{ "spots.delivery": { $all: query.delivery?.split(',') } }] : [])
-];
-
-const getPostableConditions = (postableId) => {
-  if (!postableId) return [];
-  
-  return [{
-    $match: {
-      $or: [
-        { owner: new ObjectId(postableId) },
-        { 
-          $and: [
-            { types: { $elemMatch: { $eq: 'public' } } },
-            { memberships: { 
-                $elemMatch: { 
-                  user: new ObjectId(postableId)
-                }
-              }
-            }
-          ]
+  ...(query.member
+    ? [
+        {
+          memberships: {
+            $elemMatch: {
+              user: new ObjectId(query.member),
+              role: 'member',
+            },
+          },
         },
+      ]
+    : []),
+  ...(query.subscriber
+    ? [
         {
-          $and: [
-            { types: { $elemMatch: { $in: ['exclusive', 'hidden'] } } },
-            { memberships: { 
-                $elemMatch: { 
-                  user: new ObjectId(postableId),
-                  role: { $ne: 'subscriber' }
-                }
-              }
-            }
-          ]
-        }
+          memberships: {
+            $elemMatch: {
+              user: new ObjectId(query.subscriber),
+              role: 'subscriber',
+            },
+          },
+        },
       ]
-    }
-  }];
+    : []),
+  ...(query.categories?.split(',').length > 0 ? [{ 'products.category': { $in: query.categories?.split(',') } }] : []),
+  ...(query.delivery?.split(',').length > 0 ? [{ 'spots.delivery': { $all: query.delivery?.split(',') } }] : []),
+];
+const getPostableConditions = postableId => {
+  if (!postableId) return [];
+  return [
+    {
+      $match: {
+        $or: [
+          { owner: new ObjectId(postableId) },
+          {
+            $and: [
+              { types: { $elemMatch: { $eq: 'public' } } },
+              {
+                memberships: {
+                  $elemMatch: {
+                    user: new ObjectId(postableId),
+                  },
+                },
+              },
+            ],
+          },
+          {
+            $and: [
+              { types: { $elemMatch: { $in: ['exclusive', 'hidden'] } } },
+              {
+                memberships: {
+                  $elemMatch: {
+                    user: new ObjectId(postableId),
+                    role: { $ne: 'subscriber' },
+                  },
+                },
+              },
+            ],
+          },
+        ],
+      },
+    },
+  ];
 };
-
-module.exports = {
+export { getBasicMatchConditions, getContainConditions, getDistanceStages, getLocationStages, getLookupStages, getPostableConditions, getPriceConditions, getRequestedLookups };
+export default {
   getRequestedLookups,
   getLookupStages,
-  // 
   getPriceConditions,
   getContainConditions,
   getLocationStages,
   getDistanceStages,
   getBasicMatchConditions,
-  getPostableConditions
-};
+  getPostableConditions,
+};

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

@@ -1,23 +1,19 @@
-const middlewareFactory = (db) => {
+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
+          isPersonalOwner: false,
         };
-
         // Проверка, является ли owner объектом
         if (typeof ownerData === 'object' && ownerData !== null) {
           if (ownerData.type === 'Organization') {
@@ -26,39 +22,32 @@ const middlewareFactory = (db) => {
             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)
+          console.log('owner data', ownerData);
           const ownerOrgId = new db.mongoose.Types.ObjectId(ownerData);
-
           // Проверка на владельца организации
           accessResult.isOrgOwner = await Organization.exists({
             _id: ownerOrgId,
-            owner: userId
+            owner: userId,
           });
-
           if (accessResult.isOrgOwner) {
             accessResult.isAuthorized = true;
             req.accessResult = accessResult;
             return next();
           }
-
           // Проверка членства в организации
           const departments = await Department.find({
             organization: ownerOrgId,
-            'members.user': userId
+            'members.user': userId,
           });
-
           accessResult.isOrgMember = departments.length > 0;
-
           if (accessResult.isOrgMember) {
             // Проверка прав доступа
             accessResult.isAuthorized = departments.some(department => {
@@ -67,7 +56,6 @@ const middlewareFactory = (db) => {
             });
           }
         }
-
         req.accessResult = accessResult;
         next();
       } catch (err) {
@@ -76,7 +64,6 @@ const middlewareFactory = (db) => {
       }
     };
   };
-
   const handleAccessResult = (options = {}) => {
     return (req, res, next) => {
       const { accessResult } = req;
@@ -84,12 +71,10 @@ const middlewareFactory = (db) => {
       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) {
         // Пользователь авторизован или является личным владельцем, разрешаем доступ
@@ -102,16 +87,13 @@ const middlewareFactory = (db) => {
         // Пользовательская проверка доступа
         return next();
       }
-
       // Если ни одно из условий не выполнено, отказываем в доступе
       return res.status(403).json({ errorCode: 'ACCESS_DENIED' });
     };
   };
-
   return {
     verifyAccess,
-    handleAccessResult
+    handleAccessResult,
   };
 };
-
-module.exports = middlewareFactory;
+export default middlewareFactory;

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

@@ -1,89 +1,74 @@
-const mongoose = require('mongoose');
-const { AccessControlManager, PolicyRule } = require('@martyrs/src/modules/access-control');
-
-const middlewareFactory = (db) => {
+import accessControl from '@martyrs/src/modules/access-control.js';
+import mongoose from 'mongoose';
+const { AccessControlManager, PolicyRule } = accessControl;
+const middlewareFactory = db => {
   // Получаем модели из базы данных
   const User = db.user;
   const Organization = db.organization;
   const Department = db.department;
-
   // Создаем абстрактный менеджер контроля доступа
-  const createAccessControlManager = (resourceName) => {
+  const createAccessControlManager = resourceName => {
     const accessControlManager = new AccessControlManager({
       User,
       Organization,
       Department,
-      [resourceName]: db[resourceName.toLowerCase()]
+      [resourceName]: db[resourceName.toLowerCase()],
     });
-
     // Политика по умолчанию для владения личным ресурсом
-    accessControlManager.registerPolicy(new PolicyRule(
-      'PersonalResourceOwnerPolicy',
-      async (attributes) => {
+    accessControlManager.registerPolicy(
+      new PolicyRule('PersonalResourceOwnerPolicy', async attributes => {
         // Проверка личного владения ресурсом
         if (attributes.resource.owner?.type === 'User') {
           return {
             allowed: attributes.resource.owner.target === attributes.user.id,
-            reason: 'Personal resource ownership'
+            reason: 'Personal resource ownership',
           };
         }
         return { allowed: false };
-      }
-    ));
-
+      })
+    );
     // Политика для организационных ресурсов
-    accessControlManager.registerPolicy(new PolicyRule(
-      'OrganizationAccessPolicy',
-      async (attributes) => {
+    accessControlManager.registerPolicy(
+      new PolicyRule('OrganizationAccessPolicy', async attributes => {
         // Проверка доступа к ресурсам организации
         if (attributes.resource.owner?.type === 'Organization') {
           const orgId = attributes.resource.owner.target;
-          
           // Проверка на владельца организации
           const isOrgOwner = await Organization.exists({
             _id: new mongoose.Types.ObjectId(orgId),
-            owner: attributes.user.id
+            owner: attributes.user.id,
           });
-
           if (isOrgOwner) {
-            return { 
-              allowed: true, 
-              reason: 'Organization Owner' 
+            return {
+              allow: true,
+              force: true,
+              reason: 'Organization Owner',
             };
           }
-
           // Проверка членства в организации и прав доступа
           const departments = await Department.find({
             organization: new mongoose.Types.ObjectId(orgId),
-            'members.user': attributes.user.id
+            'members.user': attributes.user.id,
           });
-
           // Динамическая проверка прав доступа для конкретного ресурса и действия
           const hasAccess = departments.some(department => {
             const accessRights = department.accesses[resourceName];
             return accessRights && accessRights[attributes.action.type];
           });
-
           return {
             allowed: hasAccess,
-            reason: hasAccess 
-              ? 'Organization Member with Access Rights' 
-              : 'No Access Rights in Organization'
+            reason: hasAccess ? 'Organization Member with Access Rights' : 'No Access Rights in Organization',
           };
         }
-
         return { allowed: false };
-      }
-    ));
-
+      })
+    );
     return accessControlManager;
   };
-
   // Создаем методы verify и handle для совместимости со старым подходом
   const verifyAccess = (resource, accessType, options = {}) => {
     return async (req, res, next) => {
       const accessControlManager = createAccessControlManager(resource);
-
       const context = {
         userId: req.userId ? new db.mongoose.Types.ObjectId(req.userId) : null,
         userRoles: req.user ? req.user.roles : [],
@@ -94,37 +79,30 @@ const middlewareFactory = (db) => {
         actionType: accessType,
         requestMethod: req.method,
         ipAddress: req.ip,
-        deviceType: req.get('User-Agent')
+        deviceType: req.get('User-Agent'),
       };
-
       const accessResult = await accessControlManager.checkAccess(context);
-
       // Формируем accessResult в старом формате для обратной совместимости
       req.accessResult = {
         isAuthenticated: context.userId !== null,
         isOrgOwner: accessResult.reason === 'Organization Owner',
         isOrgMember: accessResult.reason.includes('Organization Member'),
         isAuthorized: accessResult.allowed,
-        isPersonalOwner: accessResult.reason === 'Personal resource ownership'
+        isPersonalOwner: accessResult.reason === 'Personal resource ownership',
       };
-
       next();
     };
   };
-
   const handleAccessResult = (options = {}) => {
     return (req, res, next) => {
       const { accessResult } = req;
-
       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();
@@ -134,15 +112,12 @@ const middlewareFactory = (db) => {
       } else if (options.customCheck && options.customCheck(accessResult, req)) {
         return next();
       }
-
       return res.status(403).json({ errorCode: 'ACCESS_DENIED' });
     };
   };
-
   return {
     verifyAccess,
-    handleAccessResult
+    handleAccessResult,
   };
 };
-
-module.exports = middlewareFactory;
+export default middlewareFactory;