npm - @oneuptime/common - Versions diffs - 13.0.1 → 13.0.4 - Mend

@oneuptime/common 13.0.1 → 13.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (781) hide show

package/build/dist/Server/Services/StatusPageMonitorRuleService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StatusPageMonitorRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageMonitorRuleService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,MAAM,mDAAmD,CAAC;AAOtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,+BAA+B,EAAE,EACtC,kBAAkB,GACnB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,qCAAqC,MAAM,iDAAiD,CAAC;AACpG,OAAO,MAAyB,MAAM,iBAAiB,CAAC;~~AAExD~~,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,MAAM,IAAI,gBAAgB,CACxB,kEAAkE,CACnE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,sBAAsB,CAAC;YAC1B,iBAAiB,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,MAAM;YAC7D,kBAAkB,EAAE,QAAQ,CAAC,IAAI,CAAC,kBAAkB;YACpD,yBAAyB,EAAE,QAAQ,CAAC,IAAI,CAAC,yBAAyB;~~SACnE~~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~~IAI9B~~;QACC,IACE,IAAI,CAAC,iBAAiB,KAAK,CAAC;YAC5B,CAAC,IAAI,CAAC,kBAAkB;YACxB,CAAC,IAAI,CAAC,yBAAyB,EAC/B,CAAC;YACD,MAAM,IAAI,gBAAgB,CACxB,6LAA6L,CAC9L,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,iBAAiB,CAC7B,QAAyB;QAEzB,MAAM,KAAK,qBACL,QAAQ,CAAC,KAAiC,CAC/C,CAAC;QAEF,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC5B,KAAK,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC/C,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;YACvB,KAAK,EAAE,KAAiC;YACxC,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,SAAS,EAAE,IAAI;gBACf,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE;oBACb,GAAG,EAAE,IAAI;iBACV;gBACD,kBAAkB,EAAE,IAAI;gBACxB,yBAAyB,EAAE,IAAI;~~aAChC~~;YACD,KAAK,EAAE,iBAAiB;YACxB,IAAI,EAAE,CAAC;YACP,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,8BAA8B,CAC1C,QAAyB;QAEzB,MAAM,eAAe,GACnB,QAAQ,CAAC,IAAI,CAAC,aAAa,KAAK,SAAS;YACzC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,KAAK,SAAS;YAC9C,QAAQ,CAAC,IAAI,CAAC,yBAAyB,KAAK,SAAS,CAAC;~~QAExD~~,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEnE,MAAM,UAAU,GAA+B,QAAQ,CAAC,IAAI;aACzD,aAA2C,CAAC;QAE/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,sBAAsB,CAAC;gBAC1B,iBAAiB,EAAE,CAAC,UAAU,KAAK,SAAS;oBAC1C,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE;oBAC1B,CAAC,CAAC,UAAU,CACb,CAAC,MAAM;gBACR,kBAAkB,EAChB,QAAQ,CAAC,IAAI,CAAC,kBAAkB,KAAK,SAAS;oBAC5C,CAAC,CAAC,IAAI,CAAC,kBAAkB;oBACzB,CAAC,CAAE,QAAQ,CAAC,IAAI,CAAC,kBAAyC;gBAC9D,yBAAyB,EACvB,QAAQ,CAAC,IAAI,CAAC,yBAAyB,KAAK,SAAS;oBACnD,CAAC,CAAC,IAAI,CAAC,yBAAyB;oBAChC,CAAC,CAAE,QAAQ,CAAC,IAAI,CAAC,yBAAgD;~~aACtE~~,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,WAAW,CAAC,uBAAiC;QACzD,IAAI,CAAC;YACH,MAAM,kCAAkC,CAAC,oBAAoB,CAAC;gBAC5D,uBAAuB,EAAE,uBAAuB;aACjD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,0CAA0C,uBAAuB,CAAC,QAAQ,EAAE,KAAK,KAAK,EAAE,EACxF;gBACE,uBAAuB,EAAE,uBAAuB,CAAC,QAAQ,EAAE;aAC3C,CACnB,CAAC;QACJ,CAAC;IACH,CAAC;CACF;~~AAxb0B~~;IADxB,WAAW,EAAE;;;;~~6CAmCb~~;AAGwB;IADxB,WAAW,EAAE;;6CAGC,KAAK;;8CAWnB;AAGwB;IADxB,WAAW,EAAE;;;;6CAyCb;AAGwB;IADxB,WAAW,EAAE;;6CAGI,KAAK;;8CAYtB;AAuBwB;IADxB,WAAW,EAAE;;6CAGS,KAAK;;8CA+C3B;AAiBwB;IADxB,WAAW,EAAE;;;;6CAyDb;~~AA2LH~~,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"StatusPageMonitorRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageMonitorRuleService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/StatusPageOwnerRuleEngineService.js CHANGED Viewed

@@ -14,6 +14,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class StatusPageOwnerRuleEngineServiceClass {
     /**
@@ -37,6 +38,7 @@ class StatusPageOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     statusPageLabels: { _id: true },
                     statusPageNamePattern: true,
@@ -131,6 +133,20 @@ class StatusPageOwnerRuleEngineServiceClass {
         }
     }
     doesStatusPageMatchRule(statusPage, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "statusPageLabels",
+                "statusPageNamePattern",
+                "statusPageDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (statusPageRule) => {
+                return this.doesStatusPageMatchRuleLegacy(statusPage, statusPageRule);
+            },
+        });
+    }
+    doesStatusPageMatchRuleLegacy(statusPage, rule) {
         if (rule.statusPageLabels && rule.statusPageLabels.length > 0) {
             if (!statusPage.labels || statusPage.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/StatusPageOwnerRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StatusPageOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageOwnerRuleEngineService.ts"],"names":[],"mappings":"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~~AA7Mc~~;IADZ,WAAW,EAAE;;qCACkC,UAAU;;~~mFA0IzD~~;~~AAqEH~~,eAAe,IAAI,qCAAqC,EAAE,CAAC"}
1	+ {"version":3,"file":"StatusPageOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/UserService.js CHANGED Viewed

@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import DatabaseConfig from "../DatabaseConfig";
 import { EncryptionSecret, IsBillingEnabled, NotificationSlackWebhookOnCreateUser, } from "../EnvironmentConfig";
+import OwnerOnlyColumnPermission from "../Types/Database/Permissions/OwnerOnlyColumnPermission";
 import Attribution from "../Utils/Attribution";
 import logger from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
@@ -263,6 +264,11 @@ export class Service extends DatabaseService {
         });
     }
     async onBeforeUpdate(updateBy) {
+        // Reject values that could bypass the exact-false ownership check below.
+        if (updateBy.data.enableTwoFactorAuth !== undefined &&
+            typeof updateBy.data.enableTwoFactorAuth !== "boolean") {
+            throw new BadDataException("enableTwoFactorAuth must be a boolean.");
+        }
         let carryForward = [];
         if (updateBy.data.password || updateBy.data.email) {
             const users = await this.findBy({
@@ -284,56 +290,15 @@ export class Service extends DatabaseService {
             });
         }
         /*
-         * There used to be a guard here refusing to set `enableTwoFactorAuth` on
-         * an account with no verified authenticator, on the grounds that doing so
-         * locked the user out: login demanded a second factor, found none, and
-         * said "contact your admin".
-         *
-         * That is no longer true, and the guard was the single thing standing in
-         * the way of the feature it appeared to protect. Login now sends an
-         * account in that state through ENROLMENT -- a QR code and a code to type
-         * back -- rather than refusing it (see App/FeatureSet/Identity/API/
-         * Authentication.ts). "Required, nothing set up yet" is therefore an
-         * ordinary, recoverable state, and it is exactly the state an admin
-         * creates on purpose when they mandate two factor auth for somebody who
-         * has never used it.
-         *
-         * Keeping the guard would have meant an admin could only require two
-         * factor auth from users who had already volunteered for it, which is the
-         * opposite of what a mandate is for.
-         *
-         * What replaces it is the guard below, which protects the opposite
-         * direction.
-         */
-        /*
-         * TURNING THE REQUIREMENT OFF IS A MASTER-ADMIN ACTION, NOT A USER ONE.
-         *
-         * `enableTwoFactorAuth` carries `update: [Permission.CurrentUser]` and the
-         * User table's row ACL scopes updates to the caller's own id, so without
-         * this every signed-in user can clear their own flag with an ordinary
-         * `PUT /user/<their own id>` -- and the product ships the button that does
-         * it, at Dashboard > Profile > Two Factor Authentication.
-         *
-         * That makes an admin mandate self-undoing. The admin requires two factor
-         * auth, the user is marched through enrolment at their next sign-in, and
-         * then, from the session they just earned, they switch it straight back
-         * off and delete the factor. The account is password-only again and the
-         * Authentication page reports the mandate as simply absent.
-         *
-         * So: anybody may turn the requirement ON for themselves -- self-service
-         * enrolment is a feature and taking it away would help nobody -- but only
-         * a root caller may turn it OFF. The one root caller is
-         * `setTwoFactorAuthRequired` below, reached through the master-admin
-         * endpoint. A user who wants two factor auth removed now has to ask an
-         * administrator, which is the point of the feature.
-         *
-         * Keyed on `isRoot` rather than on a master-admin check because a master
-         * admin editing their OWN row through the CRUD API is still that user, and
-         * the flag should move through the endpoint that also revokes sessions
-         * either way.
+         * Users may turn off two factor authentication for their own account.
+         * This hook runs before row scoping, so require an exact owner predicate.
+         * Changes to other accounts still use the master-admin endpoints, whose
+         * root writes retain session revocation when enabling the requirement.
          */
-        if (updateBy.data.enableTwoFactorAuth === false && !updateBy.props.isRoot) {
-            throw new BadDataException("Only an administrator can turn off two factor authentication for this account.");
+        if (updateBy.data.enableTwoFactorAuth === false &&
+            !updateBy.props.isRoot &&
+            !OwnerOnlyColumnPermission.isQueryPinnedToCurrentUser(Model, updateBy.query, updateBy.props)) {
+            throw new BadDataException("You can only turn off two factor authentication for your own account.");
         }
         return { updateBy, carryForward: carryForward };
     }

package/build/dist/Server/Services/UserService.js.map CHANGED Viewed

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

package/build/dist/Server/Services/VMwareVCenterLabelRuleEngineService.js CHANGED Viewed

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class VMwareVCenterLabelRuleEngineServiceClass {
     /**
@@ -40,6 +41,7 @@ class VMwareVCenterLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     vmwareVCenterLabels: { _id: true },
                     vmwareVCenterNamePattern: true,
                     vmwareVCenterDescriptionPattern: true,
@@ -146,6 +148,20 @@ class VMwareVCenterLabelRuleEngineServiceClass {
         }
     }
     doesVMwareVCenterMatchRule(vmwareVCenter, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "vmwareVCenterLabels",
+                "vmwareVCenterNamePattern",
+                "vmwareVCenterDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (vmwareVCenterRule) => {
+                return this.doesVMwareVCenterMatchRuleLegacy(vmwareVCenter, vmwareVCenterRule);
+            },
+        });
+    }
+    doesVMwareVCenterMatchRuleLegacy(vmwareVCenter, rule) {
         if (rule.vmwareVCenterLabels && rule.vmwareVCenterLabels.length > 0) {
             if (!vmwareVCenter.labels || vmwareVCenter.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/VMwareVCenterLabelRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"VMwareVCenterLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/VMwareVCenterLabelRuleEngineService.ts"],"names":[],"mappings":"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~~AAxNc~~;IADZ,WAAW,EAAE;;qCAEG,aAAa;;~~yFAoJ7B~~;~~AAqEH~~,eAAe,IAAI,wCAAwC,EAAE,CAAC"}
1	+ {"version":3,"file":"VMwareVCenterLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/VMwareVCenterLabelRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/VMwareVCenterOwnerRuleEngineService.js CHANGED Viewed

@@ -21,6 +21,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class VMwareVCenterOwnerRuleEngineServiceClass {
     /**
@@ -44,6 +45,7 @@ class VMwareVCenterOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     vmwareVCenterLabels: { _id: true },
                     vmwareVCenterNamePattern: true,
@@ -163,6 +165,20 @@ class VMwareVCenterOwnerRuleEngineServiceClass {
         }
     }
     doesVMwareVCenterMatchRule(vmwareVCenter, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "vmwareVCenterLabels",
+                "vmwareVCenterNamePattern",
+                "vmwareVCenterDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (vmwareVCenterRule) => {
+                return this.doesVMwareVCenterMatchRuleLegacy(vmwareVCenter, vmwareVCenterRule);
+            },
+        });
+    }
+    doesVMwareVCenterMatchRuleLegacy(vmwareVCenter, rule) {
         if (rule.vmwareVCenterLabels && rule.vmwareVCenterLabels.length > 0) {
             if (!vmwareVCenter.labels || vmwareVCenter.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/VMwareVCenterOwnerRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"VMwareVCenterOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/VMwareVCenterOwnerRuleEngineService.ts"],"names":[],"mappings":"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~~AA/Nc~~;IADZ,WAAW,EAAE;;qCAEG,aAAa;;~~yFA2J7B~~;~~AAqEH~~,eAAe,IAAI,wCAAwC,EAAE,CAAC"}
1	+ {"version":3,"file":"VMwareVCenterOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/VMwareVCenterOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/WorkflowLabelRuleEngineService.js CHANGED Viewed

@@ -15,6 +15,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class WorkflowLabelRuleEngineServiceClass {
     /**
@@ -37,6 +38,7 @@ class WorkflowLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     workflowLabels: { _id: true },
                     workflowNamePattern: true,
                     workflowDescriptionPattern: true,
@@ -122,6 +124,20 @@ class WorkflowLabelRuleEngineServiceClass {
         }
     }
     doesWorkflowMatchRule(workflow, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "workflowLabels",
+                "workflowNamePattern",
+                "workflowDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (workflowRule) => {
+                return this.doesWorkflowMatchRuleLegacy(workflow, workflowRule);
+            },
+        });
+    }
+    doesWorkflowMatchRuleLegacy(workflow, rule) {
         if (rule.workflowLabels && rule.workflowLabels.length > 0) {
             if (!workflow.labels || workflow.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/WorkflowLabelRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"WorkflowLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/WorkflowLabelRuleEngineService.ts"],"names":[],"mappings":"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~~AAzLc~~;IADZ,WAAW,EAAE;;qCAC8B,QAAQ;;+~~EAwHnD~~;~~AAmEH~~,eAAe,IAAI,mCAAmC,EAAE,CAAC"}
1	+ {"version":3,"file":"WorkflowLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/WorkflowLabelRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/WorkflowOwnerRuleEngineService.js CHANGED Viewed

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class WorkflowOwnerRuleEngineServiceClass {
     /**
@@ -41,6 +42,7 @@ class WorkflowOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     workflowLabels: { _id: true },
                     workflowNamePattern: true,
@@ -142,6 +144,20 @@ class WorkflowOwnerRuleEngineServiceClass {
         }
     }
     doesWorkflowMatchRule(workflow, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "workflowLabels",
+                "workflowNamePattern",
+                "workflowDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (workflowRule) => {
+                return this.doesWorkflowMatchRuleLegacy(workflow, workflowRule);
+            },
+        });
+    }
+    doesWorkflowMatchRuleLegacy(workflow, rule) {
         if (rule.workflowLabels && rule.workflowLabels.length > 0) {
             if (!workflow.labels || workflow.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/WorkflowOwnerRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"WorkflowOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/WorkflowOwnerRuleEngineService.ts"],"names":[],"mappings":"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~~AAtMc~~;IADZ,WAAW,EAAE;;qCAC8B,QAAQ;;+~~EAqInD~~;~~AAmEH~~,eAAe,IAAI,mCAAmC,EAAE,CAAC"}
1	+ {"version":3,"file":"WorkflowOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/WorkflowOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}