@oneuptime/common 11.3.20 → 11.3.22

package/build/dist/Server/API/EnterpriseLicenseAPI.js

@@ -1,12 +1,22 @@
 import EnterpriseLicense from "../../Models/DatabaseModels/EnterpriseLicense";
+import EnterpriseLicenseInstance from "../../Models/DatabaseModels/EnterpriseLicenseInstance";
 import BadDataException from "../../Types/Exception/BadDataException";
+import EnterpriseLicenseUsageUtil from "../../Utils/EnterpriseLicense/EnterpriseLicenseUsage";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import EnterpriseLicenseService from "../Services/EnterpriseLicenseService";
+import EnterpriseLicenseInstanceService from "../Services/EnterpriseLicenseInstanceService";
 import UserMiddleware from "../Middleware/UserAuthorization";
 import JSONWebToken from "../Utils/JsonWebToken";
 import OneUptimeDate from "../../Types/Date";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
-// import { Host } from "../EnvironmentConfig";
+/*
+ * Bounds how many instance rows one license key can register. Real customers
+ * run a handful of instances; this stops a leaked key from being used to
+ * fill the table with junk rows.
+ */
+const MAX_INSTANCES_PER_LICENSE = 100;
 export default class EnterpriseLicenseAPI extends BaseAPI {
     constructor() {
         var _a, _b;
@@ -30,6 +40,7 @@ export default class EnterpriseLicenseAPI extends BaseAPI {
                         licenseKey: licenseKey,
                     },
                     select: {
+                        _id: true,
                         companyName: true,
                         expiresAt: true,
                         licenseKey: true,
@@ -53,6 +64,21 @@ export default class EnterpriseLicenseAPI extends BaseAPI {
                 if (secondsUntilExpiry <= 0) {
                     throw new BadDataException("License key has expired");
                 }
+                /*
+                 * The validating instance sends its instanceId and host so it
+                 * shows up in the instance list right away (usage is reported
+                 * later by the daily job on the instance).
+                 */
+                const instanceId = this.parseShortText(req.body["instanceId"]);
+                const instanceHost = this.parseShortText(req.body["host"]);
+                if (instanceId) {
+                    await this.upsertLicenseInstance({
+                        licenseId: license.id,
+                        instanceId: instanceId,
+                        host: instanceHost || undefined,
+                    });
+                }
+                const instances = await this.findLicenseInstances(license.id);
                 const payload = {
                     companyName: license.companyName || "",
                     expiresAt: license.expiresAt.toISOString(),
@@ -71,6 +97,7 @@ export default class EnterpriseLicenseAPI extends BaseAPI {
                     userCountUpdatedAt: license.userCountUpdatedAt
                         ? license.userCountUpdatedAt.toISOString()
                         : null,
+                    instances: this.getInstanceSummaries(instances),
                     token,
                 });
             }
@@ -108,21 +135,51 @@ export default class EnterpriseLicenseAPI extends BaseAPI {
                     throw new BadDataException("License key is invalid");
                 }
                 const reportedAt = OneUptimeDate.getCurrentDate();
-                await EnterpriseLicenseService.updateOneById({
-                    id: license.id,
-                    data: {
-                        currentUserCount: userCount,
-                        userCountUpdatedAt: reportedAt,
-                    },
-                    props: {
-                        isRoot: true,
-                        ignoreHooks: true,
-                    },
-                });
+                const instanceId = this.parseShortText(req.body["instanceId"]);
+                const instanceHost = this.parseShortText(req.body["host"]);
+                const userEmailHashes = EnterpriseLicenseUsageUtil.sanitizeUserEmailHashes(req.body["userEmailHashes"]);
+                if (instanceId) {
+                    /*
+                     * Multi-instance report: track usage per instance and count
+                     * users uniquely across all instances of this license.
+                     */
+                    await this.upsertLicenseInstance({
+                        licenseId: license.id,
+                        instanceId: instanceId,
+                        host: instanceHost || undefined,
+                        userCount: userCount,
+                        userEmailHashes: userEmailHashes,
+                        lastReportedAt: reportedAt,
+                    });
+                }
+                const instances = await this.findLicenseInstances(license.id);
+                let currentUserCount = userCount;
+                if (instances.length > 0) {
+                    currentUserCount = EnterpriseLicenseUsageUtil.getUniqueUserCount(instances, reportedAt);
+                }
+                /*
+                 * Legacy reports (no instanceId) only drive the license-wide count
+                 * while no instance has registered — otherwise they would stomp
+                 * the deduplicated multi-instance count.
+                 */
+                if (instanceId || instances.length === 0) {
+                    await EnterpriseLicenseService.updateOneById({
+                        id: license.id,
+                        data: {
+                            currentUserCount: currentUserCount,
+                            userCountUpdatedAt: reportedAt,
+                        },
+                        props: {
+                            isRoot: true,
+                            ignoreHooks: true,
+                        },
+                    });
+                }
                 return Response.sendJsonObjectResponse(req, res, {
-                    currentUserCount: userCount,
+                    currentUserCount: currentUserCount,
                     userCountUpdatedAt: reportedAt.toISOString(),
                     userLimit: typeof license.userLimit === "number" ? license.userLimit : null,
+                    instances: this.getInstanceSummaries(instances),
                 });
             }
             catch (err) {
@@ -130,5 +187,138 @@ export default class EnterpriseLicenseAPI extends BaseAPI {
             }
         });
     }
+    parseShortText(value) {
+        if (typeof value !== "string") {
+            return "";
+        }
+        return value.trim().substring(0, 100);
+    }
+    async findLicenseInstances(licenseId) {
+        return EnterpriseLicenseInstanceService.findBy({
+            query: {
+                enterpriseLicenseId: licenseId,
+            },
+            select: {
+                _id: true,
+                instanceId: true,
+                host: true,
+                userCount: true,
+                userEmailHashes: true,
+                lastReportedAt: true,
+            },
+            sort: {
+                createdAt: SortOrder.Ascending,
+            },
+            skip: 0,
+            limit: LIMIT_MAX,
+            props: {
+                isRoot: true,
+            },
+        });
+    }
+    getInstanceSummaries(instances) {
+        return instances.map((instance) => {
+            return {
+                instanceId: instance.instanceId || "",
+                host: instance.host || null,
+                userCount: typeof instance.userCount === "number" ? instance.userCount : null,
+                lastReportedAt: instance.lastReportedAt
+                    ? instance.lastReportedAt.toISOString()
+                    : null,
+            };
+        });
+    }
+    async upsertLicenseInstance(data) {
+        const updated = await this.updateLicenseInstanceIfExists(data);
+        if (updated) {
+            return;
+        }
+        const instanceCount = await EnterpriseLicenseInstanceService.countBy({
+            query: {
+                enterpriseLicenseId: data.licenseId,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (instanceCount.toNumber() >= MAX_INSTANCES_PER_LICENSE) {
+            throw new BadDataException("Too many instances are registered for this license. Please contact support@oneuptime.com.");
+        }
+        const newInstance = new EnterpriseLicenseInstance();
+        newInstance.enterpriseLicenseId = data.licenseId;
+        newInstance.instanceId = data.instanceId;
+        if (data.host !== undefined) {
+            newInstance.host = data.host;
+        }
+        if (data.userCount !== undefined) {
+            newInstance.userCount = data.userCount;
+        }
+        if (data.userEmailHashes !== undefined) {
+            newInstance.userEmailHashes = data.userEmailHashes;
+        }
+        if (data.lastReportedAt !== undefined) {
+            newInstance.lastReportedAt = data.lastReportedAt;
+        }
+        try {
+            await EnterpriseLicenseInstanceService.create({
+                data: newInstance,
+                props: {
+                    isRoot: true,
+                },
+            });
+        }
+        catch (err) {
+            /*
+             * A concurrent request created the row between our check and this
+             * insert — the unique index on (enterpriseLicenseId, instanceId)
+             * rejected the duplicate. Apply the report as an update instead.
+             */
+            const retried = await this.updateLicenseInstanceIfExists(data);
+            if (!retried) {
+                throw err;
+            }
+        }
+    }
+    async updateLicenseInstanceIfExists(data) {
+        const existingInstance = await EnterpriseLicenseInstanceService.findOneBy({
+            query: {
+                enterpriseLicenseId: data.licenseId,
+                instanceId: data.instanceId,
+            },
+            select: {
+                _id: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!existingInstance) {
+            return false;
+        }
+        const updateData = {};
+        if (data.host !== undefined) {
+            updateData.host = data.host;
+        }
+        if (data.userCount !== undefined) {
+            updateData.userCount = data.userCount;
+        }
+        if (data.userEmailHashes !== undefined) {
+            updateData.userEmailHashes = data.userEmailHashes;
+        }
+        if (data.lastReportedAt !== undefined) {
+            updateData.lastReportedAt = data.lastReportedAt;
+        }
+        if (Object.keys(updateData).length > 0) {
+            await EnterpriseLicenseInstanceService.updateOneById({
+                id: existingInstance.id,
+                data: updateData,
+                props: {
+                    isRoot: true,
+                    ignoreHooks: true,
+                },
+            });
+        }
+        return true;
+    }
 }
 //# sourceMappingURL=EnterpriseLicenseAPI.js.map

package/build/dist/Server/API/EnterpriseLicenseAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnterpriseLicenseAPI.js","sourceRoot":"","sources":["../../../../Server/API/EnterpriseLicenseAPI.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EnterpriseLicenseAPI.js","sourceRoot":"","sources":["../../../../Server/API/EnterpriseLicenseAPI.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/API/GlobalConfigAPI.js

@@ -6,7 +6,7 @@ import ObjectID from "../../Types/ObjectID";
 import BadDataException from "../../Types/Exception/BadDataException";
 import API from "../../Utils/API";
 import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse";
-import { EnterpriseLicenseValidationUrl } from "../EnvironmentConfig";
+import { EnterpriseLicenseValidationUrl, Host } from "../EnvironmentConfig";
 import UserMiddleware from "../Middleware/UserAuthorization";
 export default class GlobalConfigAPI extends BaseAPI {
     constructor() {
@@ -31,7 +31,8 @@ export default class GlobalConfigAPI extends BaseAPI {
                 next(err);
             }
         });
-        this.router.get(`${(_b = new this.entityType().getCrudApiPath()) === null || _b === void 0 ? void 0 : _b.toString()}/license`, async (req, res, next) => {
+        this.router.get(`${(_b = new this.entityType().getCrudApiPath()) === null || _b === void 0 ? void 0 : _b.toString()}/license`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+            var _a;
             try {
                 const config = await GlobalConfigService.findOneById({
                     id: ObjectID.getZeroObjectID(),
@@ -43,18 +44,35 @@ export default class GlobalConfigAPI extends BaseAPI {
                         enterpriseLicenseUserLimit: true,
                         enterpriseLicenseCurrentUserCount: true,
                         enterpriseLicenseUserCountUpdatedAt: true,
+                        enterpriseLicenseInstances: true,
+                        instanceId: true,
                     },
                     props: {
                         isRoot: true,
                     },
                 });
+                /*
+                 * This route also serves the login page (before sign-in), so it
+                 * cannot require authentication outright. Anonymous callers only
+                 * get enough to render the edition pill — the license key, token
+                 * and instance topology require a signed-in user.
+                 */
+                const isAuthenticatedUser = Boolean((_a = req.userAuthorization) === null || _a === void 0 ? void 0 : _a.userId);
+                const licenseValid = Boolean((config === null || config === void 0 ? void 0 : config.enterpriseLicenseToken) &&
+                    (config === null || config === void 0 ? void 0 : config.enterpriseLicenseExpiresAt) &&
+                    config.enterpriseLicenseExpiresAt.getTime() > Date.now());
                 const responseBody = {
                     companyName: (config === null || config === void 0 ? void 0 : config.enterpriseCompanyName) || null,
                     expiresAt: (config === null || config === void 0 ? void 0 : config.enterpriseLicenseExpiresAt)
                         ? config.enterpriseLicenseExpiresAt.toISOString()
                         : null,
-                    licenseKey: (config === null || config === void 0 ? void 0 : config.enterpriseLicenseKey) || null,
-                    token: (config === null || config === void 0 ? void 0 : config.enterpriseLicenseToken) || null,
+                    licenseKey: isAuthenticatedUser
+                        ? (config === null || config === void 0 ? void 0 : config.enterpriseLicenseKey) || null
+                        : null,
+                    token: isAuthenticatedUser
+                        ? (config === null || config === void 0 ? void 0 : config.enterpriseLicenseToken) || null
+                        : null,
+                    licenseValid: licenseValid,
                     userLimit: typeof (config === null || config === void 0 ? void 0 : config.enterpriseLicenseUserLimit) === "number"
                         ? config.enterpriseLicenseUserLimit
                         : null,
@@ -64,6 +82,13 @@ export default class GlobalConfigAPI extends BaseAPI {
                     userCountUpdatedAt: (config === null || config === void 0 ? void 0 : config.enterpriseLicenseUserCountUpdatedAt)
                         ? config.enterpriseLicenseUserCountUpdatedAt.toISOString()
                         : null,
+                    instances: isAuthenticatedUser &&
+                        Array.isArray(config === null || config === void 0 ? void 0 : config.enterpriseLicenseInstances)
+                        ? config.enterpriseLicenseInstances
+                        : [],
+                    instanceId: isAuthenticatedUser && (config === null || config === void 0 ? void 0 : config.instanceId)
+                        ? config.instanceId.toString()
+                        : null,
                 };
                 return Response.sendJsonObjectResponse(req, res, responseBody);
             }
@@ -78,10 +103,31 @@ export default class GlobalConfigAPI extends BaseAPI {
                 if (!licenseKey) {
                     throw new BadDataException("License key is required");
                 }
+                const globalConfigId = ObjectID.getZeroObjectID();
+                const existingConfig = await GlobalConfigService.findOneById({
+                    id: globalConfigId,
+                    select: {
+                        _id: true,
+                        instanceId: true,
+                    },
+                    props: {
+                        isRoot: true,
+                        ignoreHooks: true,
+                    },
+                });
+                /*
+                 * Send this instance's id and host along with the key so the
+                 * license server registers this instance against the license and
+                 * it shows up in the instance list on all instances that share
+                 * the license.
+                 */
+                const instanceId = (existingConfig === null || existingConfig === void 0 ? void 0 : existingConfig.instanceId) || ObjectID.generate();
                 const validationResponse = await API.post({
                     url: EnterpriseLicenseValidationUrl,
                     data: {
                         licenseKey,
+                        instanceId: instanceId.toString(),
+                        host: Host,
                     },
                 });
                 if (!validationResponse.isSuccess()) {
@@ -121,6 +167,9 @@ export default class GlobalConfigAPI extends BaseAPI {
                         userCountUpdatedAt = parsedReportedAt;
                     }
                 }
+                const instances = Array.isArray(payload["instances"])
+                    ? payload["instances"]
+                    : [];
                 const updatePayload = {
                     enterpriseCompanyName: companyNameRaw || null,
                     enterpriseLicenseKey: licenseKeyRaw || null,
@@ -129,18 +178,12 @@ export default class GlobalConfigAPI extends BaseAPI {
                     enterpriseLicenseUserLimit: userLimit,
                     enterpriseLicenseCurrentUserCount: currentUserCount,
                     enterpriseLicenseUserCountUpdatedAt: userCountUpdatedAt,
+                    enterpriseLicenseInstances: instances,
                 };
-                const globalConfigId = ObjectID.getZeroObjectID();
-                const existingConfig = await GlobalConfigService.findOneById({
-                    id: globalConfigId,
-                    select: {
-                        _id: true,
-                    },
-                    props: {
-                        isRoot: true,
-                        ignoreHooks: true,
-                    },
-                });
+                if (!(existingConfig === null || existingConfig === void 0 ? void 0 : existingConfig.instanceId)) {
+                    // Installs that predate instance ids: persist the one we generated.
+                    updatePayload.instanceId = instanceId;
+                }
                 if (existingConfig) {
                     await GlobalConfigService.updateOneById({
                         id: globalConfigId,
@@ -176,6 +219,8 @@ export default class GlobalConfigAPI extends BaseAPI {
                         newConfig.enterpriseLicenseUserCountUpdatedAt =
                             userCountUpdatedAt;
                     }
+                    newConfig.enterpriseLicenseInstances = instances;
+                    newConfig.instanceId = instanceId;
                     await GlobalConfigService.create({
                         data: newConfig,
                         props: {
@@ -194,6 +239,8 @@ export default class GlobalConfigAPI extends BaseAPI {
                     userCountUpdatedAt: userCountUpdatedAt
                         ? userCountUpdatedAt.toISOString()
                         : null,
+                    instances: instances,
+                    instanceId: instanceId.toString(),
                 });
             }
             catch (err) {

package/build/dist/Server/API/GlobalConfigAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalConfigAPI.js","sourceRoot":"","sources":["../../../../Server/API/GlobalConfigAPI.ts"],"names":[],"mappings":"AAAA,OAAO,mBAEN,MAAM,iCAAiC,CAAC;AAMzC,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,YAAY,MAAM,0CAA0C,CAAC;AACpE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,iBAAiB,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAG5C;IACC;;QACE,KAAK,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,GAAG,MAAA,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,0CAAE,QAAQ,EAAE,OAAO,EAC5D,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI,CAAC;gBACH,MAAM,YAAY,GAChB,MAAM,mBAAmB,CAAC,WAAW,CAAC;oBACpC,EAAE,EAAE,QAAQ,CAAC,eAAe,EAAE;oBAC9B,MAAM,EAAE;wBACN,0BAA0B,EAAE,IAAI;qBACjC;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEL,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC/C,0BAA0B,EAAE,OAAO,CACjC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,0BAA0B,CACzC;iBACF,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,GAAG,MAAA,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,0CAAE,QAAQ,EAAE,UAAU,EAC/D,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI,CAAC;gBACH,MAAM,MAAM,GACV,MAAM,mBAAmB,CAAC,WAAW,CAAC;oBACpC,EAAE,EAAE,QAAQ,CAAC,eAAe,EAAE;oBAC9B,MAAM,EAAE;wBACN,qBAAqB,EAAE,IAAI;wBAC3B,0BAA0B,EAAE,IAAI;wBAChC,oBAAoB,EAAE,IAAI;wBAC1B,sBAAsB,EAAE,IAAI;wBAC5B,0BAA0B,EAAE,IAAI;wBAChC,iCAAiC,EAAE,IAAI;wBACvC,mCAAmC,EAAE,IAAI;qBAC1C;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEL,MAAM,YAAY,GAAe;oBAC/B,WAAW,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,qBAAqB,KAAI,IAAI;oBAClD,SAAS,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,0BAA0B;wBAC3C,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAAC,WAAW,EAAE;wBACjD,CAAC,CAAC,IAAI;oBACR,UAAU,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,oBAAoB,KAAI,IAAI;oBAChD,KAAK,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,sBAAsB,KAAI,IAAI;oBAC7C,SAAS,EACP,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,0BAA0B,CAAA,KAAK,QAAQ;wBACpD,CAAC,CAAC,MAAM,CAAC,0BAA0B;wBACnC,CAAC,CAAC,IAAI;oBACV,gBAAgB,EACd,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,iCAAiC,CAAA,KAAK,QAAQ;wBAC3D,CAAC,CAAC,MAAM,CAAC,iCAAiC;wBAC1C,CAAC,CAAC,IAAI;oBACV,kBAAkB,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,mCAAmC;wBAC7D,CAAC,CAAC,MAAM,CAAC,mCAAmC,CAAC,WAAW,EAAE;wBAC1D,CAAC,CAAC,IAAI;iBACT,CAAC;gBAEF,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;YACjE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,MAAA,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,0CAAE,QAAQ,EAAE,UAAU,EAC/D,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;;YACtE,IAAI,CAAC;gBACH,MAAM,UAAU,GACd,CAAA,MAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAwB,0CAAE,IAAI,EAAE,KAAI,EAAE,CAAC;gBAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;gBACxD,CAAC;gBAED,MAAM,kBAAkB,GAEA,MAAM,GAAG,CAAC,IAAI,CAAa;oBACjD,GAAG,EAAE,8BAA8B;oBACnC,IAAI,EAAE;wBACJ,UAAU;qBACX;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE,CAAC;oBACpC,MAAM,YAAY,GAChB,kBAAkB,YAAY,iBAAiB;wBAC7C,CAAC,CAAC,kBAAkB,CAAC,OAAO;4BAC1B,iCAAiC;wBACnC,CAAC,CAAC,iCAAiC,CAAC;oBACxC,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC;gBAED,MAAM,OAAO,GAAe,kBAAkB,CAAC,IAAkB,CAAC;gBAElE,MAAM,cAAc,GAClB,CAAA,MAAC,OAAO,CAAC,aAAa,CAAwB,0CAAE,IAAI,EAAE,KAAI,EAAE,CAAC;gBAC/D,MAAM,YAAY,GACf,OAAO,CAAC,WAAW,CAAwB,IAAI,EAAE,CAAC;gBACrD,MAAM,aAAa,GACjB,CAAA,MAAC,OAAO,CAAC,YAAY,CAAwB,0CAAE,IAAI,EAAE,KAAI,UAAU,CAAC;gBACtE,MAAM,YAAY,GACf,OAAO,CAAC,OAAO,CAAwB,IAAI,EAAE,CAAC;gBAEjD,IAAI,aAAa,GAAqB,SAAS,CAAC;gBAChD,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,UAAU,GAAS,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC;oBAEhD,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;wBACvC,MAAM,IAAI,gBAAgB,CACxB,qDAAqD,CACtD,CAAC;oBACJ,CAAC;oBAED,aAAa,GAAG,UAAU,CAAC;gBAC7B,CAAC;gBAED,MAAM,YAAY,GAAY,OAAO,CAAC,WAAW,CAAC,CAAC;gBACnD,MAAM,SAAS,GACb,OAAO,YAAY,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAC/D,CAAC,CAAC,YAAY;oBACd,CAAC,CAAC,IAAI,CAAC;gBAEX,MAAM,mBAAmB,GAAY,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBACjE,MAAM,gBAAgB,GACpB,OAAO,mBAAmB,KAAK,QAAQ;oBACvC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC;oBAClC,CAAC,CAAC,mBAAmB;oBACrB,CAAC,CAAC,IAAI,CAAC;gBAEX,MAAM,qBAAqB,GAAuB,OAAO,CACvD,oBAAoB,CACC,CAAC;gBACxB,IAAI,kBAAkB,GAAgB,IAAI,CAAC;gBAC3C,IAAI,qBAAqB,EAAE,CAAC;oBAC1B,MAAM,gBAAgB,GAAS,IAAI,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;wBAC9C,kBAAkB,GAAG,gBAAgB,CAAC;oBACxC,CAAC;gBACH,CAAC;gBAED,MAAM,aAAa,GAAgC;oBACjD,qBAAqB,EAAE,cAAc,IAAI,IAAI;oBAC7C,oBAAoB,EAAE,aAAa,IAAI,IAAI;oBAC3C,0BAA0B,EAAE,aAAa,IAAI,IAAI;oBACjD,sBAAsB,EAAE,YAAY,IAAI,IAAI;oBAC5C,0BAA0B,EAAE,SAAS;oBACrC,iCAAiC,EAAE,gBAAgB;oBACnD,mCAAmC,EAAE,kBAAkB;iBACxD,CAAC;gBAEF,MAAM,cAAc,GAAa,QAAQ,CAAC,eAAe,EAAE,CAAC;gBAE5D,MAAM,cAAc,GAClB,MAAM,mBAAmB,CAAC,WAAW,CAAC;oBACpC,EAAE,EAAE,cAAc;oBAClB,MAAM,EAAE;wBACN,GAAG,EAAE,IAAI;qBACV;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;wBACZ,WAAW,EAAE,IAAI;qBAClB;iBACF,CAAC,CAAC;gBAEL,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,mBAAmB,CAAC,aAAa,CAAC;wBACtC,EAAE,EAAE,cAAc;wBAClB,IAAI,EAAE,aAAa;wBACnB,KAAK,EAAE;4BACL,MAAM,EAAE,IAAI;4BACZ,WAAW,EAAE,IAAI;yBAClB;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,SAAS,GAAiB,IAAI,YAAY,EAAE,CAAC;oBACnD,SAAS,CAAC,EAAE,GAAG,cAAc,CAAC;oBAE9B,IAAI,cAAc,EAAE,CAAC;wBACnB,SAAS,CAAC,qBAAqB,GAAG,cAAc,CAAC;oBACnD,CAAC;oBAED,IAAI,aAAa,EAAE,CAAC;wBAClB,SAAS,CAAC,oBAAoB,GAAG,aAAa,CAAC;oBACjD,CAAC;oBAED,IAAI,YAAY,EAAE,CAAC;wBACjB,SAAS,CAAC,sBAAsB,GAAG,YAAY,CAAC;oBAClD,CAAC;oBAED,IAAI,aAAa,EAAE,CAAC;wBAClB,SAAS,CAAC,0BAA0B,GAAG,aAAa,CAAC;oBACvD,CAAC;oBAED,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;wBACvB,SAAS,CAAC,0BAA0B,GAAG,SAAS,CAAC;oBACnD,CAAC;oBAED,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;wBAC9B,SAAS,CAAC,iCAAiC,GAAG,gBAAgB,CAAC;oBACjE,CAAC;oBAED,IAAI,kBAAkB,EAAE,CAAC;wBACvB,SAAS,CAAC,mCAAmC;4BAC3C,kBAAkB,CAAC;oBACvB,CAAC;oBAED,MAAM,mBAAmB,CAAC,MAAM,CAAC;wBAC/B,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE;4BACL,MAAM,EAAE,IAAI;4BACZ,WAAW,EAAE,IAAI;yBAClB;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC/C,WAAW,EAAE,cAAc,IAAI,IAAI;oBACnC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;oBAC7D,UAAU,EAAE,aAAa,IAAI,IAAI;oBACjC,KAAK,EAAE,YAAY,IAAI,IAAI;oBAC3B,SAAS,EAAE,SAAS;oBACpB,gBAAgB,EAAE,gBAAgB;oBAClC,kBAAkB,EAAE,kBAAkB;wBACpC,CAAC,CAAC,kBAAkB,CAAC,WAAW,EAAE;wBAClC,CAAC,CAAC,IAAI;iBACT,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"GlobalConfigAPI.js","sourceRoot":"","sources":["../../../../Server/API/GlobalConfigAPI.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/API/StatusPageAPI.js

@@ -1021,8 +1021,13 @@ export default class StatusPageAPI extends BaseAPI {
                 next(err);
             }
         });
-        this.router.post(`${(_x = new this.entityType()
-            .getCrudApiPath()) === null || _x === void 0 ? void 0 : _x.toString()}/overview/:statusPageIdOrDomain`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+        /*
+         * Shared handler for the overview endpoint. Registered for both POST
+         * (used by the status page SPA) and GET (machine-readable access for
+         * crawlers / AI agents) so the authentication and authorization path
+         * can never drift between the two methods. It does not read req.body.
+         */
+        const overviewHandler = async (req, res, next) => {
             var _a;
             try {
                 const statusPageId = await resolveStatusPageIdOrThrow(req.params["statusPageIdOrDomain"]);
@@ -1489,26 +1494,25 @@ export default class StatusPageAPI extends BaseAPI {
                 }
                 let scheduledMaintenanceEvents = [];
                 if (statusPage.showScheduledMaintenanceEventsOnStatusPage) {
-                    scheduledMaintenanceEvents =
-                        await ScheduledMaintenanceService.findBy({
-                            query: {
-                                currentScheduledMaintenanceState: {
-                                    isOngoingState: true,
-                                },
-                                statusPages: statusPageId,
-                                projectId: statusPage.projectId,
-                                isVisibleOnStatusPage: true,
-                            },
-                            select: scheduledEventsSelect,
-                            sort: {
-                                startsAt: SortOrder.Ascending,
-                            },
-                            skip: 0,
-                            limit: LIMIT_PER_PROJECT,
-                            props: {
-                                isRoot: true,
+                    scheduledMaintenanceEvents = await ScheduledMaintenanceService.findBy({
+                        query: {
+                            currentScheduledMaintenanceState: {
+                                isOngoingState: true,
                             },
-                        });
+                            statusPages: statusPageId,
+                            projectId: statusPage.projectId,
+                            isVisibleOnStatusPage: true,
+                        },
+                        select: scheduledEventsSelect,
+                        sort: {
+                            startsAt: SortOrder.Ascending,
+                        },
+                        skip: 0,
+                        limit: LIMIT_PER_PROJECT,
+                        props: {
+                            isRoot: true,
+                        },
+                    });
                 }
                 let futureScheduledMaintenanceEvents = [];
                 if (statusPage.showScheduledMaintenanceEventsOnStatusPage) {
@@ -1693,12 +1697,23 @@ export default class StatusPageAPI extends BaseAPI {
                     monitorsInGroup: JSONFunctions.serialize(monitorsInGroup),
                     timelineIncidents: BaseModel.toJSONArray(timelineIncidents, Incident),
                 };
+                // These can serve private-page data on a GET; never let shared caches store them.
+                Response.setNoCacheHeaders(res);
                 return Response.sendJsonObjectResponse(req, res, response);
             }
             catch (err) {
                 next(err);
             }
-        });
+        };
+        const overviewApiPath = `${(_x = new this.entityType()
+            .getCrudApiPath()) === null || _x === void 0 ? void 0 : _x.toString()}/overview/:statusPageIdOrDomain`;
+        this.router.post(overviewApiPath, UserMiddleware.getUserMiddleware, overviewHandler);
+        /*
+         * GET variant of the overview endpoint. Same middleware and same handler
+         * as the POST route above — private status pages are rejected for
+         * unauthenticated callers exactly as they are on POST.
+         */
+        this.router.get(overviewApiPath, UserMiddleware.getUserMiddleware, overviewHandler);
         this.router.put(`${(_y = new this.entityType()
             .getCrudApiPath()) === null || _y === void 0 ? void 0 : _y.toString()}/update-subscription/:statusPageId/:subscriberId`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
             try {
@@ -1739,39 +1754,67 @@ export default class StatusPageAPI extends BaseAPI {
                 next(err);
             }
         });
-        this.router.post(`${(_2 = new this.entityType()
-            .getCrudApiPath()) === null || _2 === void 0 ? void 0 : _2.toString()}/incidents/:statusPageIdOrDomain`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+        /*
+         * Shared handler for the incidents list endpoint. Registered for both
+         * POST and GET (same auth path). It does not read req.body.
+         */
+        const incidentsListHandler = async (req, res, next) => {
             try {
                 const objectId = await resolveStatusPageIdOrThrow(req.params["statusPageIdOrDomain"]);
                 const response = await this.getIncidents(objectId, null, req);
+                // These can serve private-page data on a GET; never let shared caches store them.
+                Response.setNoCacheHeaders(res);
                 return Response.sendJsonObjectResponse(req, res, response);
             }
             catch (err) {
                 next(err);
             }
-        });
-        this.router.post(`${(_3 = new this.entityType()
-            .getCrudApiPath()) === null || _3 === void 0 ? void 0 : _3.toString()}/scheduled-maintenance-events/:statusPageIdOrDomain`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+        };
+        const incidentsListApiPath = `${(_2 = new this.entityType()
+            .getCrudApiPath()) === null || _2 === void 0 ? void 0 : _2.toString()}/incidents/:statusPageIdOrDomain`;
+        this.router.post(incidentsListApiPath, UserMiddleware.getUserMiddleware, incidentsListHandler);
+        this.router.get(incidentsListApiPath, UserMiddleware.getUserMiddleware, incidentsListHandler);
+        /*
+         * Shared handler for the scheduled maintenance events list endpoint.
+         * Registered for both POST and GET (same auth path). It does not read
+         * req.body.
+         */
+        const scheduledMaintenanceEventsListHandler = async (req, res, next) => {
             try {
                 const objectId = await resolveStatusPageIdOrThrow(req.params["statusPageIdOrDomain"]);
                 const response = await this.getScheduledMaintenanceEvents(objectId, null, req);
+                // These can serve private-page data on a GET; never let shared caches store them.
+                Response.setNoCacheHeaders(res);
                 return Response.sendJsonObjectResponse(req, res, response);
             }
             catch (err) {
                 next(err);
             }
-        });
-        this.router.post(`${(_4 = new this.entityType()
-            .getCrudApiPath()) === null || _4 === void 0 ? void 0 : _4.toString()}/announcements/:statusPageIdOrDomain`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+        };
+        const scheduledMaintenanceEventsListApiPath = `${(_3 = new this.entityType()
+            .getCrudApiPath()) === null || _3 === void 0 ? void 0 : _3.toString()}/scheduled-maintenance-events/:statusPageIdOrDomain`;
+        this.router.post(scheduledMaintenanceEventsListApiPath, UserMiddleware.getUserMiddleware, scheduledMaintenanceEventsListHandler);
+        this.router.get(scheduledMaintenanceEventsListApiPath, UserMiddleware.getUserMiddleware, scheduledMaintenanceEventsListHandler);
+        /*
+         * Shared handler for the announcements list endpoint. Registered for
+         * both POST and GET (same auth path). It does not read req.body.
+         */
+        const announcementsListHandler = async (req, res, next) => {
             try {
                 const objectId = await resolveStatusPageIdOrThrow(req.params["statusPageIdOrDomain"]);
                 const response = await this.getAnnouncements(objectId, null, req);
+                // These can serve private-page data on a GET; never let shared caches store them.
+                Response.setNoCacheHeaders(res);
                 return Response.sendJsonObjectResponse(req, res, response);
             }
             catch (err) {
                 next(err);
             }
-        });
+        };
+        const announcementsListApiPath = `${(_4 = new this.entityType()
+            .getCrudApiPath()) === null || _4 === void 0 ? void 0 : _4.toString()}/announcements/:statusPageIdOrDomain`;
+        this.router.post(announcementsListApiPath, UserMiddleware.getUserMiddleware, announcementsListHandler);
+        this.router.get(announcementsListApiPath, UserMiddleware.getUserMiddleware, announcementsListHandler);
         this.router.post(`${(_5 = new this.entityType()
             .getCrudApiPath()) === null || _5 === void 0 ? void 0 : _5.toString()}/incidents/:statusPageIdOrDomain/:incidentId`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
             try {