From 7aebcd92c3d4c894745d6f3e7505b5664127c17a Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 15 Aug 2025 17:41:23 -0500
Subject: [PATCH] Fix refresh token not persisted on new server connections
 #1634

---
 ios/App/App/plugins/AbsDatabase.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ios/App/App/plugins/AbsDatabase.swift b/ios/App/App/plugins/AbsDatabase.swift
index aa9dfc43..c942136b 100644
--- a/ios/App/App/plugins/AbsDatabase.swift
+++ b/ios/App/App/plugins/AbsDatabase.swift
@@ -73,16 +73,16 @@ public class AbsDatabase: CAPPlugin, CAPBridgedPlugin {
 
         let name = "\(address) (\(username))"
         
+        if id == nil {
+            id = "\(address)@\(username)".toBase64()
+        }
+        
         if (refreshToken != "") {
             // Store refresh token securely if provided
             let hasRefreshToken = secureStorage.storeRefreshToken(serverConnectionConfigId: id ?? "", refreshToken: refreshToken)
             logger.log("Refresh token secured = \(hasRefreshToken)")
         }
 
-        if id == nil {
-            id = "\(address)@\(username)".toBase64()
-        }
-
         let config = ServerConnectionConfig()
         config.id = id ?? ""
         config.index = 0