[gh-NangoHQ#610] fix merge logic

khaliqgant · May 3, 2023 · 688b52b · 688b52b
1 parent f6b5c9b
commit 688b52b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/server/lib/controllers/activity.controller.ts b/packages/server/lib/controllers/activity.controller.ts
@@ -48,7 +48,9 @@ class ActivityController {
             }
 
             if (log?.merge && sessions[log.sessionId as string]) {
-                const mergeIndex: number = sessions[log.sessionId as string] as number;
+                const mergeIndex: number = updatedLogs.findIndex((updated) => {
+                    return updated.sessionId === log.sessionId && !updated.merge;
+                });
                 updatedLogs[mergeIndex]!.messages = [...updatedLogs[mergeIndex]!.messages, ...log.messages];
                 updatedLogs[mergeIndex]!.end = log.end as number;
             } else {

diff --git a/packages/server/lib/controllers/oauth.controller.ts b/packages/server/lib/controllers/oauth.controller.ts
@@ -337,6 +337,7 @@ class OAuthController {
                 });
 
                 log.end = Date.now();
+                fileLogger.info('', log);
 
                 res.redirect(authorizationUri);
             } else {