From 5b08e710cc7d77cf21de9700a4a87abb039c01ec Mon Sep 17 00:00:00 2001
From: Thomasr <techninjas514@begintrust.com>
Date: Tue, 4 Feb 2025 11:49:50 -0500
Subject: [PATCH] #1397: Selecting current activeAuthId when "inherit from
 login" is selected for authentication type of datasource

---
 .../api/query/ApplicationQueryApiServiceImpl.java         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiServiceImpl.java
index 773ebe1e2..53421003e 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiServiceImpl.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiServiceImpl.java
@@ -196,9 +196,15 @@ protected Mono<List<Property>> getAuthParamsAndHeadersInheritFromLogin(User user
         if(authId == null) {
             return Mono.empty();
         }
+
+        String filterAuthId;
+        if(StringUtils.isEmpty(authId)) filterAuthId = user.getActiveAuthId();
+        else {
+            filterAuthId = authId;
+        }
         Optional<Connection> activeConnectionOptional = user.getConnections()
                 .stream()
-                .filter(connection -> connection.getAuthId().equals(authId))
+                .filter(connection -> connection.getAuthId().equals(filterAuthId))
                 .findFirst();
         if(!activeConnectionOptional.isPresent() || activeConnectionOptional.get().getAuthConnectionAuthToken() == null) {
             return Mono.empty();