@oneuptime/common 12.0.18 → 12.0.20

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseSync.js

@@ -0,0 +1,174 @@
+/*
+ * Maps a license-server response (from /enterprise-license/validate or
+ * /enterprise-license/report-user-count) onto the GlobalConfig columns a
+ * self-hosted installation mirrors locally.
+ *
+ * Every field is three-state, and the distinction is the whole contract:
+ *
+ *   key absent  - the license server did not speak about this field. That is
+ *                 what an oneuptime.com older than this build looks like, so
+ *                 the stored value is left exactly as it is. Collapsing this
+ *                 to null is how a daily report would wipe a perfectly good
+ *                 license expiry and take the installation down.
+ *   null        - the server explicitly says "there is no value". Written as
+ *                 null, so clearing a seat limit on oneuptime.com actually
+ *                 clears it on the customer's installation.
+ *   a value     - validated, then written.
+ *
+ * Anything that is neither absent, null, nor a usable value is treated as
+ * absent and reported as a warning: a malformed response must never be able
+ * to corrupt license state that was correct a moment ago.
+ */
+export default class EnterpriseLicenseSyncUtil {
+    /*
+     * The license key is deliberately NOT synced. The installation authenticates
+     * with the key it already holds, and a response must never be able to swap
+     * it for another one.
+     */
+    static getGlobalConfigUpdateFromLicenseResponse(data) {
+        const payload = data.payload || {};
+        const updateData = {};
+        const warnings = [];
+        /*
+         * The seat limit. This is the field customers change on oneuptime.com and
+         * then wait for: without it here, buying seats never reaches the
+         * installation that is enforcing the old number.
+         */
+        if (this.isPresent(payload, "userLimit")) {
+            const rawUserLimit = payload["userLimit"];
+            if (rawUserLimit === null) {
+                updateData.enterpriseLicenseUserLimit = null;
+            }
+            else if (this.isNonNegativeInteger(rawUserLimit)) {
+                updateData.enterpriseLicenseUserLimit = rawUserLimit;
+            }
+            else {
+                warnings.push(`Ignored userLimit "${String(rawUserLimit)}" from the license server: it is not a non-negative whole number.`);
+            }
+        }
+        /*
+         * The count and its timestamp move together: a count with a stamp from a
+         * previous report would read as "confirmed today", which is the exact
+         * lie this whole sync exists to stop telling.
+         */
+        if (this.isPresent(payload, "currentUserCount")) {
+            const rawUserCount = payload["currentUserCount"];
+            if (this.isNonNegativeInteger(rawUserCount)) {
+                updateData.enterpriseLicenseCurrentUserCount = rawUserCount;
+                updateData.enterpriseLicenseUserCountUpdatedAt =
+                    this.parseDate(payload["userCountUpdatedAt"]) || data.reportedAt;
+            }
+            else if (rawUserCount === null) {
+                /*
+                 * The server has never had a count for this license. Nothing useful to
+                 * store, and blanking the last known count would be worse than keeping
+                 * it, so leave both columns alone.
+                 */
+                warnings.push("The license server reported no user count for this license. Keeping the previously stored usage.");
+            }
+            else {
+                warnings.push(`Ignored currentUserCount "${String(rawUserCount)}" from the license server: it is not a non-negative whole number. Keeping the previously stored usage.`);
+            }
+        }
+        /*
+         * Expiry drives licenseValid on the installation, so a renewal that never
+         * arrives here shows up as a license that expires on its original date
+         * however much the customer paid. Null is treated as absent on purpose: a
+         * report is not the place to strip an installation of its expiry.
+         */
+        if (this.isPresent(payload, "expiresAt") && payload["expiresAt"] !== null) {
+            const expiresAt = this.parseDate(payload["expiresAt"]);
+            if (expiresAt) {
+                updateData.enterpriseLicenseExpiresAt = expiresAt;
+            }
+            else {
+                warnings.push(`Ignored expiresAt "${String(payload["expiresAt"])}" from the license server: it is not a date.`);
+            }
+        }
+        if (this.isPresent(payload, "isEvaluationLicense")) {
+            const rawIsEvaluation = payload["isEvaluationLicense"];
+            if (typeof rawIsEvaluation === "boolean") {
+                updateData.enterpriseLicenseIsEvaluation = rawIsEvaluation;
+            }
+            else {
+                warnings.push(`Ignored isEvaluationLicense "${String(rawIsEvaluation)}" from the license server: it is not a boolean.`);
+            }
+        }
+        if (this.isPresent(payload, "companyName")) {
+            const companyName = this.parseNonEmptyString(payload["companyName"]);
+            /*
+             * An empty company name is what the server sends for a license with none
+             * set, and overwriting a good name with "" would be a visible regression
+             * in the modal. Only a real name is worth writing.
+             */
+            if (companyName) {
+                updateData.enterpriseCompanyName = companyName;
+            }
+        }
+        /*
+         * The token is opaque here - it is signed with the license server's secret
+         * and this side only checks that it exists. It is never cleared: a license
+         * that has expired is legitimately issued no token, and clearing it on the
+         * way past would compound an expiry the customer may be about to renew.
+         */
+        if (this.isPresent(payload, "token")) {
+            const token = this.parseNonEmptyString(payload["token"]);
+            if (token) {
+                updateData.enterpriseLicenseToken = token;
+            }
+        }
+        if (this.isPresent(payload, "instances")) {
+            const rawInstances = payload["instances"];
+            if (Array.isArray(rawInstances)) {
+                updateData.enterpriseLicenseInstances =
+                    rawInstances;
+            }
+            else {
+                warnings.push("Ignored the instance list from the license server: it is not an array.");
+            }
+        }
+        return {
+            updateData: updateData,
+            warnings: warnings,
+        };
+    }
+    /*
+     * Present means the key is on the object, even when it carries null or
+     * undefined. `"x" in payload` rather than a truthiness or undefined check,
+     * because "the server said null" and "the server said nothing" have to stay
+     * distinguishable all the way down.
+     */
+    static isPresent(payload, key) {
+        if (!Object.prototype.hasOwnProperty.call(payload, key)) {
+            return false;
+        }
+        // An explicit undefined is indistinguishable from silence. Treat it as one.
+        return payload[key] !== undefined;
+    }
+    static isNonNegativeInteger(value) {
+        return (typeof value === "number" &&
+            Number.isFinite(value) &&
+            Number.isInteger(value) &&
+            value >= 0);
+    }
+    static parseNonEmptyString(value) {
+        if (typeof value !== "string") {
+            return "";
+        }
+        return value.trim();
+    }
+    static parseDate(value) {
+        if (value instanceof Date) {
+            return Number.isNaN(value.getTime()) ? null : value;
+        }
+        if (typeof value !== "string" || !value.trim()) {
+            return null;
+        }
+        const parsed = new Date(value.trim());
+        if (Number.isNaN(parsed.getTime())) {
+            return null;
+        }
+        return parsed;
+    }
+}
+//# sourceMappingURL=EnterpriseLicenseSync.js.map

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseSync.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "12.0.18",
+  "version": "12.0.20",
   "description": "",
   "repository": {
     "type": "git",

package/Models/DatabaseModels/MarketingConversion.ts

@@ -1,410 +0,0 @@
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
-import Route from "../../Types/API/Route";
-import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
-import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
-import ColumnLength from "../../Types/Database/ColumnLength";
-import ColumnType from "../../Types/Database/ColumnType";
-import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
-import TableColumn from "../../Types/Database/TableColumn";
-import TableColumnType from "../../Types/Database/TableColumnType";
-import TableMetadata from "../../Types/Database/TableMetadata";
-import IconProp from "../../Types/Icon/IconProp";
-import { JSONObject } from "../../Types/JSON";
-import ObjectID from "../../Types/ObjectID";
-import { Column, Entity, Index } from "typeorm";
-
-/*
- * Internal table (no API access) recording server-confirmed conversions —
- * signups, booked meetings and paid subscriptions — together with the
- * attribution the converting visitor carried (ad click IDs, UTM parameters,
- * first touch) and the status of uploading them to ad platforms. Browser
- * analytics never write this table: rows are written by the Cal.com webhook and
- * the MarketingConversions worker job, which also reads it.
- *
- * This table is deliberately not a CRM. Contact, account and deal records live
- * in Revenue, and nothing here creates or advances them — a booked meeting is
- * a measured conversion, not a qualified opportunity.
- */
-@TableAccessControl({
-  create: [],
-  read: [],
-  update: [],
-  delete: [],
-})
-@CrudApiEndpoint(new Route("/marketing-conversion"))
-@TableMetadata({
-  tableName: "MarketingConversion",
-  singularName: "Marketing Conversion",
-  pluralName: "Marketing Conversions",
-  icon: IconProp.ChartBar,
-  tableDescription:
-    "Server-confirmed conversions (signups, meetings booked, paid subscriptions), the campaign attribution each carried, and their upload status to ad platforms for offline conversion tracking.",
-})
-@Entity({
-  name: "MarketingConversion",
-})
-/*
- * One conversion of each type per user/project. Postgres treats NULLs as
- * distinct, so these indexes only constrain rows that actually carry a user or
- * project id — conversion types with neither (a booked meeting from an
- * anonymous visitor) are de-duplicated by their deterministic primary key
- * instead.
- */
-@Index("uq_marketing_conversion_type_user", ["conversionType", "userId"], {
-  unique: true,
-})
-@Index(
-  "uq_marketing_conversion_type_project",
-  ["conversionType", "projectId"],
-  {
-    unique: true,
-  },
-)
-export default class MarketingConversion extends BaseModel {
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.ShortText,
-    required: true,
-    title: "Conversion Type",
-    description: "SignUp, MeetingBooked or PaidSubscription.",
-  })
-  @Column({
-    type: ColumnType.ShortText,
-    length: ColumnLength.ShortText,
-    nullable: false,
-  })
-  public conversionType?: string = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @Index("idx_marketing_conversion_user_id")
-  @TableColumn({
-    type: TableColumnType.ObjectID,
-    required: false,
-    title: "User ID",
-    description:
-      "User this conversion belongs to (SignUp conversions). Null when the conversion has no OneUptime user yet, as with a booked meeting.",
-  })
-  @Column({
-    type: ColumnType.ObjectID,
-    nullable: true,
-    transformer: ObjectID.getDatabaseTransformer(),
-  })
-  public userId?: ObjectID = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @Index("idx_marketing_conversion_project_id")
-  @TableColumn({
-    type: TableColumnType.ObjectID,
-    required: false,
-    title: "Project ID",
-    description:
-      "Project this conversion belongs to (PaidSubscription conversions).",
-  })
-  @Column({
-    type: ColumnType.ObjectID,
-    nullable: true,
-    transformer: ObjectID.getDatabaseTransformer(),
-  })
-  public projectId?: ObjectID = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.ShortText,
-    required: false,
-    title: "Email",
-    description:
-      "Email of the converting user. Never sent anywhere in the clear: every ad platform receives the SHA-256 in emailHash instead.",
-  })
-  @Column({
-    type: ColumnType.ShortText,
-    length: ColumnLength.ShortText,
-    nullable: true,
-  })
-  public email?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.JSON,
-    required: true,
-    title: "Click IDs",
-    description:
-      "Ad click identifiers (gclid, wbraid, gbraid, fbclid, ...) captured for this conversion.",
-  })
-  @Column({
-    type: ColumnType.JSON,
-    nullable: false,
-  })
-  public clickIds?: JSONObject = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.Date,
-    required: true,
-    title: "Conversion At",
-    description: "When the conversion happened.",
-  })
-  @Column({
-    type: ColumnType.Date,
-    nullable: false,
-  })
-  public conversionAt?: Date = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.Number,
-    required: false,
-    title: "Conversion Value (USD Cents)",
-    description:
-      "Conversion value in USD cents (monthly recurring revenue for paid subscriptions). Null when unknown (custom pricing) or not applicable (signups, booked meetings).",
-  })
-  @Column({
-    type: ColumnType.Number,
-    nullable: true,
-  })
-  public conversionValueInUSDCents?: number | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.JSON,
-    required: false,
-    title: "Upload State",
-    description:
-      "Per-ad-platform upload state, keyed by provider (google, meta, microsoft, linkedin, reddit, ...): { status: Uploaded|Failed|Skipped, attempts, error, uploadedAt }. Absent key or absent status means pending.",
-  })
-  @Column({
-    type: ColumnType.JSON,
-    nullable: true,
-  })
-  public uploadState?: JSONObject = undefined;
-
-  /*
-   * Last-touch UTM parameters, copied from the User or Project this conversion
-   * belongs to, or read from Cal booking metadata for a booked meeting.
-   *
-   * The ledger carried only clickIds until now, which meant the only thing
-   * that could answer "how many demos did this campaign produce" was the ad
-   * platform, and only for clicks it had auto-tagged. Any campaign delivering
-   * UTMs without a click id — a newsletter, a sponsorship, a conference link —
-   * was invisible in OneUptime's own data. These columns are what make the
-   * ledger reportable on its own.
-   */
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @Index("idx_marketing_conversion_utm_campaign")
-  @TableColumn({
-    type: TableColumnType.LongText,
-    required: false,
-    title: "UTM Campaign",
-    description: "Last-touch utm_campaign for this conversion.",
-  })
-  @Column({
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
-    nullable: true,
-  })
-  public utmCampaign?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @Index("idx_marketing_conversion_utm_source")
-  @TableColumn({
-    type: TableColumnType.LongText,
-    required: false,
-    title: "UTM Source",
-    description: "Last-touch utm_source for this conversion.",
-  })
-  @Column({
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
-    nullable: true,
-  })
-  public utmSource?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.LongText,
-    required: false,
-    title: "UTM Medium",
-    description: "Last-touch utm_medium for this conversion.",
-  })
-  @Column({
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
-    nullable: true,
-  })
-  public utmMedium?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.LongText,
-    required: false,
-    title: "UTM Term",
-    description: "Last-touch utm_term for this conversion.",
-  })
-  @Column({
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
-    nullable: true,
-  })
-  public utmTerm?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.LongText,
-    required: false,
-    title: "UTM Content",
-    description: "Last-touch utm_content for this conversion.",
-  })
-  @Column({
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
-    nullable: true,
-  })
-  public utmContent?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.LongText,
-    required: false,
-    title: "UTM URL",
-    description:
-      "Landing URL of the attributed visit. The only attribution a campaign leaves when its link carried a click id and no UTMs at all, as Google Ads auto-tagging does.",
-  })
-  @Column({
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
-    nullable: true,
-  })
-  public utmUrl?: string | undefined = undefined;
-
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @TableColumn({
-    type: TableColumnType.JSON,
-    required: false,
-    title: "First Touch Attribution",
-    description:
-      "UTM parameters, click IDs, landing URL and referrer from the visitor's first attributed visit. The utm* columns above hold last-touch values.",
-  })
-  @Column({
-    type: ColumnType.JSON,
-    nullable: true,
-  })
-  public firstTouchAttribution?: JSONObject | undefined = undefined;
-
-  /*
-   * SHA-256 of the lowercased, trimmed email (Common/Server/Utils/Attribution).
-   *
-   * Two jobs, and it is the same value for both. Ad platforms that support
-   * enhanced matching want exactly this digest, and it is the only key that
-   * can join a booked meeting to the signup it produced weeks later: a
-   * MeetingBooked row has no userId, a SignUp row has no booking, and the
-   * person may well have used a different device for each. Indexed because
-   * the chain-linking pass looks conversions up by it.
-   */
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @Index("idx_marketing_conversion_email_hash")
-  @TableColumn({
-    type: TableColumnType.ShortText,
-    required: false,
-    title: "Email Hash",
-    description:
-      "SHA-256 of the normalized (trimmed, lowercased) email. Used for ad-platform enhanced matching and to join conversions by the same person across the demo/signup boundary.",
-  })
-  @Column({
-    type: ColumnType.ShortText,
-    length: ColumnLength.ShortText,
-    nullable: true,
-  })
-  public emailHash?: string | undefined = undefined;
-
-  /*
-   * The earlier conversion by the same person that this one followed.
-   *
-   * Set by the MarketingConversions worker, never by a writer: the writers see
-   * one moment each and cannot know what came before it. A paid subscription
-   * pointing at a booked meeting is what makes "revenue this demo campaign
-   * produced" answerable — without it the ledger holds four unrelated rows for
-   * one customer journey.
-   */
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-    update: [],
-  })
-  @Index("idx_marketing_conversion_attributed_to")
-  @TableColumn({
-    type: TableColumnType.ObjectID,
-    required: false,
-    title: "Attributed To Conversion ID",
-    description:
-      "The earliest earlier conversion by the same person (matched on emailHash) that this conversion followed. Null when this is the first conversion in the chain.",
-  })
-  @Column({
-    type: ColumnType.ObjectID,
-    nullable: true,
-    transformer: ObjectID.getDatabaseTransformer(),
-  })
-  public attributedToConversionId?: ObjectID | undefined = undefined;
-}

package/Server/Services/MarketingConversionService.ts

@@ -1,10 +0,0 @@
-import DatabaseService from "./DatabaseService";
-import MarketingConversion from "../../Models/DatabaseModels/MarketingConversion";
-
-export class Service extends DatabaseService<MarketingConversion> {
-  public constructor() {
-    super(MarketingConversion);
-  }
-}
-
-export default new Service();