@oneuptime/common 12.0.17 → 12.0.19

package/build/dist/UI/Utils/NotificationMethodUtil.js

@@ -2,6 +2,8 @@ import UserCall from "../../Models/DatabaseModels/UserCall";
 import UserPush from "../../Models/DatabaseModels/UserPush";
 import UserSMS from "../../Models/DatabaseModels/UserSMS";
 import UserTelegram from "../../Models/DatabaseModels/UserTelegram";
+import UserSlack from "../../Models/DatabaseModels/UserSlack";
+import UserMicrosoftTeams from "../../Models/DatabaseModels/UserMicrosoftTeams";
 import UserWebhook from "../../Models/DatabaseModels/UserWebhook";
 import UserWhatsApp from "../../Models/DatabaseModels/UserWhatsApp";
 /*
@@ -19,6 +21,16 @@ const NOTIFICATION_METHOD_RELATIONS = [
         title: "Telegram",
         columns: ["telegramUserHandle", "telegramChatId"],
     },
+    {
+        relationName: "userSlack",
+        title: "Slack",
+        columns: ["slackUserName", "slackUserId"],
+    },
+    {
+        relationName: "userMicrosoftTeams",
+        title: "Microsoft Teams",
+        columns: ["microsoftTeamsUserName", "microsoftTeamsUserId"],
+    },
     /*
      * Only `name` is read here. A webhook URL is a bearer credential for
      * Slack/Discord/Teams style hooks, so it is deliberately never selected into
@@ -97,6 +109,18 @@ export default class NotificationMethodUtil {
                     NotificationMethodUtil.readColumn(model, "telegramChatId") ||
                     "Unknown Chat"));
         }
+        if (model instanceof UserSlack) {
+            return ("Slack: " +
+                (NotificationMethodUtil.readColumn(model, "slackUserName") ||
+                    NotificationMethodUtil.readColumn(model, "slackUserId") ||
+                    "Unknown Account"));
+        }
+        if (model instanceof UserMicrosoftTeams) {
+            return ("Microsoft Teams: " +
+                (NotificationMethodUtil.readColumn(model, "microsoftTeamsUserName") ||
+                    NotificationMethodUtil.readColumn(model, "microsoftTeamsUserId") ||
+                    "Unknown Account"));
+        }
         const identifier = NotificationMethodUtil.readColumn(model, "phone") ||
             NotificationMethodUtil.readColumn(model, "email") ||
             "";
@@ -113,7 +137,7 @@ export default class NotificationMethodUtil {
     }
     /*
      * Maps the id chosen in the dropdown back onto the rule being created. The
-     * dropdown is single-select, so at most one of the seven foreign keys is set.
+     * dropdown is single-select, so at most one of the nine foreign keys is set.
      * An id that matches nothing leaves the rule untouched, and the server then
      * rejects the create as having no notification method.
      */
@@ -149,6 +173,12 @@ export default class NotificationMethodUtil {
         assignById(models.userTelegrams, (id) => {
             rule.userTelegramId = id;
         });
+        assignById(models.userSlacks, (id) => {
+            rule.userSlackId = id;
+        });
+        assignById(models.userMicrosoftTeamsAccounts, (id) => {
+            rule.userMicrosoftTeamsId = id;
+        });
         assignById(models.userWebhooks, (id) => {
             rule.userWebhookId = id;
         });
@@ -166,6 +196,8 @@ export default class NotificationMethodUtil {
             ...models.userPush,
             ...models.userWhatsApps,
             ...models.userTelegrams,
+            ...models.userSlacks,
+            ...models.userMicrosoftTeamsAccounts,
             ...models.userWebhooks,
         ];
     }

package/build/dist/UI/Utils/NotificationMethodUtil.js.map

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

package/build/dist/UI/Utils/PermissionGate.js

@@ -156,6 +156,38 @@ export default class PermissionGate {
                 // Locked. The tooltip says which permission is missing.
             } });
     }
+    /*
+     * Whether the signed-in user may SELECT a column.
+     *
+     * Column access control is enforced differently from record access control:
+     * asking for a column you cannot read is not degraded, it is fatal.
+     * ColumnPermission throws `User is not allowed to read on <column> column of
+     * <model>` and the whole request fails, so one unreadable field in a select
+     * takes down the entire page rather than blanking one value. That is why
+     * ModelAction has no column-level members (see the comment on the enum) and
+     * why callers must ask this BEFORE building the select, not after.
+     *
+     * Deliberately fails closed. When the permission snapshot has not landed yet
+     * this returns false and the caller omits the field: the page renders
+     * without that one value, which is recoverable. Failing open would send the
+     * column anyway and hard-fail the request, which is not.
+     *
+     * A column with no declared read ACL is readable - there is nothing to
+     * enforce, and ColumnPermission agrees.
+     */
+    static canReadColumn(model, columnName, options) {
+        var _a;
+        if (User.isMasterAdmin()) {
+            return true;
+        }
+        const accessControl = model.getColumnAccessControlForAllColumns()[columnName];
+        const columnPermissions = (accessControl === null || accessControl === void 0 ? void 0 : accessControl.read) || [];
+        if (columnPermissions.length === 0) {
+            return true;
+        }
+        const userPermissions = (_a = options === null || options === void 0 ? void 0 : options.permissions) !== null && _a !== void 0 ? _a : PermissionUtil.getAllPermissions();
+        return PermissionHelper.doesPermissionsIntersect(userPermissions, columnPermissions);
+    }
     /* Test seam - the props lookup is memoized for the lifetime of the page. */
     static clearPermissionPropsCache() {
         permissionPropsCache = null;

package/build/dist/UI/Utils/PermissionGate.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "12.0.17",
+  "version": "12.0.19",
   "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();