fix: livechat interaction handler is receiving its context data wrapp…

…ed in a second instance of the context class
RocketChat · Sep 17, 2024 · 688728b · 688728b
1 parent 7170771
commit 688728b
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/server/managers/AppListenerManager.ts b/src/server/managers/AppListenerManager.ts
@@ -18,8 +18,7 @@ import { UIActionButtonContext } from '../../definition/ui';
 import type { IUIKitResponse, IUIKitSurface, UIKitIncomingInteraction } from '../../definition/uikit';
 import { UIKitIncomingInteractionType } from '../../definition/uikit';
 import { isUIKitIncomingInteractionActionButtonMessageBox } from '../../definition/uikit/IUIKitIncomingInteractionActionButton';
-import type { IUIKitLivechatIncomingInteraction } from '../../definition/uikit/livechat';
-import { UIKitLivechatBlockInteractionContext } from '../../definition/uikit/livechat';
+import type { IUIKitLivechatBlockIncomingInteraction, IUIKitLivechatIncomingInteraction } from '../../definition/uikit/livechat';
 import type {
     IUIKitIncomingInteractionMessageContainer,
     IUIKitIncomingInteractionModalContainer,
@@ -1016,14 +1015,17 @@ export class AppListenerManager {
 
         const app = this.manager.getOneById(appId);
 
-        const interactionContext = ((interactionType: UIKitIncomingInteractionType, interactionData: IUIKitLivechatIncomingInteraction) => {
-            const { actionId, message, visitor, room, triggerId, container } = interactionData;
+        const interactionData = ((
+            interactionType: UIKitIncomingInteractionType,
+            interaction: IUIKitLivechatIncomingInteraction,
+        ): IUIKitLivechatBlockIncomingInteraction => {
+            const { actionId, message, visitor, room, triggerId, container } = interaction;
 
             switch (interactionType) {
                 case UIKitIncomingInteractionType.BLOCK: {
-                    const { value, blockId } = interactionData.payload as { value: string; blockId: string };
+                    const { value, blockId } = interaction.payload as { value: string; blockId: string };
 
-                    return new UIKitLivechatBlockInteractionContext({
+                    return {
                         appId,
                         actionId,
                         blockId,
@@ -1033,12 +1035,12 @@ export class AppListenerManager {
                         value,
                         message,
                         container: container as IUIKitIncomingInteractionModalContainer | IUIKitIncomingInteractionMessageContainer,
-                    });
+                    };
                 }
             }
         })(type, data);
 
-        return app.call(method, interactionContext);
+        return app.call(method, interactionData);
     }
 
     // Livechat