From 05e7f350378b01c700b934adf9850f3d00291df3 Mon Sep 17 00:00:00 2001
From: Diogo <diogofncunha@gmail.com>
Date: Tue, 27 Aug 2024 22:12:55 +0100
Subject: [PATCH] core: fix associated agent user for recreated connections
 (#4771)

* core: fix associated user for recreated connections

* fix test for connection recreation
---
 src/Simplex/Chat.hs         |  2 +-
 tests/ChatTests/Profiles.hs | 67 +++++++++++++++++++++----------------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index dc3b4b2e54..796a128abe 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -1709,7 +1709,7 @@ processChatCommand' vr = \case
           pure conn'
       recreateConn user conn@PendingContactConnection {customUserProfileId} newUser = do
         subMode <- chatReadVar subscriptionMode
-        (agConnId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing IKPQOn subMode
+        (agConnId, cReq) <- withAgent $ \a -> createConnection a (aUserId newUser) True SCMInvitation Nothing IKPQOn subMode
         conn' <- withFastStore' $ \db -> do
           deleteConnectionRecord db user connId
           forM_ customUserProfileId $ \profileId ->
diff --git a/tests/ChatTests/Profiles.hs b/tests/ChatTests/Profiles.hs
index 878546ba21..a36eef8ca9 100644
--- a/tests/ChatTests/Profiles.hs
+++ b/tests/ChatTests/Profiles.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PostfixOperators #-}
+{-# LANGUAGE TypeApplications #-}
 
 module ChatTests.Profiles where
 
@@ -18,6 +19,8 @@ import Simplex.Chat.Types (ConnStatus (..), Profile (..))
 import Simplex.Chat.Types.Shared (GroupMemberRole (..))
 import Simplex.Chat.Types.UITheme
 import Simplex.Messaging.Encoding.String (StrEncoding (..))
+import Simplex.Messaging.Server.Env.STM hiding (subscriptions)
+import Simplex.Messaging.Transport
 import Simplex.Messaging.Util (encodeJSON)
 import System.Directory (copyFile, createDirectoryIfMissing)
 import Test.Hspec hiding (it)
@@ -1653,34 +1656,42 @@ testChangePCCUserAndThenIncognito = testChat2 aliceProfile bobProfile $
       ]
 
 testChangePCCUserDiffSrv :: HasCallStack => FilePath -> IO ()
-testChangePCCUserDiffSrv = testChat2 aliceProfile bobProfile $
-  \alice bob -> do
-    -- Create a new invite
-    alice ##> "/connect"
-    _ <- getInvitation alice
-    alice ##> "/_set incognito :1 on"
-    alice <## "connection 1 changed to incognito"
-    -- Create new user with different servers
-    alice ##> "/create user alisa"
-    showActiveUser alice "alisa"
-    alice #$> ("/smp smp://2345-w==@smp2.example.im smp://3456-w==@smp3.example.im:5224", id, "ok")
-    alice ##> "/user alice"
-    showActiveUser alice "alice (Alice)"
-    -- Change connection to newly created user and use the newly created connection
-    alice ##> "/_set conn user :1 2"
-    alice <## "connection 1 changed from user alice to user alisa, new link:"
-    alice <## ""
-    inv <- getTermLine alice
-    alice <## ""
-    alice `hasContactProfiles` ["alice"]
-    alice ##> "/user alisa"
-    showActiveUser alice "alisa"
-    -- Connect
-    bob ##> ("/connect " <> inv)
-    bob <## "confirmation sent!"
-    concurrently_
-      (alice <## "bob (Bob): contact is connected")
-      (bob <## "alisa: contact is connected")
+testChangePCCUserDiffSrv tmp = do
+  withSmpServer' serverCfg' $ do
+    withNewTestChatCfgOpts tmp testCfg testOpts "alice" aliceProfile $ \alice -> do
+      withNewTestChatCfgOpts tmp testCfg testOpts "bob" bobProfile $ \bob -> do
+        -- Create a new invite
+        alice ##> "/connect"
+        _ <- getInvitation alice
+        alice ##> "/_set incognito :1 on"
+        alice <## "connection 1 changed to incognito"
+        -- Create new user with different servers
+        alice ##> "/create user alisa"
+        showActiveUser alice "alisa"
+        alice #$> ("/smp smp://LcJUMfVhwD8yxjAiSaDzzGF3-kLG4Uh0Fl_ZIjrRwjI=:server_password@localhost:7003", id, "ok")
+        alice ##> "/user alice"
+        showActiveUser alice "alice (Alice)"
+        -- Change connection to newly created user and use the newly created connection
+        alice ##> "/_set conn user :1 2"
+        alice <## "connection 1 changed from user alice to user alisa, new link:"
+        alice <## ""
+        inv <- getTermLine alice
+        alice <## ""
+        alice `hasContactProfiles` ["alice"]
+        alice ##> "/user alisa"
+        showActiveUser alice "alisa"
+        -- Connect
+        bob ##> ("/connect " <> inv)
+        bob <## "confirmation sent!"
+        concurrently_
+          (alice <## "bob (Bob): contact is connected")
+          (bob <## "alisa: contact is connected")
+  where
+    serverCfg' =
+      smpServerCfg
+        { transports = [("7003", transport @TLS), ("7002", transport @TLS)],
+          msgQueueQuota = 2
+        }
 
 testSetConnectionAlias :: HasCallStack => FilePath -> IO ()
 testSetConnectionAlias = testChat2 aliceProfile bobProfile $