shuttlepro-shared 1.2.86 → 1.2.87
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -316,56 +316,16 @@ const removePermissionFromRole = async (id, permission) => {
|
|
|
316
316
|
return updatedRole;
|
|
317
317
|
};
|
|
318
318
|
|
|
319
|
-
const deleteRoleById = async (id) => {
|
|
320
|
-
|
|
321
|
-
const workspaceId = role?.workspaceId;
|
|
322
|
-
|
|
323
|
-
const deletedRole = await Role.findByIdAndDelete(id).lean().exec();
|
|
324
|
-
|
|
325
|
-
if (deletedRole) {
|
|
326
|
-
if (workspaceId) {
|
|
327
|
-
await updateCachedRoles(workspaceId);
|
|
328
|
-
}
|
|
329
|
-
// Update default roles cache if needed
|
|
330
|
-
if (!deletedRole.workspaceId) {
|
|
331
|
-
await updateCachedDefaultRoles();
|
|
332
|
-
}
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
return deletedRole;
|
|
319
|
+
const deleteRoleById = async (id, workspaceId) => {
|
|
320
|
+
return await Role.deleteOne({ _id: id }).exec();
|
|
336
321
|
};
|
|
337
322
|
|
|
338
323
|
const deleteSingleRole = async (filter) => {
|
|
339
|
-
|
|
340
|
-
const deletedRole = await Role.findOneAndDelete(filter).lean().exec();
|
|
341
|
-
|
|
342
|
-
if (deletedRole) {
|
|
343
|
-
if (workspaceId) {
|
|
344
|
-
await updateCachedRoles(workspaceId);
|
|
345
|
-
}
|
|
346
|
-
// Update default roles cache if needed
|
|
347
|
-
if (!deletedRole.workspaceId) {
|
|
348
|
-
await updateCachedDefaultRoles();
|
|
349
|
-
}
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
return deletedRole;
|
|
324
|
+
return await Role.deleteOne(filter).exec();
|
|
353
325
|
};
|
|
354
326
|
|
|
355
327
|
const deleteManyRoles = async (filter) => {
|
|
356
|
-
|
|
357
|
-
const includesDefaultRoles =
|
|
358
|
-
!filter.workspaceId || filter.workspaceId === null;
|
|
359
|
-
const result = await Role.deleteMany(filter);
|
|
360
|
-
if (result.deletedCount > 0) {
|
|
361
|
-
if (workspaceId) {
|
|
362
|
-
await updateCachedRoles(workspaceId);
|
|
363
|
-
}
|
|
364
|
-
if (includesDefaultRoles) {
|
|
365
|
-
await updateCachedDefaultRoles();
|
|
366
|
-
}
|
|
367
|
-
}
|
|
368
|
-
return result;
|
|
328
|
+
return await Role.deleteMany(filter);
|
|
369
329
|
};
|
|
370
330
|
|
|
371
331
|
module.exports = {
|