Merge pull request lowcoder-org#327 from neon-balcony/develop

feat: support graphql forward cookies & rename HikariSqlExecutor -> SqlExecutor, SqlBasedQueryExecutor -> HikariBasedQueryExecutor

Author: neon-balcony

server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLExecutor.java

@@ -33,6 +33,7 @@
 
 import javax.annotation.Nullable;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.internal.Base64;
 import org.pf4j.Extension;
@@ -306,14 +307,19 @@ private Consumer<MultiValueMap<String, String>> injectCookies(GraphQLQueryExecut
             }
 
             if (request.isForwardAllCookies()) {
-                requestCookies.forEach(
-                        (cookieName, httpCookies) -> currentCookies.addAll(cookieName, collectList(httpCookies, HttpCookie::getValue)));
+                requestCookies.forEach((cookieName, httpCookies) -> {
+                    if (StringUtils.equals(cookieName, commonConfig.getCookieName())) {
+                        return;
+                    }
+                    currentCookies.addAll(cookieName, collectList(httpCookies, HttpCookie::getValue));
+                });
                 return;
             }
 
             requestCookies.entrySet()
                     .stream()
                     .filter(it -> forwardCookies.contains(it.getKey()))
+                    .filter(it -> ObjectUtils.notEqual(it.getKey(), commonConfig.getCookieName()))
                     .forEach(entry -> {
                         String cookieName = entry.getKey();
                         List<HttpCookie> httpCookies = entry.getValue();

server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlQueryExecutor.java

@@ -17,8 +17,8 @@
 
 import org.pf4j.Extension;
 
-import com.openblocks.plugin.sql.HikariSqlExecutor;
-import com.openblocks.plugin.sql.SqlBasedQueryExecutor;
+import com.openblocks.plugin.sql.HikariBasedQueryExecutor;
+import com.openblocks.plugin.sql.SqlExecutor;
 import com.openblocks.sdk.exception.PluginException;
 import com.openblocks.sdk.models.DatasourceStructure;
 import com.openblocks.sdk.models.DatasourceStructure.Table;
@@ -35,10 +35,10 @@
 
 @Slf4j
 @Extension
-public class MysqlQueryExecutor extends SqlBasedQueryExecutor {
+public class MysqlQueryExecutor extends HikariBasedQueryExecutor {
 
     public MysqlQueryExecutor() {
-        super(new HikariSqlExecutor());
+        super(new SqlExecutor());
     }
 
     @Nonnull

server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleQueryExecutor.java

@@ -20,8 +20,8 @@
 import com.openblocks.plugin.oracle.gui.OracleDeleteCommand;
 import com.openblocks.plugin.oracle.gui.OracleInsertCommand;
 import com.openblocks.plugin.oracle.gui.OracleUpdateCommand;
-import com.openblocks.plugin.sql.HikariSqlExecutor;
-import com.openblocks.plugin.sql.SqlBasedQueryExecutor;
+import com.openblocks.plugin.sql.HikariBasedQueryExecutor;
+import com.openblocks.plugin.sql.SqlExecutor;
 import com.openblocks.sdk.exception.PluginException;
 import com.openblocks.sdk.models.DatasourceStructure;
 import com.openblocks.sdk.models.DatasourceStructure.Table;
@@ -33,10 +33,10 @@
 
 @Slf4j
 @Extension
-public class OracleQueryExecutor extends SqlBasedQueryExecutor {
+public class OracleQueryExecutor extends HikariBasedQueryExecutor {
 
     public OracleQueryExecutor() {
-        super(new HikariSqlExecutor());
+        super(new SqlExecutor());
     }
 
     @Nonnull

server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeQueryExecutor.java

@@ -15,8 +15,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.pf4j.Extension;
 
-import com.openblocks.plugin.sql.HikariSqlExecutor;
-import com.openblocks.plugin.sql.SqlBasedQueryExecutor;
+import com.openblocks.plugin.sql.HikariBasedQueryExecutor;
+import com.openblocks.plugin.sql.SqlExecutor;
 import com.openblocks.sdk.models.DatasourceStructure;
 import com.openblocks.sdk.models.DatasourceStructure.Column;
 import com.openblocks.sdk.models.DatasourceStructure.Table;
@@ -32,10 +32,10 @@
 @SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"})
 @Slf4j
 @Extension
-public class SnowflakeQueryExecutor extends SqlBasedQueryExecutor {
+public class SnowflakeQueryExecutor extends HikariBasedQueryExecutor {
 
     public SnowflakeQueryExecutor() {
-        super(new HikariSqlExecutor(false));
+        super(new SqlExecutor(false));
     }
 
     @SuppressWarnings("SqlDialectInspection")