@ozdao/martyrs 0.2.564 → 0.2.566

package/src/modules/auth/auth.router.js

@@ -1,262 +0,0 @@
-// auth.meta.js
-import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
-import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
-import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
-import IconPlus from '@martyrs/src/modules/icons/navigation/IconPlus.vue';
-import { navigationItems } from '@martyrs/src/modules/auth/views/configs/navigation.user.config.js';
-import ProfileCard from '@martyrs/src/modules/auth/views/components/blocks/ProfileCard.vue';
-import HelpCard from '@martyrs/src/modules/core/views/components/blocks/HelpCard.vue';
-
-const { isPhone, isTablet } = useGlobalMixins();
-
-export function getRoutes(options = {}) {
-  const route = options.route || 'Home';
-  const routes = [];
-  
-  // Auth routes
-  routes.push({
-    parentName: route,
-    config: {
-      basePath: 'auth',
-      component: () => import(/* webpackChunkName: "auth-layout" */ './views/components/layouts/Auth.vue'),
-      meta: {
-        title: {
-          en: 'Аутентификация',
-          ru: 'Authentication',
-        },
-      },
-      routes: [
-        {
-          path: 'signin',
-          name: 'Sign In',
-          beforeEnter: [
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.requiresNoAuth),
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.resetUser),
-          ],
-          meta: {
-            title: {
-              en: 'Sign In',
-              ru: 'Вход',
-            },
-          },
-          component: () => import(/* webpackChunkName: "signin" */ './views/components/pages/SignIn.vue'),
-        },
-        {
-          path: 'reset-password',
-          name: 'Reset Password',
-          beforeEnter: [
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.requiresNoAuth),
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.resetUser),
-          ],
-          meta: {
-            title: {
-              en: 'Reset Password',
-              ru: 'Сбросить Пароль',
-            },
-          },
-          component: () => import(/* webpackChunkName: "reset-password" */ './views/components/pages/ResetPassword.vue'),
-        },
-        {
-          path: 'signup',
-          name: 'Sign Up',
-          beforeEnter: [
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.requiresNoAuth),
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.resetUser),
-          ],
-          meta: {
-            title: {
-              en: 'Sign Up',
-              ru: 'Регистрация',
-            },
-          },
-          component: () => import(/* webpackChunkName: "signup" */ './views/components/pages/SignUp.vue'),
-        },
-        {
-          path: 'enter-code',
-          name: 'Enter Code',
-          beforeEnter: [
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.requiresNoAuth),
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.checkUser),
-          ],
-          meta: {
-            title: {
-              en: 'Enter Code',
-              ru: 'Введите Код',
-            },
-          },
-          component: () => import(/* webpackChunkName: "signup" */ './views/components/pages/EnterCode.vue'),
-        },
-        {
-          path: 'enter-password',
-          name: 'Enter Password',
-          beforeEnter: [
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.requiresNoAuth),
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.checkUser),
-          ],
-          meta: {
-            title: {
-              en: 'Enter Password',
-              ru: 'Введите Пароль',
-            },
-          },
-          component: () => import(/* webpackChunkName: "signup" */ './views/components/pages/EnterPassword.vue'),
-        },
-        {
-          path: 'invite',
-          name: 'Invite',
-          beforeEnter: [
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.requiresNoAuth),
-            () => import(/* webpackChunkName: "auth-validation" */ './views/middlewares/auth.validation.js').then(m => m.resetUser),
-          ],
-          meta: {
-            title: {
-              en: 'Invite',
-              ru: 'Приглашение',
-            },
-          },
-          component: () => import(/* webpackChunkName: "signup" */ './views/components/pages/Invite.vue'),
-        },
-      ],
-    }
-  });
-  
-  // Users routes
-  routes.push({
-    parentName: route,
-    config: {
-      basePath: 'users',
-      meta: {
-        title: {
-          en: 'Users',
-          ru: 'Пользователи',
-        },
-      },
-      routes: [
-        {
-          path: ':_id',
-          name: 'User Profile Root',
-          meta: {
-            title: {
-              en: 'Profile',
-              ru: 'Профиль',
-            },
-            sidebar_hover: false,
-            sidebar_navigation_items: navigationItems,
-            sidebar_header_component: ProfileCard,
-            sidebar_footer_component: HelpCard,
-            sidebarOpenOnEnter: true,
-            sidebarCloseOnLeave: true
-          },
-          children: [
-            {
-              path: '', // Пустой путь для основного профиля
-              name: 'User Profile',
-              meta: {
-                title: {
-                  en: 'Profile',
-                  ru: 'Профиль',
-                },
-                title_hide: true,
-                hideNavigationBar: route => route.params._id === auth.state.user._id,
-              },
-              component: () => import(/* webpackChunkName: "profile" */ './views/components/pages/Profile.vue'),
-              children: [
-                {
-                  path: 'edit',
-                  name: 'User Edit Profile',
-                  component: () => import(/* webpackChunkName: "profile-edit" */ './views/components/pages/ProfileEdit.vue'),
-                  children: [
-                    {
-                      path: 'profile',
-                      name: 'Profile Edit Profile',
-                      component: () => import(/* webpackChunkName: "profile-edit-profile" */ './views/components/pages/ProfileEditProfile.vue')
-                    },
-                    {
-                      path: 'account', 
-                      name: 'Profile Edit Account',
-                      component: () => import(/* webpackChunkName: "profile-edit-account" */ './views/components/pages/ProfileEditAccount.vue')
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              path: 'dashboard',
-              name: 'User Dashboard',
-              meta: {
-                title: {
-                  en: 'Dashboard',
-                  ru: 'Дашборд',
-                },
-              },
-              beforeEnter: [
-                (to) => {
-                  if (to.params._id !== auth.state.user._id) {
-                    return { name: 'User Profile', params: { _id: to.params._id } };
-                  }
-                }
-              ],
-              component: () => import(/* webpackChunkName: "profile-dashboard" */ './views/components/pages/UserDashboard.vue'),
-            },
-            {
-              path: 'blogposts',
-              name: 'User Posts',
-              meta: {
-                title: {
-                  en: 'Posts',
-                  ru: 'Посты',
-                },
-              },
-              component: () => import(/* webpackChunkName: "profile" */ './views/components/pages/ProfileBlogposts.vue'),
-            },
-            {
-              path: 'events',
-              name: 'User Events',
-              meta: {
-                title: {
-                  en: 'Events',
-                  ru: 'События',
-                },
-              },
-              component: () => import(/* webpackChunkName: "profile" */ '@martyrs/src/modules/events/components/pages/EventsBackoffice.vue'),
-            },
-            {
-              path: 'organizations',
-              name: 'User Organizations',
-              meta: {
-                title: {
-                  en: 'Groups',
-                  ru: 'Группы',
-                },
-                actions: [
-                  {
-                    component: IconPlus,
-                    props: {
-                      fill: 'rgb(var(--main))',
-                    },
-                    condition: () => auth.state.user && auth.state.user._id,
-                    action: router => router.push({ name: 'Create Organization' }),
-                  },
-                ],
-              },
-              component: () => import(/* webpackChunkName: "profile" */ '@martyrs/src/modules/organizations/components/pages/Organizations.vue'),
-            },
-            {
-              path: 'wallet',
-              name: 'User Wallet',
-              meta: {
-                title: {
-                  en: 'Wallet',
-                  ru: 'Кошелек',
-                },
-              },
-              component: () => import(/* webpackChunkName: "profile" */ '@martyrs/src/modules/wallet/views/components/pages/Wallet.vue'),
-            },
-          ],
-        },
-      ],
-    }
-  });
-  
-  return routes;
-}

package/src/modules/core/controllers/classes/abac/v2/abac-core-fixed.js

@@ -1,313 +0,0 @@
-// @martyrs/src/modules/core/controllers/classes/abac/abac.core.js
-export default class ABACCore {
-  constructor(abac) {
-    this.abac = abac;
-    this.runningPolicies = new Map();
-  }
-
-  /**
-   * Нормализация контекста
-   */
-  normalizeContext(input) {
-    const context = {
-      user: null,
-      action: null,
-      resource: null,
-      currentResource: null,
-      resourceId: null, // Добавляем ID ресурса для кэша
-      data: {},
-      req: null,
-      socket: null,
-      params: {},
-      _cache: new Map(),
-      _abac: this.abac,
-      skipFieldPolicies: input.skipFieldPolicies || false,
-    };
-
-    if (input.req) {
-      // Express context - НЕ смешиваем body и query!
-      context.user = input.user || input.req.userId;
-      context.data = {
-        body: input.req.body || {},
-        query: input.req.query || {},
-        params: input.req.params || {},
-      };
-      context.params = input.req.params;
-      context.req = input.req;
-      
-      // Извлекаем ID ресурса для кэша
-      context.resourceId = input.req.params?._id || 
-                          input.req.params?.id || 
-                          input.req.body?._id ||
-                          input.req.body?.id;
-    } else if (input.socket) {
-      // WebSocket context
-      context.user = input.user || input.socket.userId;
-      context.socket = input.socket;
-      context.data = input.data || {};
-      context.resourceId = input.data?._id || input.data?.id;
-    }
-
-    // Merge остальные поля (но не перезаписываем data)
-    return Object.assign(context, {
-      ...input,
-      data: context.data // Сохраняем структурированную data
-    });
-  }
-
-  /**
-   * Выполнение политики с кэшированием
-   */
-  async executePolicyWithCache(policyName, policyFn, context) {
-    // Проверяем контекстный кэш
-    const contextCacheKey = `${policyName}_${context.action}`;
-    if (context._cache.has(contextCacheKey)) {
-      return context._cache.get(contextCacheKey);
-    }
-
-    // Улучшенный глобальный кэш-ключ с ID ресурса
-    const globalCacheKey = this._buildCacheKey(policyName, context);
-    
-    if (this.abac.options.cacheEnabled) {
-      const cached = await this.abac.cache.get(globalCacheKey);
-      if (cached !== undefined) {
-        context._cache.set(contextCacheKey, cached);
-        return cached;
-      }
-    }
-
-    // Выполняем политику
-    const result = await policyFn(context);
-    
-    // Сохраняем в кэш
-    context._cache.set(contextCacheKey, result);
-    if (this.abac.options.cacheEnabled) {
-      const tags = [
-        `user_${context.user}`,
-        `resource_${context.resource}`,
-        `policy_${policyName}`
-      ];
-      
-      if (context.resourceId) {
-        tags.push(`resourceId_${context.resourceId}`);
-      }
-      
-      await this.abac.cache.setWithTags(globalCacheKey, result, tags);
-    }
-
-    return result;
-  }
-
-  /**
-   * Построение ключа кэша с учетом ID ресурса
-   * @private
-   */
-  _buildCacheKey(policyName, context) {
-    const parts = [
-      'policy',
-      policyName,
-      context.user,
-      context.resource,
-      context.action
-    ];
-    
-    if (context.resourceId) {
-      parts.push(context.resourceId);
-    }
-    
-    return parts.join('_');
-  }
-
-  /**
-   * Выполнение политик с ограничением параллельности
-   */
-  async executePoliciesLimited(policies, context, stopOnDeny = false) {
-    const results = [];
-    const limit = this.abac.options.concurrencyLimit;
-    
-    // Разбиваем на батчи
-    const batches = [];
-    for (let i = 0; i < policies.length; i += limit) {
-      batches.push(policies.slice(i, i + limit));
-    }
-
-    for (const batch of batches) {
-      const batchPromises = batch.map(async ([name, policy]) => {
-        try {
-          const policyFn = typeof policy === 'function' ? policy : policy.fn;
-          const result = await this.executePolicyWithCache(name, policyFn, context);
-          return { name, result: this.normalizeResult(result, name) };
-        } catch (error) {
-          this.abac.logger?.error('Policy execution error', { 
-            policy: name, 
-            error: error.message,
-            stack: error.stack 
-          });
-          
-          return { 
-            name, 
-            result: { 
-              allow: !this.abac.options.strictMode, 
-              reason: `POLICY_ERROR_${name.toUpperCase()}` 
-            },
-            error
-          };
-        }
-      });
-
-      const batchResults = await Promise.all(batchPromises);
-      results.push(...batchResults);
-
-      // Проверяем нужно ли остановиться
-      if (stopOnDeny) {
-        const shouldStop = batchResults.some(r => !r.result.allow || r.result.force);
-        if (shouldStop) break;
-      }
-    }
-
-    return results;
-  }
-
-  /**
-   * Нормализация результата политики
-   */
-  normalizeResult(result, policyName) {
-    if (this.abac.options.strictMode && result === undefined) {
-      return { 
-        allow: false, 
-        force: false, 
-        reason: `UNDEFINED_IN_STRICT_MODE_${policyName.toUpperCase()}` 
-      };
-    }
-    
-    if (result && typeof result === 'object' && ('allow' in result || 'force' in result)) {
-      return {
-        allow: result.allow !== undefined ? !!result.allow : true,
-        force: !!result.force,
-        reason: result.reason || `POLICY_${policyName.toUpperCase()}`,
-      };
-    }
-    
-    if (result === true) {
-      return { 
-        allow: true, 
-        force: false, 
-        reason: `ALLOWED_BY_${policyName.toUpperCase()}` 
-      };
-    }
-    if (result === false) {
-      return { 
-        allow: false, 
-        force: false, 
-        reason: `DENIED_BY_${policyName.toUpperCase()}` 
-      };
-    }
-    
-    return { 
-      allow: !this.abac.options.strictMode, 
-      force: false, 
-      reason: `NEUTRAL_${policyName.toUpperCase()}` 
-    };
-  }
-
-  /**
-   * Основной метод проверки доступа
-   */
-  async checkAccess(rawContext, customPolicies = {}) {
-    const startTime = Date.now();
-    const context = this.normalizeContext(rawContext);
-
-    // Проверка сервисного запроса
-    if (context.isServiceRequest) {
-      return { allow: true, reason: 'SERVICE_REQUEST_ALLOWED' };
-    }
-
-    // Проверка аутентификации
-    if (!context.user && !context.options?.allowUnauthenticated) {
-      return { allow: false, reason: 'UNAUTHENTICATED_ACCESS_DENIED' };
-    }
-
-    // Предзагрузка ресурса
-    if (!context.currentResource) {
-      await this.loadResource(context);
-    }
-
-    // Выполнение политик
-    const result = await this.abac.policies.evaluate(context, customPolicies);
-    
-    // Аудит
-    if (this.abac.options.enableAudit) {
-      await this.audit(context, result, Date.now() - startTime);
-    }
-    
-    return result;
-  }
-
-  /**
-   * Загрузка ресурса
-   */
-  async loadResource(context) {
-    const resourceModel = this.abac.getResourceModel(context.resource);
-    if (!resourceModel) return;
-
-    try {
-      let currentResource;
-      // Ищем ID в структурированной data
-      const id = context.resourceId || 
-                 context.data?.body?._id || 
-                 context.data?.params?._id;
-      
-      if (id) {
-        currentResource = await resourceModel.findById(id);
-      } else if (context.data?.body?.url || context.data?.params?.url) {
-        const url = context.data.body?.url || context.data.params?.url;
-        currentResource = await resourceModel.findOne({ url });
-      }
-      
-      if (currentResource) {
-        context.currentResource = currentResource;
-        context.resourceModel = resourceModel;
-        context.resourceId = currentResource._id?.toString();
-      }
-    } catch (error) {
-      this.abac.logger?.error('Resource loading error', { 
-        resource: context.resource,
-        error: error.message 
-      });
-    }
-  }
-
-  /**
-   * Структурированный аудит
-   */
-  async audit(context, result, duration) {
-    try {
-      const auditEntry = {
-        type: 'ACCESS_CHECK',
-        timestamp: new Date().toISOString(),
-        user: context.user,
-        resource: context.resource,
-        resourceId: context.resourceId,
-        action: context.action,
-        result: result.allow,
-        reason: result.reason,
-        duration: duration,
-        ip: context.req?.ip,
-        userAgent: context.req?.get?.('user-agent'),
-        metadata: context.auditMetadata || {}
-      };
-      
-      // Используем структурированное логирование
-      await this.abac.logger.info('Access check', auditEntry);
-      
-      // Если критическое действие - дополнительный алерт
-      if (['delete', 'admin', 'export'].includes(context.action)) {
-        await this.abac.logger.warn('Critical action attempt', auditEntry);
-      }
-    } catch (error) {
-      this.abac.logger?.error('Audit logging error', { 
-        error: error.message 
-      });
-    }
-  }
-}