@ozdao/prometheus-framework 0.2.222 → 0.2.223

package/dist/community.server.mjs

@@ -1,9 +1,10 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "mongoose";
-import { q as queryProcessor$3 } from "./queryProcessor-DQSFR9YA.mjs";
+import { q as queryProcessor$3 } from "./queryProcessor-CU4A6Y4N.mjs";
 import "util";
 import "uuid";
-import { m as middlewares } from "./index-DahVPg_G.mjs";
+import { m as middlewares } from "./index-UIHE6Rk3.mjs";
+import { v as verifyAccesses } from "./verifyAccesses-BsrJOct8.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
 import { e as engagement_schema } from "./engagement.schema-CCdSLKd4.mjs";
 import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";
@@ -192,6 +193,7 @@ const controllerFactory$3 = (db) => {
   db.organization;
   const Membership = db.membership;
   const read = async (req, res) => {
+    console.log(req.query);
     let stages = [];
     stages = [
       ...queryProcessorGlobals.getBasicOptions(
@@ -652,9 +654,11 @@ var server = middlewareIndexFactory;
 const controllerFactory$2 = blog_controller;
 const middlewareFactoryAuth = middlewares;
 const middlewareFactoryCommunity = server;
+const middlewareFactoryAccesses = verifyAccesses;
 var blog_routes = function(app, db, origins) {
   const controller = controllerFactory$2(db);
-  middlewareFactoryAuth(db);
+  const { authJwt } = middlewareFactoryAuth(db);
+  middlewareFactoryAccesses(db);
   const { verifyBlogpost: verifyBlogpost2 } = middlewareFactoryCommunity(db);
   app.get(
     "/api/blog/read",
@@ -663,6 +667,7 @@ var blog_routes = function(app, db, origins) {
   app.post(
     "/api/blog/create",
     [
+      authJwt.verifyToken(),
       verifyBlogpost2.checkNameNotEmpty,
       verifyBlogpost2.checkBlogpostExistOrNot
     ],

package/dist/events.server.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("mongoose");
-const queryProcessor$2 = require("./queryProcessor-iewDZq_f.js");
+const queryProcessor$2 = require("./queryProcessor-CcsJEUBr.js");
 const metadata_schema = require("./metadata.schema-6slGhpQS.js");
 const require$$1 = require("stripe");
-const index = require("./index-oS9yx2Kv.js");
+const index = require("./index-CsS7qx1d.js");
 const tickets_controller = require("./tickets.controller-yqXXLR62.js");
 const common_schema = require("./common.schema-BFhpUXUt.js");
 const engagement_schema = require("./engagement.schema-D-9md46B.js");
@@ -316,6 +316,7 @@ class servicePaymentStripe extends servicePayment {
       active: true
     });
     let newPrice;
+    let paymentLink;
     const matchingPrice = activePrices.data.find((price) => price.unit_amount === event.specialData.ticketPrice * 100);
     if (!matchingPrice) {
       const deactivatePromises = activePrices.data.map((price) => stripe.prices.update(price.id, { active: false }));
@@ -328,30 +329,19 @@ class servicePaymentStripe extends servicePayment {
         active: true
         // Make the new price active
       });
-    } else {
-      const deactivatePromises = activePrices.data.filter((price) => price.id !== matchingPrice.id).map((price) => stripe.prices.update(price.id, { active: false }));
-      await Promise.all(deactivatePromises);
-      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
+      paymentLink = await stripe.paymentLinks.create({
+        line_items: [{
+          price: newPrice.id,
+          quantity: 1,
+          adjustable_quantity: {
+            enabled: true
+          }
+        }],
+        metadata: {
+          product: event._id.toString()
+        }
       });
     }
-    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 };
   }
   async deactivateProduct(event) {

package/dist/events.server.mjs

@@ -1,9 +1,9 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "mongoose";
-import { q as queryProcessor$2 } from "./queryProcessor-DQSFR9YA.mjs";
+import { q as queryProcessor$2 } from "./queryProcessor-CU4A6Y4N.mjs";
 import { s as seoFriendlyUrl, m as metadata_schema } from "./metadata.schema-CK5e2O3f.mjs";
 import require$$1 from "stripe";
-import { m as middlewares } from "./index-DahVPg_G.mjs";
+import { m as middlewares } from "./index-UIHE6Rk3.mjs";
 import { t as tickets_controller } from "./tickets.controller-CB549rZT.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
 import { e as engagement_schema } from "./engagement.schema-CCdSLKd4.mjs";
@@ -314,6 +314,7 @@ class servicePaymentStripe extends servicePayment {
       active: true
     });
     let newPrice;
+    let paymentLink;
     const matchingPrice = activePrices.data.find((price) => price.unit_amount === event.specialData.ticketPrice * 100);
     if (!matchingPrice) {
       const deactivatePromises = activePrices.data.map((price) => stripe.prices.update(price.id, { active: false }));
@@ -326,30 +327,19 @@ class servicePaymentStripe extends servicePayment {
         active: true
         // Make the new price active
       });
-    } else {
-      const deactivatePromises = activePrices.data.filter((price) => price.id !== matchingPrice.id).map((price) => stripe.prices.update(price.id, { active: false }));
-      await Promise.all(deactivatePromises);
-      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
+      paymentLink = await stripe.paymentLinks.create({
+        line_items: [{
+          price: newPrice.id,
+          quantity: 1,
+          adjustable_quantity: {
+            enabled: true
+          }
+        }],
+        metadata: {
+          product: event._id.toString()
+        }
       });
     }
-    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 };
   }
   async deactivateProduct(event) {

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-oS9yx2Kv.js");
+const index = require("./index-CsS7qx1d.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 { m as middlewares } from "./index-DahVPg_G.mjs";
+import { m as middlewares } from "./index-UIHE6Rk3.mjs";
 import require$$0$1 from "sharp";
 import require$$1 from "fs";
 import require$$2 from "fs/promises";

package/dist/gallery.server.js

@@ -1,8 +1,9 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("path");
-const queryProcessor = require("./queryProcessor-iewDZq_f.js");
-const index = require("./index-oS9yx2Kv.js");
+const queryProcessor = require("./queryProcessor-CcsJEUBr.js");
+const index = require("./index-CsS7qx1d.js");
+const verifyAccesses = require("./verifyAccesses-BvLnOtBN.js");
 const common_schema = require("./common.schema-BFhpUXUt.js");
 const engagement_schema = require("./engagement.schema-D-9md46B.js");
 const ownership_schema = require("./ownership.schema-DN0SlQL6.js");
@@ -11,7 +12,6 @@ const queryProcessorGlobals = queryProcessor.queryProcessor;
 const controllerFactory$1 = (db) => {
   const Photo = db.photo;
   const read = async (req, res) => {
-    console.log(req.query.tags);
     let stages = [
       ...queryProcessorGlobals.getBasicOptions(
         req.query
@@ -39,7 +39,6 @@ const controllerFactory$1 = (db) => {
         req.query.limit
       )
     ];
-    console.log(stages);
     try {
       const photos = await Photo.aggregate(stages);
       if (!photos) {
@@ -75,7 +74,6 @@ const controllerFactory$1 = (db) => {
           return res.status(404).send({ message: `Photo with link ${image} is not created.` });
         }
         photo = await Photo.findOne({ _id: photo._id }).populate("creator.target").populate("owner.target");
-        console.log(photo);
         photos.push(photo);
       }
       res.status(200).send(photos);
@@ -84,26 +82,29 @@ const controllerFactory$1 = (db) => {
       res.status(500).send({ message: error });
     }
   };
-  const update = (req, res) => {
-    Photo.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true }).exec().then((photo) => {
-      if (!photo) {
+  const update = async (req, res) => {
+    try {
+      const updatedPhoto = await Photo.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true }).populate("creator.target").populate("owner.target");
+      if (!updatedPhoto) {
         return res.status(404).send({ message: "Something went wrong when updating photo." });
       }
-      res.status(200).send(photo);
-    }).catch((err) => {
+      res.status(200).send(updatedPhoto);
+    } catch (err) {
       console.log(err);
-      return res.status(500).send({ message: err });
-    });
+      return res.status(500).send({ message: err.message });
+    }
   };
-  const deletePhoto = (req, res) => {
-    Photo.findOneAndDelete({ _id: req.params._id }).exec().then((photo) => {
-      if (!photo) {
+  const deletePhoto = async (req, res) => {
+    try {
+      const deletedPhoto = await Photo.findOneAndDelete({ _id: req.body._id }).populate("creator.target").populate("owner.target");
+      if (!deletedPhoto) {
         return res.status(404).send({ message: "Photo is not deleted." });
       }
-      res.status(200).send(photo);
-    }).catch((err) => {
-      return res.status(500).send({ message: err });
-    });
+      res.status(200).send(deletedPhoto);
+    } catch (err) {
+      console.log(err);
+      return res.status(500).send({ message: err.message });
+    }
   };
   return {
     read,
@@ -113,84 +114,49 @@ const controllerFactory$1 = (db) => {
   };
 };
 var gallery_controller = controllerFactory$1;
-const middlewareFactory = (db) => {
-  db.user;
-  const Organization = db.organization;
-  const Department = db.department;
-  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 isOwnerOfOrg = await Organization.exists({
-          _id: ownerOrgId,
-          owner: userId
-        });
-        if (isOwnerOfOrg) {
-          return next();
-        }
-        const isMemberOfOrg = await Department.exists({
-          organization: ownerOrgId,
-          "members.user": userId
-        });
-        if (!isMemberOfOrg) {
-          req.query.status = "published";
-        } else {
-          const departments = await Department.find({ organization: ownerOrgId });
-          let hasAccess = false;
-          for (const department of departments) {
-            const accessRights = department.accesses[resource];
-            if (accessRights && accessRights.read) {
-              hasAccess = true;
-              break;
-            }
-          }
-          if (!hasAccess) {
-            req.query.status = "published";
-          }
-        }
-        next();
-      } catch (err) {
-        console.error("Access control error:", err);
-        return res.status(403).json({ error: "Access denied" });
-      }
-    };
-  };
-  return {
-    verifyRead
-  };
-};
-var verifyAccesses = middlewareFactory;
 const controllerFactory = gallery_controller;
 const middlewareFactoryAuth = index.middlewares;
-const middlewareFactoryAccesses = verifyAccesses;
+const middlewareFactoryAccesses = verifyAccesses.verifyAccesses;
 var gallery_routes = function(app, db, origins) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareFactoryAuth(db);
-  const { verifyRead } = middlewareFactoryAccesses(db);
+  const { verifyAccess, handleAccessResult } = middlewareFactoryAccesses(db);
   app.get(
     "/api/gallery/read",
     [
       authJwt.verifyToken(true),
-      verifyRead("gallery")
+      verifyAccess("gallery", "read"),
+      handleAccessResult({ allowPublished: true, allowUnauthenticated: true })
     ],
     controller.read
   );
   app.post(
     "/api/gallery/create",
+    [
+      authJwt.verifyToken(),
+      verifyAccess("gallery", "create"),
+      handleAccessResult()
+    ],
     controller.create
   );
   app.put(
     "/api/gallery/update",
+    [
+      authJwt.verifyToken(),
+      verifyAccess("gallery", "edit"),
+      handleAccessResult({
+        allowOwnResources: true
+      })
+    ],
     controller.update
   );
   app.delete(
-    "/api/gallery/delete/:_id",
+    "/api/gallery/delete",
+    [
+      authJwt.verifyToken(),
+      verifyAccess("gallery", "delete"),
+      handleAccessResult()
+    ],
     controller.delete
   );
 };

package/dist/gallery.server.mjs

@@ -1,7 +1,8 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "path";
-import { q as queryProcessor } from "./queryProcessor-DQSFR9YA.mjs";
-import { m as middlewares } from "./index-DahVPg_G.mjs";
+import { q as queryProcessor } from "./queryProcessor-CU4A6Y4N.mjs";
+import { m as middlewares } from "./index-UIHE6Rk3.mjs";
+import { v as verifyAccesses } from "./verifyAccesses-BsrJOct8.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
 import { e as engagement_schema } from "./engagement.schema-CCdSLKd4.mjs";
 import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";
@@ -10,7 +11,6 @@ const queryProcessorGlobals = queryProcessor;
 const controllerFactory$1 = (db) => {
   const Photo = db.photo;
   const read = async (req, res) => {
-    console.log(req.query.tags);
     let stages = [
       ...queryProcessorGlobals.getBasicOptions(
         req.query
@@ -38,7 +38,6 @@ const controllerFactory$1 = (db) => {
         req.query.limit
       )
     ];
-    console.log(stages);
     try {
       const photos = await Photo.aggregate(stages);
       if (!photos) {
@@ -74,7 +73,6 @@ const controllerFactory$1 = (db) => {
           return res.status(404).send({ message: `Photo with link ${image} is not created.` });
         }
         photo = await Photo.findOne({ _id: photo._id }).populate("creator.target").populate("owner.target");
-        console.log(photo);
         photos.push(photo);
       }
       res.status(200).send(photos);
@@ -83,26 +81,29 @@ const controllerFactory$1 = (db) => {
       res.status(500).send({ message: error });
     }
   };
-  const update = (req, res) => {
-    Photo.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true }).exec().then((photo) => {
-      if (!photo) {
+  const update = async (req, res) => {
+    try {
+      const updatedPhoto = await Photo.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true }).populate("creator.target").populate("owner.target");
+      if (!updatedPhoto) {
         return res.status(404).send({ message: "Something went wrong when updating photo." });
       }
-      res.status(200).send(photo);
-    }).catch((err) => {
+      res.status(200).send(updatedPhoto);
+    } catch (err) {
       console.log(err);
-      return res.status(500).send({ message: err });
-    });
+      return res.status(500).send({ message: err.message });
+    }
   };
-  const deletePhoto = (req, res) => {
-    Photo.findOneAndDelete({ _id: req.params._id }).exec().then((photo) => {
-      if (!photo) {
+  const deletePhoto = async (req, res) => {
+    try {
+      const deletedPhoto = await Photo.findOneAndDelete({ _id: req.body._id }).populate("creator.target").populate("owner.target");
+      if (!deletedPhoto) {
         return res.status(404).send({ message: "Photo is not deleted." });
       }
-      res.status(200).send(photo);
-    }).catch((err) => {
-      return res.status(500).send({ message: err });
-    });
+      res.status(200).send(deletedPhoto);
+    } catch (err) {
+      console.log(err);
+      return res.status(500).send({ message: err.message });
+    }
   };
   return {
     read,
@@ -112,84 +113,49 @@ const controllerFactory$1 = (db) => {
   };
 };
 var gallery_controller = controllerFactory$1;
-const middlewareFactory = (db) => {
-  db.user;
-  const Organization = db.organization;
-  const Department = db.department;
-  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 isOwnerOfOrg = await Organization.exists({
-          _id: ownerOrgId,
-          owner: userId
-        });
-        if (isOwnerOfOrg) {
-          return next();
-        }
-        const isMemberOfOrg = await Department.exists({
-          organization: ownerOrgId,
-          "members.user": userId
-        });
-        if (!isMemberOfOrg) {
-          req.query.status = "published";
-        } else {
-          const departments = await Department.find({ organization: ownerOrgId });
-          let hasAccess = false;
-          for (const department of departments) {
-            const accessRights = department.accesses[resource];
-            if (accessRights && accessRights.read) {
-              hasAccess = true;
-              break;
-            }
-          }
-          if (!hasAccess) {
-            req.query.status = "published";
-          }
-        }
-        next();
-      } catch (err) {
-        console.error("Access control error:", err);
-        return res.status(403).json({ error: "Access denied" });
-      }
-    };
-  };
-  return {
-    verifyRead
-  };
-};
-var verifyAccesses = middlewareFactory;
 const controllerFactory = gallery_controller;
 const middlewareFactoryAuth = middlewares;
 const middlewareFactoryAccesses = verifyAccesses;
 var gallery_routes = function(app, db, origins) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareFactoryAuth(db);
-  const { verifyRead } = middlewareFactoryAccesses(db);
+  const { verifyAccess, handleAccessResult } = middlewareFactoryAccesses(db);
   app.get(
     "/api/gallery/read",
     [
       authJwt.verifyToken(true),
-      verifyRead("gallery")
+      verifyAccess("gallery", "read"),
+      handleAccessResult({ allowPublished: true, allowUnauthenticated: true })
     ],
     controller.read
   );
   app.post(
     "/api/gallery/create",
+    [
+      authJwt.verifyToken(),
+      verifyAccess("gallery", "create"),
+      handleAccessResult()
+    ],
     controller.create
   );
   app.put(
     "/api/gallery/update",
+    [
+      authJwt.verifyToken(),
+      verifyAccess("gallery", "edit"),
+      handleAccessResult({
+        allowOwnResources: true
+      })
+    ],
     controller.update
   );
   app.delete(
-    "/api/gallery/delete/:_id",
+    "/api/gallery/delete",
+    [
+      authJwt.verifyToken(),
+      verifyAccess("gallery", "delete"),
+      handleAccessResult()
+    ],
     controller.delete
   );
 };