From 80438693325e4dcd38b107954c597e7447f8a6e4 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Mon, 24 Jun 2024 14:51:23 +0200
Subject: [PATCH] cherri pick file

---
 packages/api/src/controllers/connections.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js
index f0c82097e..b6d9d0bbc 100644
--- a/packages/api/src/controllers/connections.js
+++ b/packages/api/src/controllers/connections.js
@@ -201,9 +201,9 @@ module.exports = {
   async list(_params, req) {
     const storage = require('./storage');
 
-    const storageConnectionst = await storage.connections();
-    if (storageConnectionst) {
-      return storageConnectionst;
+    const storageConnections = await storage.connections();
+    if (storageConnections) {
+      return storageConnections;
     }
     if (portalConnections) {
       if (platformInfo.allowShellConnection) return portalConnections;
@@ -342,6 +342,14 @@ module.exports = {
     if (volatile) {
       return volatile;
     }
+
+    const storage = require('./storage');
+
+    const storageConnection = await storage.getConnection({conid});
+    if (storageConnection) {
+      return storageConnection;
+    }
+
     if (portalConnections) {
       const res = portalConnections.find(x => x._id == conid) || null;
       return mask && !platformInfo.allowShellConnection ? maskConnection(res) : res;