@rakun-kit/core 1.3.11 → 1.4.0

package/dist/cjs/api/routes/manager/media/prepareUpload.js

@@ -5,6 +5,7 @@ const errors_1 = require("../../../../lib/errors");
 const Logger_1 = require("../../../../lib/Logger");
 const media_1 = require("../../../../media");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
+const mediaUploadToken_1 = require("../../../utils/mediaUploadToken");
 const mapMediaError = (error) => {
     Logger_1.Logger.error("manager.media.prepareUpload failed", {
         error: error instanceof Error ? error.message : String(error),
@@ -45,7 +46,17 @@ const prepareUploadHandler = async ({ input, ctx, }) => {
             access: prepared.access,
             hasUrl: Boolean(prepared.url),
         });
-        return prepared;
+        return {
+            ...prepared,
+            uploadToken: (0, mediaUploadToken_1.createMediaUploadToken)({
+                key: prepared.key,
+                access: prepared.access,
+                mime: input.mime,
+                size: input.size,
+                userId: user._id,
+                purpose: input.purpose,
+            }),
+        };
     }
     catch (error) {
         Logger_1.Logger.addTrace("manager.media.prepareUpload: handler failed");

package/dist/cjs/api/routes/manager/media/prepareUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareUpload.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/media/prepareUpload.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AACvD,mDAAgD;AAChD,6CAM2B;AAE3B,sEAAmE;AAEnE,MAAM,aAAa,GAAG,CAAC,KAAc,EAAS,EAAE;IAC9C,eAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;QACjD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QAC7D,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;KACxD,CAAC,CAAC;IAEH,IAAI,KAAK,YAAY,6BAAqB,EAAE,CAAC;QAC3C,IAAA,sBAAa,EAAC,YAAY,EAAE;YAC1B,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACrC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,KAAK,YAAY,0BAAkB,EAAE,CAAC;QACxC,IAAA,sBAAa,EAAC,WAAW,EAAE;YACzB,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;IACL,CAAC;IAED,IAAA,sBAAa,EAAC,UAAU,EAAE;QACxB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB;KACxE,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,KAAK,EACL,GAAG,GAIJ,EAAgC,EAAE;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAE3B,IAAI,KAAK,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,IAAA,sBAAa,EAAC,YAAY,EAAE;gBAC1B,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAA,uBAAe,GAAE,CAAC;QAChC,eAAM,CAAC,QAAQ,CAAC,kDAAkD,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,eAAM,CAAC,QAAQ,CAAC,uCAAuC,EAAE;YACvD,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;SAC9B,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,QAAQ,CAAC,6CAA6C,CAAC,CAAC;QAC/D,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC,CAAC;AAjCW,QAAA,oBAAoB,wBAiC/B"}
+{"version":3,"file":"prepareUpload.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/media/prepareUpload.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AACvD,mDAAgD;AAChD,6CAK2B;AAG3B,sEAAmE;AACnE,sEAAyE;AAEzE,MAAM,aAAa,GAAG,CAAC,KAAc,EAAS,EAAE;IAC9C,eAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;QACjD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QAC7D,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;KACxD,CAAC,CAAC;IAEH,IAAI,KAAK,YAAY,6BAAqB,EAAE,CAAC;QAC3C,IAAA,sBAAa,EAAC,YAAY,EAAE;YAC1B,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACrC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,KAAK,YAAY,0BAAkB,EAAE,CAAC;QACxC,IAAA,sBAAa,EAAC,WAAW,EAAE;YACzB,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;IACL,CAAC;IAED,IAAA,sBAAa,EAAC,UAAU,EAAE;QACxB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB;KACxE,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,KAAK,EACL,GAAG,GAIJ,EAAgC,EAAE;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAE3B,IAAI,KAAK,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,IAAA,sBAAa,EAAC,YAAY,EAAE;gBAC1B,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAA,uBAAe,GAAE,CAAC;QAChC,eAAM,CAAC,QAAQ,CAAC,kDAAkD,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,eAAM,CAAC,QAAQ,CAAC,uCAAuC,EAAE;YACvD,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;SAC9B,CAAC,CAAC;QACH,OAAO;YACL,GAAG,QAAQ;YACX,WAAW,EAAE,IAAA,yCAAsB,EAAC;gBAClC,GAAG,EAAE,QAAQ,CAAC,GAAG;gBACjB,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,IAAI,CAAC,GAAG;gBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC;SACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,QAAQ,CAAC,6CAA6C,CAAC,CAAC;QAC/D,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC,CAAC;AA3CW,QAAA,oBAAoB,wBA2C/B"}

package/dist/cjs/api/routes/manager/media/uploadBinary.js

@@ -11,6 +11,7 @@ const media_1 = require("../../../../media");
 const imageOptimization_1 = require("../../../../media/imageOptimization");
 const context_1 = require("../../../context");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
+const mediaUploadToken_1 = require("../../../utils/mediaUploadToken");
 const uploadHeadersSchema = zod_1.default.object({
     key: zod_1.default.string().min(1),
     access: zod_1.default.enum(["public", "private"]).default("public"),
@@ -18,6 +19,7 @@ const uploadHeadersSchema = zod_1.default.object({
     mime: zod_1.default.string().min(1).optional(),
     optimizeRaw: zod_1.default.string().optional(),
     purpose: zod_1.default.enum(["profileAvatar"]).optional(),
+    uploadToken: zod_1.default.string().min(1),
 });
 const parseCookieHeader = (cookieHeader) => {
     if (!cookieHeader)
@@ -40,11 +42,18 @@ const getHeader = (req, name) => {
     }
     return header;
 };
-const readBodyBuffer = async (req) => {
+const readBodyBuffer = async (req, maxBytes) => {
     const chunks = [];
+    let total = 0;
     await new Promise((resolve, reject) => {
         req.on("data", (chunk) => {
-            chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+            const buffer = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
+            total += buffer.length;
+            if (total > maxBytes) {
+                reject(new Error("Upload body exceeds signed size"));
+                return;
+            }
+            chunks.push(buffer);
         });
         req.on("end", () => resolve());
         req.on("error", (error) => reject(error));
@@ -56,6 +65,19 @@ const sanitizeMime = (value) => {
         return "application/octet-stream";
     return value.split(";")[0]?.trim() || "application/octet-stream";
 };
+const assertObjectDoesNotExist = async ({ key, access, }) => {
+    const media = (0, media_1.getMediaService)();
+    try {
+        await media.rawAdapter.headObject({ key, access });
+    }
+    catch {
+        return;
+    }
+    (0, errors_1.throwAppError)("CONFLICT", {
+        message: "Media object already exists",
+        key,
+    });
+};
 const sendJson = (res, statusCode, body) => {
     res.statusCode = statusCode;
     res.setHeader("Content-Type", "application/json; charset=utf-8");
@@ -76,7 +98,27 @@ async function handleMediaBinaryUpload(req, res) {
             mime: getHeader(req, "x-cms-upload-mime") || undefined,
             optimizeRaw: getHeader(req, "x-cms-upload-optimize") || undefined,
             purpose: getHeader(req, "x-cms-upload-purpose") || undefined,
+            uploadToken: getHeader(req, "x-cms-upload-token"),
         });
+        const tokenPayload = (0, mediaUploadToken_1.verifyMediaUploadToken)(parsedHeaders.uploadToken);
+        if (!tokenPayload) {
+            sendJson(res, 403, {
+                message: "Invalid or expired upload token",
+            });
+            return;
+        }
+        const mime = sanitizeMime(parsedHeaders.mime || getHeader(req, "content-type") || undefined);
+        if (tokenPayload.userId !== user._id ||
+            tokenPayload.key !== parsedHeaders.key ||
+            tokenPayload.access !== parsedHeaders.access ||
+            tokenPayload.mime !== mime ||
+            (tokenPayload.purpose ?? undefined) !==
+                (parsedHeaders.purpose ?? undefined)) {
+            sendJson(res, 403, {
+                message: "Upload token does not match upload metadata",
+            });
+            return;
+        }
         Logger_1.Logger.addTrace("manager.media.uploadBinary: headers parsed", {
             key: parsedHeaders.key,
             access: parsedHeaders.access,
@@ -84,7 +126,7 @@ async function handleMediaBinaryUpload(req, res) {
             mime: parsedHeaders.mime,
             optimize: Boolean(parsedHeaders.optimizeRaw),
         });
-        const rawBody = await readBodyBuffer(req);
+        const rawBody = await readBodyBuffer(req, tokenPayload.size);
         Logger_1.Logger.addTrace("manager.media.uploadBinary: body read", {
             size: rawBody.length,
         });
@@ -94,6 +136,12 @@ async function handleMediaBinaryUpload(req, res) {
             });
             return;
         }
+        if (rawBody.length !== tokenPayload.size) {
+            sendJson(res, 400, {
+                message: "Upload size does not match signed size",
+            });
+            return;
+        }
         const optimizeOptions = parsedHeaders.optimizeRaw
             ? (() => {
                 try {
@@ -110,7 +158,6 @@ async function handleMediaBinaryUpload(req, res) {
                 }
             })()
             : undefined;
-        const mime = sanitizeMime(parsedHeaders.mime || getHeader(req, "content-type") || undefined);
         if (parsedHeaders.purpose === "profileAvatar") {
             if (!mime.startsWith("image/")) {
                 sendJson(res, 400, {
@@ -138,6 +185,10 @@ async function handleMediaBinaryUpload(req, res) {
         });
         const media = (0, media_1.getMediaService)();
         Logger_1.Logger.addTrace("manager.media.uploadBinary: media service ready");
+        await assertObjectDoesNotExist({
+            key: optimized.key,
+            access: parsedHeaders.access,
+        });
         await media.rawAdapter.putObject({
             key: optimized.key,
             access: parsedHeaders.access,
@@ -150,6 +201,10 @@ async function handleMediaBinaryUpload(req, res) {
             size: optimized.content.length,
         });
         if (optimized.preview) {
+            await assertObjectDoesNotExist({
+                key: optimized.preview.key,
+                access: parsedHeaders.access,
+            });
             await media.rawAdapter.putObject({
                 key: optimized.preview.key,
                 access: parsedHeaders.access,
@@ -163,6 +218,10 @@ async function handleMediaBinaryUpload(req, res) {
             });
         }
         if (optimized.sizes?.length) {
+            await Promise.all(optimized.sizes.map((size) => assertObjectDoesNotExist({
+                key: size.key,
+                access: parsedHeaders.access,
+            })));
             await Promise.all(optimized.sizes.map((size) => media.rawAdapter.putObject({
                 key: size.key,
                 access: parsedHeaders.access,
@@ -211,6 +270,13 @@ async function handleMediaBinaryUpload(req, res) {
             });
             return;
         }
+        if (error instanceof Error &&
+            error.message === "Upload body exceeds signed size") {
+            sendJson(res, 413, {
+                message: error.message,
+            });
+            return;
+        }
         if (error instanceof Error) {
             sendJson(res, 500, {
                 message: error.message,

package/dist/cjs/api/routes/manager/media/uploadBinary.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadBinary.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/media/uploadBinary.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"uploadBinary.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/media/uploadBinary.ts"],"names":[],"mappings":"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"}

package/dist/cjs/api/routes/manager/migrations/list.js

@@ -5,7 +5,7 @@ const orm_1 = require("../../../../orm");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
 const listMigrationsHandler = async ({ ctx, }) => {
     const user = ctx.getUser();
-    (0, checkPermissions_1.checkPermissions)(user, ["manager.migrations.readAny"]);
+    (0, checkPermissions_1.checkPermissions)(user, ["content.Migration.readAny"]);
     const db = await (0, orm_1.getMongoService)();
     return db.migrations.list();
 };

package/dist/cjs/api/routes/manager/migrations/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/migrations/list.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAGlD,sEAAmE;AAE5D,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,GAAG,GAGJ,EAAiC,EAAE;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,4BAA4B,CAAC,CAAC,CAAC;IACvD,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC;AATW,QAAA,qBAAqB,yBAShC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/migrations/list.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAGlD,sEAAmE;AAE5D,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,GAAG,GAGJ,EAAiC,EAAE;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC;AATW,QAAA,qBAAqB,yBAShC"}

package/dist/cjs/api/routes/manager/permissions.js

@@ -5,7 +5,7 @@ const Permissions_1 = require("../../../lib/Permissions");
 const checkPermissions_1 = require("../../utils/checkPermissions");
 const permissionsHandler = async ({ ctx, }) => {
     const user = ctx.getUser();
-    (0, checkPermissions_1.checkAnyPermissions)(user, ["manager.permissions.readAny", "manager.roles.updateAny"]);
+    (0, checkPermissions_1.checkAnyPermissions)(user, ["content.ManagerRole.updateAny"]);
     return (0, Permissions_1.getPermissionList)();
 };
 exports.permissionsHandler = permissionsHandler;

package/dist/cjs/api/routes/manager/permissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/permissions.ts"],"names":[],"mappings":";;;AAAA,0DAA6D;AAE7D,mEAAmE;AAE5D,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,GAAG,GAGJ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,sCAAmB,EAAC,IAAI,EAAE,CAAC,6BAA6B,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAEtF,OAAO,IAAA,+BAAiB,GAAE,CAAC;AAC7B,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B"}
+{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/permissions.ts"],"names":[],"mappings":";;;AAAA,0DAA6D;AAE7D,mEAAmE;AAE5D,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,GAAG,GAGJ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,sCAAmB,EAAC,IAAI,EAAE,CAAC,+BAA+B,CAAC,CAAC,CAAC;IAE7D,OAAO,IAAA,+BAAiB,GAAE,CAAC;AAC7B,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B"}

package/dist/cjs/api/routes/manager/preview/create.js

@@ -7,6 +7,7 @@ const bootstrapState_1 = require("../../../../bootstrapState");
 const internal_content_types_1 = require("../../../../internal-content-types");
 const errors_1 = require("../../../../lib/errors");
 const Logger_1 = require("../../../../lib/Logger");
+const Permissions_1 = require("../../../../lib/Permissions");
 const orm_1 = require("../../../../orm");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
 const checkOwnership_1 = require("../../../utils/checkOwnership");
@@ -63,7 +64,10 @@ const createPreviewHandler = async ({ input, ctx, }) => {
         });
     }
     else {
-        (0, checkPermissions_1.checkPermissions)(user, [`content.${contentType.name}.own`]);
+        const createPermission = (0, Permissions_1.getContentPermission)(contentType, 'own');
+        if (createPermission) {
+            (0, checkPermissions_1.checkPermissions)(user, [createPermission]);
+        }
     }
     const db = await (0, orm_1.getMongoService)();
     const { route, routes, routeSettings } = await getPreviewRoute({

package/dist/cjs/api/routes/manager/preview/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/preview/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/preview/create.ts"],"names":[],"mappings":"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"}

package/dist/cjs/api/routes/manager/regenerateRoutes.js

@@ -5,7 +5,7 @@ const updateRoutesMap_1 = require("../../utils/routes/updateRoutesMap");
 const checkPermissions_1 = require("../../utils/checkPermissions");
 const regenerateRoutesHandler = async ({ ctx, }) => {
     const user = ctx.getUser();
-    (0, checkPermissions_1.checkPermissions)(user, ["manager.routes.updateAny"]);
+    (0, checkPermissions_1.checkPermissions)(user, ["content.Route.updateAny"]);
     await (0, updateRoutesMap_1.regenerateAllRoutesMap)();
     return { ok: true };
 };

package/dist/cjs/api/routes/manager/regenerateRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"regenerateRoutes.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/regenerateRoutes.ts"],"names":[],"mappings":";;;AAAA,wEAA4E;AAE5E,mEAAgE;AAEzD,MAAM,uBAAuB,GAAG,KAAK,EAAE,EAC5C,GAAG,GAGJ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAErD,MAAM,IAAA,wCAAsB,GAAE,CAAC;IAC/B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AAVW,QAAA,uBAAuB,2BAUlC"}
+{"version":3,"file":"regenerateRoutes.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/regenerateRoutes.ts"],"names":[],"mappings":";;;AAAA,wEAA4E;AAE5E,mEAAgE;AAEzD,MAAM,uBAAuB,GAAG,KAAK,EAAE,EAC5C,GAAG,GAGJ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAEpD,MAAM,IAAA,wCAAsB,GAAE,CAAC;IAC/B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AAVW,QAAA,uBAAuB,2BAUlC"}

package/dist/cjs/api/routes/manager/setDefaultLanguage.js

@@ -5,12 +5,13 @@ const internal_content_types_1 = require("../../../internal-content-types");
 const errors_1 = require("../../../lib/errors");
 const orm_1 = require("../../../orm");
 const checkPermissions_1 = require("../../utils/checkPermissions");
+const updateRoutesMap_1 = require("../../utils/routes/updateRoutesMap");
 const setDefaultLanguageHandler = async ({ input, ctx, }) => {
     const db = await (0, orm_1.getMongoService)();
     const { language: languageCode } = input;
     const user = ctx.getUser();
     const language = await db.find(internal_content_types_1.Language, { code: languageCode });
-    (0, checkPermissions_1.checkPermissions)(user, ["manager.languages.updateAny"]);
+    (0, checkPermissions_1.checkPermissions)(user, ["content.Language.updateAny"]);
     if (!language) {
         (0, errors_1.throwAppError)("NOT_FOUND", {
             resource: "Language",
@@ -19,11 +20,15 @@ const setDefaultLanguageHandler = async ({ input, ctx, }) => {
     }
     // First, unset the current default language
     const currentDefault = await db.find(internal_content_types_1.Language, { default: true });
-    if (currentDefault && currentDefault._id !== language._id) {
+    const defaultChanged = !currentDefault || String(currentDefault._id) !== String(language._id);
+    if (currentDefault && String(currentDefault._id) !== String(language._id)) {
         await db.update(internal_content_types_1.Language, currentDefault._id, { default: false });
     }
     // Then, set the new default language
     await db.update(internal_content_types_1.Language, language._id, { default: true });
+    if (defaultChanged) {
+        await (0, updateRoutesMap_1.regenerateAllRoutesMap)();
+    }
     return { ok: true };
 };
 exports.setDefaultLanguageHandler = setDefaultLanguageHandler;

package/dist/cjs/api/routes/manager/setDefaultLanguage.js.map

@@ -1 +1 @@
-{"version":3,"file":"setDefaultLanguage.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/setDefaultLanguage.ts"],"names":[],"mappings":";;;AAAA,4EAA2D;AAC3D,gDAAoD;AACpD,sCAA+C;AAG/C,mEAAgE;AAEzD,MAAM,yBAAyB,GAAG,KAAK,EAAE,EAC9C,KAAK,EACL,GAAG,GAIJ,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACzC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,iCAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjE,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC;IAExD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IAAA,sBAAa,EAAC,WAAW,EAAE;YACzB,QAAQ,EAAE,UAAU;YACpB,EAAE,EAAE,YAAY;SACjB,CAAC,CAAC;IACL,CAAC;IAED,4CAA4C;IAC5C,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,iCAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,IAAI,cAAc,IAAI,cAAc,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1D,MAAM,EAAE,CAAC,MAAM,CAAC,iCAAQ,EAAE,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,qCAAqC;IACrC,MAAM,EAAE,CAAC,MAAM,CAAC,iCAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AA7BW,QAAA,yBAAyB,6BA6BpC"}
+{"version":3,"file":"setDefaultLanguage.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/setDefaultLanguage.ts"],"names":[],"mappings":";;;AAAA,4EAA2D;AAC3D,gDAAoD;AACpD,sCAA+C;AAG/C,mEAAgE;AAChE,wEAA4E;AAErE,MAAM,yBAAyB,GAAG,KAAK,EAAE,EAC9C,KAAK,EACL,GAAG,GAIJ,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACzC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,iCAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjE,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAEvD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IAAA,sBAAa,EAAC,WAAW,EAAE;YACzB,QAAQ,EAAE,UAAU;YACpB,EAAE,EAAE,YAAY;SACjB,CAAC,CAAC;IACL,CAAC;IAED,4CAA4C;IAC5C,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,iCAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,MAAM,cAAc,GAClB,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEzE,IAAI,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1E,MAAM,EAAE,CAAC,MAAM,CAAC,iCAAQ,EAAE,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,qCAAqC;IACrC,MAAM,EAAE,CAAC,MAAM,CAAC,iCAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,IAAA,wCAAsB,GAAE,CAAC;IACjC,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AApCW,QAAA,yBAAyB,6BAoCpC"}

package/dist/cjs/api/routes/manager/translateDocument.js

@@ -7,7 +7,6 @@ const errors_1 = require("../../../lib/errors");
 const dbService_1 = require("../../../orm/dbService");
 const orm_1 = require("../../../orm");
 const translation_1 = require("../../../translation");
-const proxies_1 = require("../../proxies");
 const checkOwnership_1 = require("../../utils/checkOwnership");
 const getLanguages_1 = require("../../utils/getLanguages");
 const requireContentType_1 = require("../../utils/requireContentType");
@@ -81,14 +80,7 @@ const translateDocumentHandler = async ({ input, ctx, }) => {
         }
         const parsedUpdate = contentType.partialValidate(data);
         Logger_1.Logger.addTrace("manager.translateDocument: input validated");
-        const inputProxy = (0, proxies_1.getInputProxy)(contentType.name);
-        const proxied = inputProxy
-            ? await inputProxy(parsedUpdate)
-            : parsedUpdate;
-        if (inputProxy) {
-            Logger_1.Logger.addTrace("manager.translateDocument: input proxied");
-        }
-        const updated = await db.update(contentType, input.id, proxied, {
+        const updated = await db.update(contentType, input.id, parsedUpdate, {
             actorId: user._id,
             reason: "manager translate",
         });

package/dist/cjs/api/routes/manager/translateDocument.js.map

@@ -1 +1 @@
-{"version":3,"file":"translateDocument.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/translateDocument.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"translateDocument.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/translateDocument.ts"],"names":[],"mappings":"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"}

package/dist/cjs/api/routes/manager/trash.js

@@ -7,6 +7,7 @@ const orm_1 = require("../../../orm");
 const checkOwnership_1 = require("../../utils/checkOwnership");
 const requireContentType_1 = require("../../utils/requireContentType");
 const revalidatePath_1 = require("../../utils/routes/revalidatePath");
+const localeVariants_1 = require("../../utils/localeVariants");
 const trashHandler = async ({ input, ctx, }) => {
     const db = await (0, orm_1.getMongoService)();
     const { contentType: contentTypeName, id } = input;
@@ -36,6 +37,10 @@ const trashHandler = async ({ input, ctx, }) => {
     }
     const user = ctx.getUser();
     const current = await db.get(contentType, id);
+    const localeVariantRemoval = await (0, localeVariants_1.prepareLocaleVariantRemoval)({
+        contentType,
+        id,
+    });
     const currentVisibility = current._visibility ?? "published";
     const isRestorableVisibility = (value) => value === "draft" || value === "hidden" || value === "published";
     const visibilityBeforeTrash = currentVisibility === "trash"
@@ -62,8 +67,8 @@ const trashHandler = async ({ input, ctx, }) => {
     Logger_1.Logger.addTrace("manager.trash: db trash success");
     await (0, revalidatePath_1.checkRevalidatePath)({
         contentType: contentType.name,
-        contentTypeId: id,
-        operation: "delete",
+        contentTypeId: localeVariantRemoval.revalidateContentTypeId,
+        operation: localeVariantRemoval.revalidateContentTypeId === id ? "delete" : "update",
     });
     return { ok: true };
 };

package/dist/cjs/api/routes/manager/trash.js.map

@@ -1 +1 @@
-{"version":3,"file":"trash.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/trash.ts"],"names":[],"mappings":";;;AACA,gDAAoD;AACpD,gDAA6C;AAC7C,sCAA+C;AAE/C,+DAA4D;AAC5D,uEAAoE;AACpE,sEAAwE;AAEjE,MAAM,YAAY,GAAG,KAAK,EAAE,EACjC,KAAK,EACL,GAAG,GAIJ,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,WAAW,GAAG,IAAA,uCAAkB,EAAC,eAAe,CAAC,CAAC;IAExD,MAAM,IAAA,+BAAc,EAAC;QACnB,GAAG;QACH,WAAW;QACX,EAAE;QACF,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACjC,IAAA,sBAAa,EAAC,WAAW,EAAE;YACzB,MAAM,EACJ,yEAAyE;SAC5E,CAAC,CAAC;IACL,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAChE,eAAM,CAAC,QAAQ,CAAC,sCAAsC,EAAE;QACtD,KAAK,EAAE,YAAY,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAA,sBAAa,EAAC,UAAU,EAAE;YACxB,OAAO,EAAE,+DAA+D,YAAY;iBACjF,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,WAAW,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC;iBAC/C,IAAI,CAAC,IAAI,CAAC,EAAE;YACf,GAAG,EAAE,oBAAoB;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,iBAAiB,GACpB,OAAoC,CAAC,WAAW,IAAI,WAAW,CAAC;IACnE,MAAM,sBAAsB,GAAG,CAC7B,KAAyB,EACkB,EAAE,CAC7C,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,WAAW,CAAC;IACnE,MAAM,qBAAqB,GACzB,iBAAiB,KAAK,OAAO;QAC3B,CAAC,CAAE,OAA+C,CAAC,sBAAsB;QACzE,CAAC,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;YACzC,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,WAAW,CAAC;IAEpB,MAAM,EAAE,CAAC,MAAM,CACb,WAAW,EACX,EAAE,EACF;QACE,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,GAAG,CAAC,WAAW,CAAC,kBAAkB;YAChC,CAAC,CAAC;gBACE,WAAW,EAAE,OAAO;gBACpB,sBAAsB,EAAE,sBAAsB,CAAC,qBAAqB,CAAC;oBACnE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,WAAW;aAChB;YACH,CAAC,CAAC,EAAE,CAAC;KACR,EACD;QACE,OAAO,EAAE,IAAI,CAAC,GAAG;QACjB,MAAM,EAAE,eAAe;KACxB,CACF,CAAC;IACF,eAAM,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;IAEnD,MAAM,IAAA,oCAAmB,EAAC;QACxB,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,QAAQ;KACpB,CAAC,CAAC;IAEH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AApFW,QAAA,YAAY,gBAoFvB"}
+{"version":3,"file":"trash.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/trash.ts"],"names":[],"mappings":"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"}

package/dist/cjs/api/routes/manager/update.js

@@ -6,15 +6,16 @@ const errors_1 = require("../../../lib/errors");
 const Logger_1 = require("../../../lib/Logger");
 const orm_1 = require("../../../orm");
 const dbService_1 = require("../../../orm/dbService");
-const proxies_1 = require("../../proxies");
 const checkOwnership_1 = require("../../utils/checkOwnership");
 const requireContentType_1 = require("../../utils/requireContentType");
 const revalidatePath_1 = require("../../utils/routes/revalidatePath");
+const sanitizeManagerOutput_1 = require("../../utils/sanitizeManagerOutput");
 const updateHandler = async ({ input, ctx, }) => {
     const db = await (0, orm_1.getMongoService)();
-    const { contentType: contentTypeName, id, data } = input;
+    const { contentType: contentTypeName, id } = input;
     const user = ctx.getUser();
     const contentType = (0, requireContentType_1.requireContentType)(contentTypeName);
+    const data = input.data;
     await (0, checkOwnership_1.checkOwnership)({
         ctx,
         contentType,
@@ -39,13 +40,7 @@ const updateHandler = async ({ input, ctx, }) => {
             updatedBy: user._id,
         });
         Logger_1.Logger.addTrace("manager.update: input validated");
-        const inputProxy = (0, proxies_1.getInputProxy)(contentType.name);
-        let proxied = parsedInput;
-        if (inputProxy) {
-            proxied = await inputProxy(parsedInput);
-            Logger_1.Logger.addTrace("manager.update: input proxied");
-        }
-        const updated = await db.update(contentType, id, proxied, {
+        const updated = await db.update(contentType, id, parsedInput, {
             actorId: user._id,
         });
         Logger_1.Logger.addTrace("manager.update: db update success", { id: updated._id });
@@ -54,7 +49,7 @@ const updateHandler = async ({ input, ctx, }) => {
             contentTypeId: updated._id,
             operation: "update",
         });
-        return updated;
+        return (0, sanitizeManagerOutput_1.sanitizeManagerOutput)(updated, contentType);
     }
     catch (error) {
         if (error instanceof zod_1.z.ZodError || error instanceof dbService_1.DbErrorInvalidData) {

package/dist/cjs/api/routes/manager/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/update.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,gDAAoD;AACpD,gDAA6C;AAC7C,sCAA+C;AAC/C,sDAA6E;AAE7E,+DAA4D;AAC5D,uEAAoE;AACpE,sEAAwE;AACxE,6EAA0E;AAEnE,MAAM,aAAa,GAAG,KAAK,EAAE,EAClC,KAAK,EACL,GAAG,GAIJ,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,WAAW,GAAG,IAAA,uCAAkB,EAAC,eAAe,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,KAAK,CAAC,IAA+B,CAAC;IAEnD,MAAM,IAAA,+BAAc,EAAC;QACnB,GAAG;QACH,WAAW;QACX,EAAE;QACF,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,MAAM,aAAa,GACjB,WAAW,CAAC,IAAI,KAAK,OAAO;QAC1B,CAAC,CAAC,CAAC,GAAG,EAAE;YACJ,MAAM,SAAS,GAAG,IAA+B,CAAC;YAClD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAC/C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAC5B,CAAC;YAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,IAAA,sBAAa,EAAC,WAAW,EAAE;oBACzB,MAAM,EACJ,2EAA2E;iBAC9E,CAAC,CAAC;YACL,CAAC;YAED,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC1C,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,IAAI,CAAC;IAEX,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,WAAW,CAAC,eAAe,CAAC;YAC9C,GAAG,aAAa;YAChB,SAAS,EAAE,IAAI,CAAC,GAAG;SACpB,CAAC,CAAC;QACH,eAAM,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;QAEnD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,WAAW,EAAE;YAC5D,OAAO,EAAE,IAAI,CAAC,GAAG;SAClB,CAAC,CAAC;QACH,eAAM,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAE1E,MAAM,IAAA,oCAAmB,EAAC;YACxB,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,aAAa,EAAE,OAAO,CAAC,GAAG;YAC1B,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QAEH,OAAO,IAAA,6CAAqB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,OAAC,CAAC,QAAQ,IAAI,KAAK,YAAY,8BAAkB,EAAE,CAAC;YACvE,IAAA,sBAAa,EAAC,YAAY,EAAE;gBAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,KAAK,YAAY,2BAAe,EAAE,CAAC;YACrC,IAAA,sBAAa,EAAC,UAAU,EAAE;gBACxB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,EAAE,KAAK,CAAC,OAAiB;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AA1EW,QAAA,aAAa,iBA0ExB"}

package/dist/cjs/api/routes/manager/users.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listMentionUsersHandler = exports.fallbackMentionUser = exports.toMentionUser = void 0;
+const internal_content_types_1 = require("../../../internal-content-types");
+const orm_1 = require("../../../orm");
+const toMentionUser = (user) => ({
+    _id: user._id,
+    name: user.name,
+    user: user.user,
+    avatar: user.avatarUrl || user.avatarPreviewUrl
+        ? {
+            url: user.avatarUrl,
+            previewUrl: user.avatarPreviewUrl,
+        }
+        : null,
+});
+exports.toMentionUser = toMentionUser;
+const fallbackMentionUser = (id) => ({
+    _id: id,
+    user: "Unknown user",
+    avatar: null,
+});
+exports.fallbackMentionUser = fallbackMentionUser;
+const listMentionUsersHandler = async ({ ctx, }) => {
+    ctx.getUser();
+    const db = await (0, orm_1.getMongoService)();
+    const result = await db.list(internal_content_types_1.ManagerUser, {
+        filter: {},
+        options: {
+            fields: ["name", "user", "avatarUrl", "avatarPreviewUrl"],
+            limit: "all",
+            sort: { user: "asc" },
+        },
+    });
+    return result.items.map((user) => (0, exports.toMentionUser)(user));
+};
+exports.listMentionUsersHandler = listMentionUsersHandler;
+//# sourceMappingURL=users.js.map

package/dist/cjs/api/routes/manager/users.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/users.ts"],"names":[],"mappings":";;;AAAA,4EAA8D;AAC9D,sCAA+C;AAYxC,MAAM,aAAa,GAAG,CAAC,IAA8B,EAAe,EAAE,CAAC,CAAC;IAC7E,GAAG,EAAE,IAAI,CAAC,GAAG;IACb,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,MAAM,EACJ,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB;QACrC,CAAC,CAAC;YACE,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,UAAU,EAAE,IAAI,CAAC,gBAAgB;SAClC;QACH,CAAC,CAAC,IAAI;CACX,CAAC,CAAC;AAXU,QAAA,aAAa,iBAWvB;AAEI,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAe,EAAE,CAAC,CAAC;IAC/D,GAAG,EAAE,EAAE;IACP,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,IAAI;CACb,CAAC,CAAC;AAJU,QAAA,mBAAmB,uBAI7B;AAEI,MAAM,uBAAuB,GAAG,KAAK,EAAE,EAC5C,GAAG,GAGJ,EAAmC,EAAE;IACpC,GAAG,CAAC,OAAO,EAAE,CAAC;IAEd,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,oCAAW,EAAE;QACxC,MAAM,EAAE,EAAE;QACV,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,CAAC;YACzD,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAW;SAC/B;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,IAAI,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC"}

package/dist/cjs/api/routes/manager/versions/get.js

@@ -5,7 +5,7 @@ const orm_1 = require("../../../../orm");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
 const getVersionHandler = async ({ input, ctx, }) => {
     const user = ctx.getUser();
-    (0, checkPermissions_1.checkPermissions)(user, ["manager.versions.readAny"]);
+    (0, checkPermissions_1.checkPermissions)(user, ["content.ContentVersion.readAny"]);
     const db = await (0, orm_1.getMongoService)();
     return db.versions.get(input.versionId);
 };

package/dist/cjs/api/routes/manager/versions/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/versions/get.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAMlD,sEAAmE;AAE5D,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,KAAK,EACL,GAAG,GAIJ,EAAwC,EAAE;IACzC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;AAC1C,CAAC,CAAC;AAXW,QAAA,iBAAiB,qBAW5B"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/versions/get.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAMlD,sEAAmE;AAE5D,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,KAAK,EACL,GAAG,GAIJ,EAAwC,EAAE;IACzC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAC3D,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAC;IACnC,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;AAC1C,CAAC,CAAC;AAXW,QAAA,iBAAiB,qBAW5B"}

package/dist/cjs/api/routes/manager/versions/list.js

@@ -5,7 +5,7 @@ const orm_1 = require("../../../../orm");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
 const listVersionsHandler = async ({ input, ctx, }) => {
     const user = ctx.getUser();
-    (0, checkPermissions_1.checkPermissions)(user, ['manager.versions.readAny']);
+    (0, checkPermissions_1.checkPermissions)(user, ['content.ContentVersion.readAny']);
     const db = await (0, orm_1.getMongoService)();
     return db.versions.list(input);
 };

package/dist/cjs/api/routes/manager/versions/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/versions/list.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAGjD,sEAAkE;AAG3D,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,KAAK,EACL,GAAG,GAIJ,EAA+B,EAAE;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;IAC1B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAA;IACpD,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAA;IAClC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AAChC,CAAC,CAAA;AAXY,QAAA,mBAAmB,uBAW/B"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../src/api/routes/manager/versions/list.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAGjD,sEAAkE;AAG3D,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,KAAK,EACL,GAAG,GAIJ,EAA+B,EAAE;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;IAC1B,IAAA,mCAAgB,EAAC,IAAI,EAAE,CAAC,gCAAgC,CAAC,CAAC,CAAA;IAC1D,MAAM,EAAE,GAAG,MAAM,IAAA,qBAAe,GAAE,CAAA;IAClC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AAChC,CAAC,CAAA;AAXY,QAAA,mBAAmB,uBAW/B"}

package/dist/cjs/api/routes/manager/versions/restore.js

@@ -7,7 +7,7 @@ const revalidatePath_1 = require("../../../utils/routes/revalidatePath");
 const checkPermissions_1 = require("../../../utils/checkPermissions");
 const restoreVersionHandler = async ({ input, ctx, }) => {
     const user = ctx.getUser();
-    (0, checkPermissions_1.checkPermissions)(user, ["manager.versions.updateAny"]);
+    (0, checkPermissions_1.checkPermissions)(user, ["content.ContentVersion.updateAny"]);
     const db = await (0, orm_1.getMongoService)();
     const result = await db.versions.restore({
         ...input,