1. refactor sql-based datasource plugin

2. make cookies HttpOnly

Author: jerry-goodman

server/api-service/build-ee.sh

@@ -17,6 +17,7 @@
 import com.openblocks.domain.plugin.DatasourceMetaInfo;
 import com.openblocks.domain.plugin.service.DatasourceMetaInfoService;
 import com.openblocks.infra.mongo.MongoUpsertHelper;
+import com.openblocks.sdk.config.CommonConfig;
 import com.openblocks.sdk.exception.BizError;
 import com.openblocks.sdk.exception.BizException;
 import com.openblocks.sdk.exception.PluginException;
@@ -32,7 +33,8 @@
 @Slf4j
 public class DatasourceStructureServiceImpl implements DatasourceStructureService {
 
-    public static final int GET_STRUCTURE_DEFAULT_TIMEOUT_MILLIS = 8000;
+    @Autowired
+    private CommonConfig commonConfig;
 
     @Autowired
     private DatasourceService datasourceService;
@@ -98,12 +100,13 @@ private Mono<DatasourceStructure> saveStructure(String datasourceId, DatasourceS
     private Mono<DatasourceStructure> getLatestStructure(Datasource datasource,
             QueryExecutor<? extends DatasourceConnectionConfig, Object, ? extends QueryExecutionContext> queryExecutor) {
 
+        long readStructureTimeout = commonConfig.getQuery().getReadStructureTimeout();
         return connectionContextService.getOrCreateConnection(datasource)
                 .flatMap(connectionContext -> queryExecutor.doGetStructure(connectionContext.connection(), datasource.getDetailConfig())
-                        .timeout(Duration.ofMillis(GET_STRUCTURE_DEFAULT_TIMEOUT_MILLIS))
+                        .timeout(Duration.ofMillis(readStructureTimeout))
                         .doOnError(connectionContext::onQueryError)
                         .onErrorMap(TimeoutException.class, e -> new BizException(BizError.PLUGIN_EXECUTION_TIMEOUT, "PLUGIN_EXECUTION_TIMEOUT",
-                                GET_STRUCTURE_DEFAULT_TIMEOUT_MILLIS))
+                                readStructureTimeout))
                 )
                 .onErrorMap(e -> {
                     if (e instanceof PluginException) {

server/api-service/build-majiang.sh

@@ -25,6 +25,7 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ServerWebExchange;
@@ -193,7 +194,13 @@ public Mono<Boolean> bindEmail(User user, String email) {
                 .build();
         user.getConnections().add(connection);
         return repository.save(user)
-                .then(Mono.just(true));
+                .then(Mono.just(true))
+                .onErrorResume(throwable -> {
+                    if (throwable instanceof DuplicateKeyException) {
+                        return Mono.error(new BizException(BizError.ALREADY_BIND, "ALREADY_BIND", email, ""));
+                    }
+                    return Mono.error(throwable);
+                });
     }
 
     @Override

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceStructureServiceImpl.java

@@ -30,23 +30,22 @@
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.4</version>
         </dependency>
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>5.0.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>oracle-xe</artifactId>
             <version>1.17.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.openblocks</groupId>
+            <artifactId>sqlBasedPlugin</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserServiceImpl.java

@@ -0,0 +1,55 @@
+package com.openblocks.plugin.oracle;
+
+import static org.apache.commons.lang3.StringUtils.isAllBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.pf4j.Extension;
+
+import com.openblocks.plugin.oracle.model.OracleDatasourceConfig;
+import com.openblocks.plugin.sql.SqlBasedConnector;
+import com.zaxxer.hikari.HikariConfig;
+
+@Extension
+public class OracleConnector extends SqlBasedConnector<OracleDatasourceConfig> {
+
+    private static final String JDBC_DRIVER = "oracle.jdbc.OracleDriver";
+
+    public OracleConnector() {
+        super(50);
+    }
+
+    @Override
+    protected String getJdbcDriver() {
+        return JDBC_DRIVER;
+    }
+
+    @Override
+    protected void setUpConfigs(OracleDatasourceConfig oracleDatasourceConfig, HikariConfig config) {
+
+        config.setDriverClassName(JDBC_DRIVER);
+        //username & password
+        if (StringUtils.isNotBlank(oracleDatasourceConfig.getUsername())) {
+            config.setUsername(oracleDatasourceConfig.getUsername());
+        }
+        if (StringUtils.isNotBlank(oracleDatasourceConfig.getPassword())) {
+            config.setPassword(oracleDatasourceConfig.getPassword());
+        }
+        config.setJdbcUrl(oracleDatasourceConfig.getJdbcUrl());
+
+        config.setReadOnly(oracleDatasourceConfig.isReadonly());
+    }
+
+    @Override
+    public Set<String> validateConfig(OracleDatasourceConfig connectionConfig) {
+        Set<String> validates = new HashSet<>();
+        if (isBlank(connectionConfig.getJdbcUrl())
+                && (isBlank(connectionConfig.getHost()) || isAllBlank(connectionConfig.getSid(), connectionConfig.getServiceName()))) {
+            validates.add("INVALID_JDBC_URL_CONFIG");
+        }
+        return validates;
+    }
+}