shuttlepro-shared 1.4.65 → 1.4.67

package/common/repositories/userRole.repository.js

@@ -15,7 +15,7 @@ const updateCachedMembers = async (workspaceId) => {
       .populate({
         path: "roleId",
         select:
-          "id name userId userShift permissionId modulePermissions workspaceId",
+          "id name userId userShift permissionId modulePermissions workspaceId extraCapabilities scope",
         populate: [{ path: "permissionId", select: "id name" }],
       })
       .populate({
@@ -35,14 +35,14 @@ const updateCachedMembers = async (workspaceId) => {
 
 const getMembers = async (workspaceId) => {
   let members = await getRedisData(workspaceId, MEMBERS);
-  
+
   if (!members || members?.length === 0) {
     members = await UserRole.find({ workspaceId })
       .select("userId role userShift roleId isOwner workspaceId")
       .populate({
         path: "roleId",
         select:
-          "id name userId userShift permissionId modulePermissions workspaceId",
+          "id name userId userShift permissionId modulePermissions workspaceId extraCapabilities scope",
         populate: [{ path: "permissionId", select: "id name" }],
       })
       .populate({
@@ -165,6 +165,8 @@ const getUserRoleWithPermissions = async (workspaceId, userId) => {
         parentRole: data?.roleId?.permissionId?.name || "",
         parentRoleId: data?.roleId?.permissionId?._id?.toString() || "",
         defaultModule: data?.roleId?.defaultModule || "",
+        extraCapabilities: data?.roleId?.extraCapabilities || [],
+        scope: data?.roleId?.scope || "workspace",
       };
       return roleWithPermissions || null;
     }
@@ -197,7 +199,7 @@ const findUserWorkspaces = async (userId) => {
     .select("userId roleId workspaceId")
     .populate({
       path: "roleId",
-      select: "id name userId userShift permissionId modulePermissions",
+      select: "id name userId userShift permissionId modulePermissions extraCapabilities scope",
       populate: [{ path: "permissionId", select: "id name" }],
     })
     .populate({
@@ -217,6 +219,8 @@ const findUserWorkspaces = async (userId) => {
         _id: ur?.workspaceId?._id?.toString(),
         role: ur?.roleId?.name || "",
         permissions: ur?.roleId?.modulePermissions?.modules || [],
+        extraCapabilities: ur?.roleId?.extraCapabilities || [],
+        scope: ur?.roleId?.scope || "workspace",
       };
     });
   return userRoleWithWorkspaces || [];

package/models/UserRole.js

@@ -11,7 +11,8 @@ const userRoleSchema = new Schema(
     workspaceId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "Workspace",
-      required: true,
+      required: false, // Optional for global roles
+      default: null,
     },
     role: {
       type: String,

package/models/Webhook.js

@@ -0,0 +1,14 @@
+const mongoose = require("mongoose");
+const { Schema } = mongoose;
+
+const WebhookSchema = new Schema(
+  {
+    isDeleted: { type: Boolean, default: false },
+    data: { type: Object, default: null },
+  },
+  { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
+);
+
+const Webhook = mongoose.model("Webhook", WebhookSchema);
+
+module.exports = Webhook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.4.65",
+  "version": "1.4.67",
   "description": "",
   "main": "index.js",
   "scripts": {