#1397: Selecting current activeAuthId when "inherit from login" is selected for authentication type of datasource

dragonpoo · dragonpoo · commit 5b08e710cc7d · 2025-02-04T11:49:50.000-05:00
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
@@ -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();
