@ozdao/prometheus-framework 0.2.127 → 0.2.129

package/LICENSE

@@ -1,5 +1,5 @@
 Prometheus Framework – Web3 Framework focused on user experience and ease of development.
-Copyright (C) 2023 OZ DAO
+Copyright (C) 2023 ILYA BURAKOV, OZ DAO
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

package/dist/auth.server.js

@@ -5,7 +5,7 @@ const require$$1$1 = require("bcryptjs");
 const require$$0$1 = require("mongoose");
 const require$$1 = require("jwk-to-pem");
 const mailing = require("./mailing-BX0q8DIs.js");
-const index = require("./index-BCCiEK_u.js");
+const index = require("./index-BshfsiQG.js");
 const jwt$1 = require$$0;
 const jwkToPem = require$$1;
 async function verifyAppleIdToken$1(id_token) {
@@ -74,12 +74,8 @@ const controllerFactory$3 = (db) => {
     }
     try {
       let user = await User.findOne(query).populate("roles").exec();
-      if (type === "email" || type === "phone") {
-        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
-        if (!passwordIsValid) {
-          console.log("req obdy is", req.body);
-          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
-        }
+      if (type !== "apple" && !user) {
+        return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
       if (type === "apple" && !user) {
         const { firstName, lastName } = req.body.user.name;
@@ -93,10 +89,14 @@ const controllerFactory$3 = (db) => {
       } else if (!user) {
         return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
-      const memberships = await Membership.findOne({ user: user._id });
+      if (type === "email" || type === "phone") {
+        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
+        if (!passwordIsValid) {
+          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
+        }
+      }
       const token = jwt.sign({
-        _id: user._id,
-        organization: memberships ? memberships.organization : null
+        _id: user._id
       }, process.env.SECRET_KEY, {
         expiresIn: 86400
       });
@@ -108,12 +108,10 @@ const controllerFactory$3 = (db) => {
         phone: user.phone,
         email: user.email,
         roles: authorities,
-        accessToken: token,
-        organization: {
-          _id: memberships ? memberships.organization : null
-        }
+        accessToken: token
       });
     } catch (err) {
+      console.error(err);
       res.status(500).send({ message: err });
     }
   };
@@ -230,40 +228,33 @@ const controllerFactory$3 = (db) => {
       const ownedOrgs = await Organization.find({ owner: uid });
       const ownedOrgIds = ownedOrgs.map((org) => org._id.toString());
       const accesses = {};
-      depts.forEach((dept) => {
-        const orgId = dept.organization.toString();
+      const processAccesses = (orgId, isOwner) => {
         if (!accesses[orgId]) {
           accesses[orgId] = {
             organization: orgId,
             rights: {}
           };
         }
-        const existingAccess = accesses[orgId].rights;
-        Object.keys(dept.accesses).forEach((key) => {
-          if (!existingAccess[key]) {
-            existingAccess[key] = {};
+        const rights = accesses[orgId].rights;
+        const defaultAccesses = new Department();
+        console.log(defaultAccesses);
+        const accessData = isOwner ? defaultAccesses.accesses : (depts.find((dept) => dept.organization.toString() === orgId) || {}).accesses;
+        Object.keys(accessData).forEach((key) => {
+          if (!rights[key]) {
+            rights[key] = {};
           }
-          const rights = dept.accesses[key];
-          Object.keys(rights).forEach((right) => {
-            existingAccess[key][right] = existingAccess[key][right] || rights[right];
+          const accessRights = accessData[key];
+          Object.keys(accessRights).forEach((right) => {
+            rights[key][right] = isOwner || rights[key][right] || accessRights[right];
           });
         });
+      };
+      depts.forEach((dept) => {
+        const orgId = dept.organization.toString();
+        processAccesses(orgId, false);
       });
       ownedOrgIds.forEach((orgId) => {
-        if (!accesses[orgId]) {
-          accesses[orgId] = {
-            organization: orgId,
-            rights: {}
-          };
-        }
-        Object.keys(depts[0].accesses).forEach((key) => {
-          if (!accesses[orgId].rights[key]) {
-            accesses[orgId].rights[key] = {};
-          }
-          Object.keys(depts[0].accesses[key]).forEach((right) => {
-            accesses[orgId].rights[key][right] = true;
-          });
-        });
+        processAccesses(orgId, true);
       });
       const accessArray = Object.values(accesses);
       res.status(200).json(accessArray);

package/dist/auth.server.mjs

@@ -4,7 +4,7 @@ import require$$1$1 from "bcryptjs";
 import require$$0$1 from "mongoose";
 import require$$1 from "jwk-to-pem";
 import { m as mailing } from "./mailing-Cdp8NXhP.mjs";
-import { s as server } from "./index-B6a1mPgp.mjs";
+import { s as server } from "./index-DKtnWDNC.mjs";
 const jwt$1 = require$$0;
 const jwkToPem = require$$1;
 async function verifyAppleIdToken$1(id_token) {
@@ -73,12 +73,8 @@ const controllerFactory$3 = (db) => {
     }
     try {
       let user = await User.findOne(query).populate("roles").exec();
-      if (type === "email" || type === "phone") {
-        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
-        if (!passwordIsValid) {
-          console.log("req obdy is", req.body);
-          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
-        }
+      if (type !== "apple" && !user) {
+        return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
       if (type === "apple" && !user) {
         const { firstName, lastName } = req.body.user.name;
@@ -92,10 +88,14 @@ const controllerFactory$3 = (db) => {
       } else if (!user) {
         return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
-      const memberships = await Membership.findOne({ user: user._id });
+      if (type === "email" || type === "phone") {
+        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
+        if (!passwordIsValid) {
+          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
+        }
+      }
       const token = jwt.sign({
-        _id: user._id,
-        organization: memberships ? memberships.organization : null
+        _id: user._id
       }, process.env.SECRET_KEY, {
         expiresIn: 86400
       });
@@ -107,12 +107,10 @@ const controllerFactory$3 = (db) => {
         phone: user.phone,
         email: user.email,
         roles: authorities,
-        accessToken: token,
-        organization: {
-          _id: memberships ? memberships.organization : null
-        }
+        accessToken: token
       });
     } catch (err) {
+      console.error(err);
       res.status(500).send({ message: err });
     }
   };
@@ -229,40 +227,33 @@ const controllerFactory$3 = (db) => {
       const ownedOrgs = await Organization.find({ owner: uid });
       const ownedOrgIds = ownedOrgs.map((org) => org._id.toString());
       const accesses = {};
-      depts.forEach((dept) => {
-        const orgId = dept.organization.toString();
+      const processAccesses = (orgId, isOwner) => {
         if (!accesses[orgId]) {
           accesses[orgId] = {
             organization: orgId,
             rights: {}
           };
         }
-        const existingAccess = accesses[orgId].rights;
-        Object.keys(dept.accesses).forEach((key) => {
-          if (!existingAccess[key]) {
-            existingAccess[key] = {};
+        const rights = accesses[orgId].rights;
+        const defaultAccesses = new Department();
+        console.log(defaultAccesses);
+        const accessData = isOwner ? defaultAccesses.accesses : (depts.find((dept) => dept.organization.toString() === orgId) || {}).accesses;
+        Object.keys(accessData).forEach((key) => {
+          if (!rights[key]) {
+            rights[key] = {};
           }
-          const rights = dept.accesses[key];
-          Object.keys(rights).forEach((right) => {
-            existingAccess[key][right] = existingAccess[key][right] || rights[right];
+          const accessRights = accessData[key];
+          Object.keys(accessRights).forEach((right) => {
+            rights[key][right] = isOwner || rights[key][right] || accessRights[right];
           });
         });
+      };
+      depts.forEach((dept) => {
+        const orgId = dept.organization.toString();
+        processAccesses(orgId, false);
       });
       ownedOrgIds.forEach((orgId) => {
-        if (!accesses[orgId]) {
-          accesses[orgId] = {
-            organization: orgId,
-            rights: {}
-          };
-        }
-        Object.keys(depts[0].accesses).forEach((key) => {
-          if (!accesses[orgId].rights[key]) {
-            accesses[orgId].rights[key] = {};
-          }
-          Object.keys(depts[0].accesses[key]).forEach((right) => {
-            accesses[orgId].rights[key][right] = true;
-          });
-        });
+        processAccesses(orgId, true);
       });
       const accessArray = Object.values(accesses);
       res.status(200).json(accessArray);

package/dist/community.server.js

@@ -4,7 +4,7 @@ const require$$0 = require("mongoose");
 const queryProcessor$3 = require("./queryProcessor-haY_gPGg.js");
 require("util");
 require("uuid");
-const index = require("./index-BCCiEK_u.js");
+const index = require("./index-BshfsiQG.js");
 const common_schema = require("./common.schema-BFhpUXUt.js");
 const engagement_schema = require("./engagement.schema-fdLNO2_6.js");
 const ownership_schema = require("./ownership.schema-DN0SlQL6.js");

package/dist/community.server.mjs

@@ -3,7 +3,7 @@ import require$$0 from "mongoose";
 import { q as queryProcessor$3 } from "./queryProcessor-g8208K6g.mjs";
 import "util";
 import "uuid";
-import { s as server$1 } from "./index-B6a1mPgp.mjs";
+import { s as server$1 } from "./index-DKtnWDNC.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
 import { e as engagement_schema } from "./engagement.schema-CI2ifjXN.mjs";
 import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";

package/dist/events.server.js

@@ -5,7 +5,7 @@ const require$$0 = require("mongoose");
 const queryProcessor$2 = require("./queryProcessor-haY_gPGg.js");
 const metadata_schema = require("./metadata.schema-6slGhpQS.js");
 const require$$1 = require("stripe");
-const index = require("./index-BCCiEK_u.js");
+const index = require("./index-BshfsiQG.js");
 const tickets_controller = require("./tickets.controller-WaQ4qMpv.js");
 const common_schema = require("./common.schema-BFhpUXUt.js");
 const engagement_schema = require("./engagement.schema-fdLNO2_6.js");

package/dist/events.server.mjs

@@ -3,7 +3,7 @@ import require$$0 from "mongoose";
 import { q as queryProcessor$2 } from "./queryProcessor-g8208K6g.mjs";
 import { s as seoFriendlyUrl, m as metadata_schema } from "./metadata.schema-CK5e2O3f.mjs";
 import require$$1 from "stripe";
-import { s as server$1 } from "./index-B6a1mPgp.mjs";
+import { s as server$1 } from "./index-DKtnWDNC.mjs";
 import { t as tickets_controller } from "./tickets.controller-ByZ33N6_.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
 import { e as engagement_schema } from "./engagement.schema-CI2ifjXN.mjs";

package/dist/files.server.js

@@ -1,7 +1,7 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("path");
-const index = require("./index-BCCiEK_u.js");
+const index = require("./index-BshfsiQG.js");
 const require$$0$1 = require("sharp");
 const require$$1 = require("fs");
 const require$$2 = require("fs/promises");

package/dist/files.server.mjs

@@ -1,6 +1,6 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "path";
-import { s as server$1 } from "./index-B6a1mPgp.mjs";
+import { s as server$1 } from "./index-DKtnWDNC.mjs";
 import require$$0$1 from "sharp";
 import require$$1 from "fs";
 import require$$2 from "fs/promises";

package/dist/gallery.server.js

@@ -2,7 +2,7 @@
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("path");
 const queryProcessor = require("./queryProcessor-haY_gPGg.js");
-const index = require("./index-BCCiEK_u.js");
+const index = require("./index-BshfsiQG.js");
 const common_schema = require("./common.schema-BFhpUXUt.js");
 const engagement_schema = require("./engagement.schema-fdLNO2_6.js");
 const ownership_schema = require("./ownership.schema-DN0SlQL6.js");
@@ -120,9 +120,13 @@ const middlewareFactory = (db) => {
   const verifyRead = (resource) => {
     return async (req, res, next) => {
       try {
+        if (req.userId === null) {
+          req.query.status = "published";
+          return next();
+        }
+        const userId = new db.mongoose.Types.ObjectId(req.userId);
         const ownerOrgId = new db.mongoose.Types.ObjectId(req.query.owner);
         ;
-        const userId = new db.mongoose.Types.ObjectId(req.userId);
         const isOwnerOfOrg = await Organization.exists({
           _id: ownerOrgId,
           owner: userId

package/dist/gallery.server.mjs

@@ -1,7 +1,7 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "path";
 import { q as queryProcessor } from "./queryProcessor-g8208K6g.mjs";
-import { s as server } from "./index-B6a1mPgp.mjs";
+import { s as server } from "./index-DKtnWDNC.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
 import { e as engagement_schema } from "./engagement.schema-CI2ifjXN.mjs";
 import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";
@@ -119,9 +119,13 @@ const middlewareFactory = (db) => {
   const verifyRead = (resource) => {
     return async (req, res, next) => {
       try {
+        if (req.userId === null) {
+          req.query.status = "published";
+          return next();
+        }
+        const userId = new db.mongoose.Types.ObjectId(req.userId);
         const ownerOrgId = new db.mongoose.Types.ObjectId(req.query.owner);
         ;
-        const userId = new db.mongoose.Types.ObjectId(req.userId);
         const isOwnerOfOrg = await Organization.exists({
           _id: ownerOrgId,
           owner: userId

package/dist/{index-BCCiEK_u.js → index-BshfsiQG.js}

@@ -7,19 +7,23 @@ const middlewareFactory$4 = (db) => {
   const Role = db.role;
   const verifyToken = async (req, res, next) => {
     try {
-      console.log(req.cookies);
+      if (!req.cookies.user) {
+        req.userId = null;
+        return next();
+      }
       let user = JSON.parse(req.cookies.user);
       let token = req.headers["x-access-token"] || user.accessToken;
       if (!token) {
-        return res.status(403).send({ message: "No token provided!" });
+        req.userId = null;
+        return next();
       }
       const decoded = jwt.verify(token, process.env.SECRET_KEY);
       req.userId = decoded._id;
-      console.log("success");
       next();
     } catch (err) {
       console.log(err);
-      return res.status(401).send({ message: "Unauthorized!" });
+      req.userId = null;
+      next();
     }
   };
   const checkRole = (roleToCheck) => async (req, res, next) => {

package/dist/{index-B6a1mPgp.mjs → index-DKtnWDNC.mjs}

@@ -6,19 +6,23 @@ const middlewareFactory$4 = (db) => {
   const Role = db.role;
   const verifyToken = async (req, res, next) => {
     try {
-      console.log(req.cookies);
+      if (!req.cookies.user) {
+        req.userId = null;
+        return next();
+      }
       let user = JSON.parse(req.cookies.user);
       let token = req.headers["x-access-token"] || user.accessToken;
       if (!token) {
-        return res.status(403).send({ message: "No token provided!" });
+        req.userId = null;
+        return next();
       }
       const decoded = jwt.verify(token, process.env.SECRET_KEY);
       req.userId = decoded._id;
-      console.log("success");
       next();
     } catch (err) {
       console.log(err);
-      return res.status(401).send({ message: "Unauthorized!" });
+      req.userId = null;
+      next();
     }
   };
   const checkRole = (roleToCheck) => async (req, res, next) => {