All changes

freshworks · Oct 5, 2023 · 5204da4 · 5204da4
1 parent 3ef0767
commit 5204da4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/packages/marketplace-models/src/types/PayloadData.ts b/packages/marketplace-models/src/types/PayloadData.ts
@@ -94,6 +94,7 @@ export interface Channel {
 
 export interface UserProperty {
   name: string;
+  oldName?: string;
   value: string;
 }
 

diff --git a/packages/rule-engine/src/ActionExecutor.ts b/packages/rule-engine/src/ActionExecutor.ts
@@ -123,6 +123,11 @@ export class ActionExecutor {
       user.properties.forEach((userProperty) => {
         const placeholderKey = `user.properties.${userProperty.name}`;
         dynamicPlaceholders[placeholderKey] = userProperty.value;
+        // For backward compatibility with migrated accounts
+        if (userProperty.oldName) {
+          const oldPlaceholderKey = `user.properties.${userProperty.oldName}`;
+          dynamicPlaceholders[oldPlaceholderKey] = userProperty.value;
+        }
       });
 
     return { ...placeholders, ...dynamicPlaceholders };

diff --git a/packages/rule-engine/src/recommended/conditions/user-property.ts b/packages/rule-engine/src/recommended/conditions/user-property.ts
@@ -15,7 +15,10 @@ const evaluateUserPropertyCondition = (
   ruleAlias: string,
 ): Promise<void> => {
   const matchedProperty =
-    userObj.properties && userObj.properties.find((property) => property.name === conditionValue.propertyKey);
+    userObj.properties &&
+    userObj.properties.find(
+      (property) => property.name === conditionValue.propertyKey || property.oldName === conditionValue.propertyKey,
+    );
 
   return Utils.evaluateCondition(
     operator,