Merge branch 'devel' into 7157-external-browser-auth-model

Author: EvgeniaBzzz

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/test/WebGQLClient.java

@@ -29,7 +29,6 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -72,7 +71,16 @@ public WebGQLClient(@NotNull HttpClient httpClient, @NotNull String apiUrl) {
      */
     @NotNull
     public <T> T sendQuery(@NotNull String query, @Nullable Map<String, Object> variables) throws Exception {
-        return sendQueryWithHeaders(query, variables, List.of());
+        return sendQueryWithHeaders(query, variables, Map.of());
+    }
+
+    @NotNull
+    public Map<String, Object> sendQueryAndGetHeaders(
+        @NotNull String query,
+        @Nullable Map<String, Object> variables,
+        @NotNull Map<String, String> requestHeaders
+    ) throws Exception {
+        return executeGQLRequest(query, variables, requestHeaders);
     }
 
     /**
@@ -87,15 +95,26 @@ public <T> T sendQuery(@NotNull String query, @Nullable Map<String, Object> vari
     public <T> T sendQueryWithHeaders(
         @NotNull String query,
         @Nullable Map<String, Object> variables,
-        @NotNull List<String> headers
+        @NotNull Map<String, String> headers
+    ) throws Exception {
+        Map<String, Object> parsed = executeGQLRequest(query, variables, headers);
+        // graphql response will be in "data" key
+        return (T) parsed.get("data");
+    }
+
+    @NotNull
+    private Map<String, Object> executeGQLRequest(
+        @NotNull String query,
+        @Nullable Map<String, Object> variables,
+        @NotNull Map<String, String> requestHeaders
     ) throws Exception {
         HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
             .uri(URI.create(apiUrl))
             .POST(HttpRequest.BodyPublishers.ofString(makeGQLRequest(query, variables)))
             .setHeader("TE-Client-Version", GeneralUtils.getMajorVersion())
             .header("Content-Type", "application/json");
-        if (!headers.isEmpty()) {
-            requestBuilder.headers(headers.toArray(String[]::new));
+        if (!requestHeaders.isEmpty()) {
+            requestHeaders.forEach(requestBuilder::header);
         }
         HttpRequest request = requestBuilder.build();
         HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
@@ -107,8 +126,10 @@ public <T> T sendQueryWithHeaders(
             String message = JSONUtils.getString(JSONUtils.getObjectList(body, "errors").get(0), "message");
             throw new DBException(message);
         }
-        // graphql response will be in "data" key
-        return (T) JSONUtils.getObject(body, "data").get("result");
+        Map<String, Object> parsed = new LinkedHashMap<>();
+        parsed.put("data", JSONUtils.getObject(body, "data").get("result"));
+        parsed.put("headers", response.headers().map());
+        return parsed;
     }
 
     @NotNull

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java

@@ -49,7 +49,6 @@
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
-import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.security.SMAdminController;
 import org.jkiss.dbeaver.model.security.SMConstants;
 import org.jkiss.dbeaver.model.security.SMObjectType;
@@ -508,7 +507,7 @@ protected void shutdown() {
     }
 
     @Override
-    public String getInfoDetails(DBRProgressMonitor monitor) {
+    public String getInfoDetails() {
         return "";
     }
 

server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls

@@ -337,7 +337,21 @@ extend type Query {
         columnNames: [String!],
         functions: [String!],
         showDuplicatesOnly: Boolean
-    ): String!
+    ): String! @deprecated (reason: "use sqlGropingResultSet (25.3.1)")
+
+    "Creates async task to get grouped SQL results"
+    sqlGropingResultSet(
+        projectId: ID,
+        contextId: ID!,
+        connectionId: ID!,
+        resultsId: ID!,
+        columnNames: [String!],
+        functions: [String!],
+        showDuplicatesOnly: Boolean,
+        filter: SQLDataFilter,
+        dataFormat: ResultDataFormat,
+        isInteractive: Boolean
+    ): AsyncTaskInfo! @since(version: "25.3.1")
 }
 
 extend type Mutation {

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebProductInfo.java

@@ -20,7 +20,6 @@
 import org.eclipse.core.runtime.IProduct;
 import org.eclipse.core.runtime.Platform;
 import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -75,7 +74,7 @@ public String getReleaseTime() {
     @Property
     public String getLicenseInfo() {
         return provideSensitiveInformation
-            ? ServletAppUtils.getServletApplication().getInfoDetails(new VoidProgressMonitor())
+            ? ServletAppUtils.getServletApplication().getInfoDetails()
             : "";
     }
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBEventsLongPolling.java

@@ -58,6 +58,7 @@ public long lastPoll() {
 
     public void touch() {
         lastPoll = System.currentTimeMillis();
+        webSession.touchSession();
     }
 
     @NotNull