Merge pull request #1501 from lowcoder-org/feature/auth_header_of_query

FalkWolsky · web-flow · commit 22896e8e2f00 · 2025-02-07T22:41:52.000+01:00
Authentication Type default value added for datasource
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();
