@ozdao/prometheus-framework 0.2.187 → 0.2.189

package/src/modules/auth/auth.client.js

@@ -1,31 +1,56 @@
-// Components
-import Auth from './components/layouts/Auth.vue';
-import EnterCode from './components/pages/EnterCode.vue';
-import Invite from './components/pages/Invite.vue';
-import EnterPassword from './components/pages/EnterPassword.vue';
-import ResetPassword from './components/pages/ResetPassword.vue';
-import SignUp from './components/pages/SignUp.vue';
-import SignIn from './components/pages/SignIn.vue';
-import SliderFeatures from './components/sections/SliderFeatures.vue';
-
 // Store
-import * as authStore from './store/auth.js';
-import * as twofaStore from './store/twofa.js';
+import * as storeAuth from './views/store/auth.js';
+import * as storeTwofa from './views/store/twofa.js';
+
+// Router
+import routerAuth from './views/router/auth.js';
+
+// Views
+import Auth from './views/components/layouts/Auth.vue';
+import EnterCode from './views/components/pages/EnterCode.vue';
+import Invite from './views/components/pages/Invite.vue';
+import EnterPassword from './views/components/pages/EnterPassword.vue';
+import ResetPassword from './views/components/pages/ResetPassword.vue';
+import SignUp from './views/components/pages/SignUp.vue';
+import SignIn from './views/components/pages/SignIn.vue';
+
+// Importing sections components
+import SliderFeatures from './views/components/sections/SliderFeatures.vue';
+
+// Пример функции инициализации для модуля аутентификации
+function initializeAuth(app, store, router, options = {}) {
+  const route = options.route || 'Home';
+  
+  router.addRoute(route, routerAuth);
+  
+  store.addStore('auth', storeAuth);
+  store.addStore('twofa', storeTwofa);
+}
 
-// Routes
-import authRoutes from './router/auth.js';
+const ModuleAuth = {
+  initialize: initializeAuth,
+  views: {
+    store: {
+      storeAuth,
+      storeTwofa
+    },
+    router: {
+      routerAuth
+    },
+    components: {
+      // Layout
+      Auth,
+      // Pages
+      EnterCode,
+      Invite,
+      EnterPassword,
+      ResetPassword,
+      SignUp,
+      SignIn,
+      // Sections
+      SliderFeatures
+    }
+  }
+}
 
-// Exporting
-export {
-  Auth,
-  EnterCode,
-  Invite,
-  EnterPassword,
-  ResetPassword,
-  SignUp,
-  SignIn,
-  SliderFeatures,
-  authStore,
-  twofaStore,
-  authRoutes
-};
+export default ModuleAuth

package/src/modules/auth/auth.server.js

@@ -1,19 +1,37 @@
-// Importing controllers
-const AuthController = require('./controllers/auth.controller.js');
-const TwoFaController = require('./controllers/twofa.controller.js');
-
-// Importing routes
-const authRoutes = require('./routes/auth.routes.js');
-const twofaRoutes = require('./routes/twofa.routes.js');
-// Importing models (assuming they are also in CommonJS format)
+// Импортируем модели
 const RoleModel = require('./models/role.model.js');
 
+// Импортируем роуты
+const authRoutes = require('./controllers/routes/auth.routes.js');
+const twofaRoutes = require('./controllers/routes/twofa.routes.js');
+
+// Импортируем контроллеры
+const AuthController = require('./controllers/services/auth.service.js');
+const TwoFaController = require('./controllers/services/twofa.service.js');
+
+function initializeAuth(app, db, origins, publicPath) {
+  // Настраиваем модели в объекте базы данных
+  db.role = RoleModel(db);
+
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    authRoutes(app, db, origins, publicPath);
+    twofaRoutes(app, db, origins, publicPath);
+  }
+}
 
-// Exporting
+// Экспортируем контроллеры, роуты и модели
 module.exports = {
-  AuthController,
-  TwoFaController,
-  authRoutes,
-  twofaRoutes,
-  RoleModel,
+  initialize: initializeAuth,
+  models: {
+    RoleModel,
+  },
+  routes: {
+    authRoutes,
+    twofaRoutes,
+  },
+  controllers: {
+    AuthController,
+    TwoFaController,
+  }
 };

package/src/modules/auth/{routes → controllers/routes}/auth.routes.js

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

package/src/modules/auth/{routes → controllers/routes}/twofa.routes.js

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

package/src/modules/auth/controllers/{auth.controller.js → services/auth.service.js}

@@ -1,10 +1,8 @@
 const jwt = require("jsonwebtoken");
 const bcrypt = require("bcryptjs");
 const ObjectId = require('mongoose').Types.ObjectId;
-
-
 // Utils
-const { verifyAppleIdToken } = require('../utils/server/verifyAppleIdToken')
+const { verifyAppleIdToken } = require('../utils/verifyAppleIdToken')
 // Factory
 const controllerFactory = (db) => {
 
@@ -228,6 +226,7 @@ const controllerFactory = (db) => {
       const depts = await Department.find({ 'members.user': uid });
       const ownedOrgs = await Organization.find({ owner: uid });
       const ownedOrgIds = ownedOrgs.map(org => org._id.toString());
+      
       const accesses = {};
 
       const processAccesses = (orgId, isOwner, deptAccesses) => {

package/src/modules/auth/controllers/{twofa.controller.js → services/twofa.service.js}

@@ -1,4 +1,4 @@
-const { sendEmail, sendSms } = require('@pf/src/modules/globals/utils/mailing');
+const { sendEmail, sendSms } = require('@pf/src/modules/globals/controllers/utils/mailing');
 
 const controllerFactory = (db) => {
   const sendcode = async (req, res) => {

package/src/modules/auth/models/role.model.js

@@ -1,10 +1,11 @@
-module.exports = (mongoose) => {
-  const Role = mongoose.model(
-    "Role",
-    new mongoose.Schema({
-      name: String
-    })
-  );
+module.exports = (db) => {
+
+  const RoleSchema = new db.mongoose.Schema({
+     name: String
+  });
+
+  const Role = db.mongoose.model("Role", RoleSchema);
 
   return Role;
-};
+};
+

package/src/modules/auth/{components → views/components}/layouts/Auth.vue

@@ -31,14 +31,14 @@ import Tab from '@pf/src/components/Tab/Tab.vue'
 import Field from '@pf/src/components/Field/Field.vue'
 import Button from '@pf/src/components/Button/Button.vue'
 // Import blocks
-import SliderFeatures from '@pf/src/modules/auth/components/sections/SliderFeatures.vue'
+import SliderFeatures from '@pf/src/modules/auth/views/components/sections/SliderFeatures.vue'
 // Import libs
 import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 // Import state
-import * as auth from '@pf/src/modules/auth/store/auth'
+import * as auth from '@pf/src/modules/auth/views/store/auth'
 // Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 
 const phoneValidation = ref(null)
 const passswordValidation = ref(null)

package/src/modules/auth/{components → views/components}/pages/EnterCode.vue

@@ -66,15 +66,15 @@
 	import { useRoute,useRouter } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
 	// Import state
-	import * as auth 	from '@pf/src/modules/auth/store/auth'
-	import * as twofa 	from '@pf/src/modules/auth/store/twofa'
-	import { setError } from '@pf/src/modules/globals/store/globals'
+	import * as auth 	from '@pf/src/modules/auth/views/store/auth'
+	import * as twofa 	from '@pf/src/modules/auth/views/store/twofa'
+	import { setError } from '@pf/src/modules/globals/views/store/globals'
 	
 	const route = useRoute()
 	const router = useRouter()
 
 	// Localization
-	import text from '@pf/src/modules/auth/localization/EnterCode.json'
+	import text from '@pf/src/modules/auth/views/localization/EnterCode.json'
 	// Localization
 	const { t } = useI18n({
 		useScope: 'global', 

package/src/modules/auth/{components → views/components}/pages/EnterPassword.vue

@@ -46,12 +46,12 @@ import { computed, onMounted, ref, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 // Import state
-import * as auth from '@pf/src/modules/auth/store/auth'
+import * as auth from '@pf/src/modules/auth/views/store/auth'
 // Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 const passswordValidation = ref(null)
 // Localization
-import text from '@pf/src/modules/auth/localization/EnterPassword.json'
+import text from '@pf/src/modules/auth/views/localization/EnterPassword.json'
 // Localization
 const { t } = useI18n({
 	useScope: 'global', 

package/src/modules/auth/{components → views/components}/pages/Invite.vue

@@ -42,10 +42,10 @@ import Button        from '@pf/src/components/Button/Button.vue'
 import { computed, onMounted, ref, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 // Import state
-import * as auth 		from '@pf/src/modules/auth/store/auth'
+import * as auth 		from '@pf/src/modules/auth/views/store/auth'
 import * as invites from '@pf/src/modules/organizations/store/invites'
 // Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 const passswordValidation = ref(null)
 // Accessing router
 const route = useRoute()

package/src/modules/auth/{components → views/components}/pages/ResetPassword.vue

@@ -65,12 +65,12 @@ import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 // Localization
-import text from '@pf/src/modules/auth/localization/ResetPassword.json'
+import text from '@pf/src/modules/auth/views/localization/ResetPassword.json'
 // Import state
-import * as auth from '@pf/src/modules/auth/store/auth'
-import * as twofa from '@pf/src/modules/auth/store/twofa'
+import * as auth from '@pf/src/modules/auth/views/store/auth'
+import * as twofa from '@pf/src/modules/auth/views/store/twofa'
 // Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 // Localization
 const { t } = useI18n({
 	useScope: 'global', 

package/src/modules/auth/{components → views/components}/pages/SignIn.vue

@@ -109,11 +109,11 @@ import { computed, onMounted, ref, inject } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 // Import localization
-import text from '@pf/src/modules/auth/localization/SignIn.json'
+import text from '@pf/src/modules/auth/views/localization/SignIn.json'
 // Import state
-import * as auth from '@pf/src/modules/auth/store/auth'
+import * as auth from '@pf/src/modules/auth/views/store/auth'
 // Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 
 // Init validation
 const phoneValidation = ref(null)

package/src/modules/auth/{components → views/components}/pages/SignUp.vue

@@ -71,12 +71,12 @@
 	import { useRoute, useRouter } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
 	// Import localization
-	import text from '@pf/src/modules/auth/localization/SignUp.json'
+	import text from '@pf/src/modules/auth/views/localization/SignUp.json'
 	// Import state
-	import * as auth from '@pf/src/modules/auth/store/auth'
-	import * as twofa from '@pf/src/modules/auth/store/twofa'
+	import * as auth from '@pf/src/modules/auth/views/store/auth'
+	import * as twofa from '@pf/src/modules/auth/views/store/twofa'
 	// Import validation
-	import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+	import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 	// Localization
 	const { t } = useI18n({
 		useScope: 'global', 

package/src/modules/{middlewares/client → auth/views/middlewares}/auth.validation.js

@@ -1,4 +1,21 @@
-import * as auth from '@pf/src/modules/auth/store/auth'
+import * as auth from '@pf/src/modules/auth/views/store/auth'
+
+function resetUser(to, from, next) {
+  next()
+  auth.state.user.phone = ''
+  auth.state.user.email = ''
+  auth.state.user.password = ''
+  auth.state.user.passwordRepeat = ''
+}
+
+// Check state before open
+function checkUser(to, from, next) {
+  if (auth.state.user.phone === '' && auth.state.user.email === '') {
+    next('/auth/signin')
+  } else {
+    next()
+  }
+}
 
 function requiresNoAuth(to, from, next) {
 
@@ -38,4 +55,6 @@ export  {
   requiresNoAuth,
   requiresAuth,
   requiresAdmin,
+  resetUser,
+  checkUser
 }

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

@@ -0,0 +1,102 @@
+import layoutAuth from '../components/layouts/Auth.vue'
+
+import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
+
+const auth = {
+  path: 'auth',
+  name: 'Authentication',
+  meta: {
+    title: {
+      en: 'Аутентификация',
+      ru: 'Authentication'
+    },
+  },
+  component: layoutAuth,
+  children: [{
+    path: 'signin',
+    name: 'Sign In',
+    beforeEnter: [
+      validationAuth.requiresNoAuth,
+      validationAuth.resetUser
+    ],
+    meta: {
+      title: {
+        en: 'Sign In',
+        ru: 'Вход'
+      },
+    },
+    component: () => import(/* webpackChunkName: "signin" */ '../components/pages/SignIn.vue'),
+  },{
+    path: 'reset-password',
+    name: 'Reset Password',
+    beforeEnter: [
+      validationAuth.requiresNoAuth,
+      validationAuth.resetUser
+    ],
+    meta: {
+      title: {
+        en: 'Reset Password',
+        ru: 'Сбросить Пароль'
+      },
+    },
+    component: () => import(/* webpackChunkName: "reset-password" */ '../components/pages/ResetPassword.vue'),
+  },{
+    path: 'signup',
+    name: 'Sign Up',
+    beforeEnter: [
+      validationAuth.requiresNoAuth,
+      validationAuth.resetUser
+    ],
+    meta: {
+      title: {
+        en: 'Sign Up',
+        ru: 'Регистрация'
+      },
+    },
+    component: () => import(/* webpackChunkName: "signup" */ '../components/pages/SignUp.vue'),
+  },{
+    path: 'enter-code',
+    name: 'Enter Code',
+    beforeEnter: [
+      validationAuth.requiresNoAuth,
+      validationAuth.checkUser
+    ],
+    meta: {
+      title: {
+        en: 'Enter Code',
+        ru: 'Введите Код'
+      },
+    },
+    component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterCode.vue'),
+  },{
+    path: 'enter-password',
+    name: 'Enter Password',
+    beforeEnter: [
+      validationAuth.requiresNoAuth,
+      validationAuth.checkUser
+    ],
+    meta: {
+      title: {
+        en: 'Enter Password',
+        ru: 'Введите Пароль'
+      },
+    },
+    component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterPassword.vue'),
+  },{
+    path: 'invite',
+    name: 'Invite',
+    beforeEnter: [
+      validationAuth.requiresNoAuth,
+      validationAuth.resetUser
+    ],
+    meta: {
+      title: {
+        en: 'Invite',
+        ru: 'Приглашение'
+      },
+    },
+    component: () => import(/* webpackChunkName: "signup" */ '../components/pages/Invite.vue'),
+  }],
+};
+
+export default auth;

package/src/modules/auth/{store → views/store}/auth.js

@@ -6,7 +6,7 @@
   // Vue modules
   import { reactive, watch } from "vue";
   // Globals 
-  import { setError } from '@pf/src/modules/globals/store/globals'
+  import { setError } from '@pf/src/modules/globals/views/store/globals'
   // State
   import * as twofa from './twofa'
   // Setup Axios

package/src/modules/auth/{store → views/store}/twofa.js

@@ -4,7 +4,7 @@ import Cookies from 'js-cookie'
 // Vue modules
 import { reactive, watch  } from "vue";
 // Globals 
-import { setError }   from '@pf/src/modules/globals/store/globals'
+import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // Setup Axios
 const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 // State

package/src/modules/{middlewares/client → auth/views/validations}/inputs.validation.js

@@ -1,7 +1,4 @@
-import i18n from "@pf/src/modules/globals/localization/vue-i18n";
-
-import { parsePhoneNumberFromString } from 'libphonenumber-js';
-
+// import i18n from "@pf/src/modules/globals/views/localization/vue-i18n";
 const messages = {
   ru: {
     "validation": {
@@ -35,8 +32,8 @@ const messages = {
   }
 };
 
-i18n.global.mergeLocaleMessage('ru', messages.ru);
-i18n.global.mergeLocaleMessage('en', messages.en);
+// i18n.global.mergeLocaleMessage('ru', messages.ru);
+// i18n.global.mergeLocaleMessage('en', messages.en);
 
 function validateLength(input) {
   const length = input.length;

package/src/modules/backoffice/components/layouts/Backoffice.vue

@@ -29,7 +29,7 @@ import { ref, onMounted } from 'vue';
 /////////////////////////////
 import { useRoute, useRouter } from 'vue-router'
 
-import * as auth  from '@pf/src/modules/auth/store/auth'
+import * as auth  from '@pf/src/modules/auth/views/store/auth'
 import * as organizations  from '@pf/src/modules/organizations/store/organizations'
 
 const route = useRoute()

package/src/modules/backoffice/components/pages/Dashboard.vue

@@ -29,7 +29,7 @@ import IconLeftovers from '@pf/src/modules/icons/entities/IconLeftovers.vue'
 /////////////////////////////
 import { useRoute, useRouter } from 'vue-router'
 
-import * as auth  from '@pf/src/modules/auth/store/auth'
+import * as auth  from '@pf/src/modules/auth/views/store/auth'
 import * as organizations  from '@pf/src/modules/organizations/store/organizations'
 
 const route = useRoute()

package/src/modules/backoffice/components/partials/Sidebar.vue

@@ -151,7 +151,7 @@ import IconLeftovers from '@pf/src/modules/icons/entities/IconLeftovers.vue'
 /////////////////////////////
 import { useRoute, useRouter } from 'vue-router'
 
-import * as auth  from '@pf/src/modules/auth/store/auth'
+import * as auth  from '@pf/src/modules/auth/views/store/auth'
 import * as organizations  from '@pf/src/modules/organizations/store/organizations'
 
 const route = useRoute()

package/src/modules/backoffice/router/backoffice.js

@@ -1,9 +1,9 @@
 import layoutBackoffice from '../components/layouts/Backoffice.vue'
 import Sidebar from '../components/partials/Sidebar.vue'
 
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
+import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue';
 
-import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
 
 const backofficeRoutes = [{
   path: 'backoffice',

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

@@ -1,4 +1,4 @@
-const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
+const { sendChatMessageTelegram } = require('@pf/src/modules/globals/controllers/utils/mailing');
  
 
 const controllerFactory = (db) => {

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/auth/middlewares');
+const middlewareFactory = require('@pf/src/modules/auth/controllers/middlewares');
 // Routes
 module.exports = function(app, db, wss) {
   const controller = controllerFactory(db);

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -127,7 +127,7 @@
 
 
 <script setup="props">
-	import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
+	import CardHeader  from '@pf/src/modules/globals/views/components/blocks/CardHeader.vue'
 	import FooterBlogpost  from '@pf/src/modules/community/components/blocks/FooterBlogpost.vue'	
 
 	import Image  from '@pf/src/modules/constructor/components/elements/Image.vue';

package/src/modules/community/components/layouts/Community.vue

@@ -152,7 +152,7 @@
 
  	// Import state
 	import * as blog from '@pf/src/modules/community/store/blogposts.js';
-	import * as auth from '@pf/src/modules/auth/store/auth'
+	import * as auth from '@pf/src/modules/auth/views/store/auth'
 	import * as organizations from '@pf/src/modules/organizations/store/organizations'
 	import * as memberships from '@pf/src/modules/organizations/store/memberships'
 

package/src/modules/community/components/pages/Blog.vue

@@ -48,7 +48,7 @@
 
   // Import state
   import * as blog from '@pf/src/modules/community/store/blogposts.js';
-  import * as auth  from '@pf/src/modules/auth/store/auth'
+  import * as auth  from '@pf/src/modules/auth/views/store/auth'
 
   // State
   const route = useRoute();