diff --git a/server/api-service/lowcoder-domain/pom.xml b/server/api-service/lowcoder-domain/pom.xml index 8b6086c93..3ca352439 100644 --- a/server/api-service/lowcoder-domain/pom.xml +++ b/server/api-service/lowcoder-domain/pom.xml @@ -85,7 +85,7 @@ de.flapdoodle.embed - de.flapdoodle.embed.mongo + de.flapdoodle.embed.mongo.spring30x test diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java index 0da2b7c46..095260077 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java @@ -10,7 +10,7 @@ @Configuration public class RedisRateLimiterConfig { - @Value("${spring.redis.url:redis}") + @Value("${spring.data.redis.url:redis}") private String redis; @Bean diff --git a/server/api-service/lowcoder-server/pom.xml b/server/api-service/lowcoder-server/pom.xml index b71677bf7..1742478a2 100644 --- a/server/api-service/lowcoder-server/pom.xml +++ b/server/api-service/lowcoder-server/pom.xml @@ -155,7 +155,7 @@ de.flapdoodle.embed - de.flapdoodle.embed.mongo + de.flapdoodle.embed.mongo.spring30x test diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml index e2b4e1d14..5ba015669 100644 --- a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml +++ b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml @@ -8,8 +8,8 @@ spring: authentication-database: admin auto-index-creation: false uri: mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000 - redis: - url: redis://localhost:6379 + redis: + url: redis://localhost:6379 main: allow-bean-definition-overriding: true allow-circular-references: true diff --git a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml index 6c1604d92..53df2ac7e 100644 --- a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml +++ b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml @@ -16,5 +16,5 @@ spring: data: mongodb: uri: ${MONGODB_URL:mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000} - redis: - url: ${REDIS_URL:redis://localhost:6379} + redis: + url: ${REDIS_URL:redis://localhost:6379} diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java index a895ebc90..1cac5601d 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java @@ -1,7 +1,9 @@ package org.lowcoder.api.application; +import lombok.extern.slf4j.Slf4j; import org.junit.Assert; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,6 +25,7 @@ import org.lowcoder.domain.permission.model.ResourceRole; import org.lowcoder.sdk.exception.BizError; import org.lowcoder.sdk.exception.BizException; +import org.pf4j.PluginManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @@ -32,11 +35,10 @@ import java.util.List; import java.util.Map; import java.util.Set; - -@Ignore @SuppressWarnings({"OptionalGetWithoutIsPresent"}) @SpringBootTest @RunWith(SpringRunner.class) +@Slf4j(topic = "ApplicationApiServiceTest") public class ApplicationApiServiceTest { @Autowired @@ -48,6 +50,19 @@ public class ApplicationApiServiceTest { @Autowired private DatasourceApiService datasourceApiService; + @Autowired + private PluginManager pluginManager; + + @Before + public void init() { + try { + pluginManager.loadPlugins(); + pluginManager.startPlugins(); + } catch (Exception e) { + log.error("Failed to load/start plugins. Exception: " + e); + } + } + @Test @WithMockUser public void testAutoInheritFoldersPermissionsOnAppCreate() { @@ -269,6 +284,7 @@ public void testPermissions() { .verifyComplete(); } + @Ignore @SuppressWarnings("ConstantConditions") @Test @WithMockUser(id = "user02") @@ -301,6 +317,7 @@ public void testCreateApplicationSuccess() { .verifyComplete(); } + @Ignore @SuppressWarnings("ConstantConditions") @Test @WithMockUser(id = "user02") diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java index a48a22790..1e3ca0a91 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java @@ -16,7 +16,6 @@ import java.util.Map; import java.util.Set; -@Ignore @SpringBootTest @RunWith(SpringRunner.class) public class CompoundApplicationDslFilterTest { diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java index a028b693a..090e4280a 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java @@ -1,7 +1,6 @@ package org.lowcoder.api.authentication; import com.google.common.collect.Iterables; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.lowcoder.api.authentication.AuthenticationController.FormLoginRequest; @@ -34,7 +33,6 @@ import static org.lowcoder.sdk.exception.BizError.INVALID_PASSWORD; import static org.lowcoder.sdk.exception.BizError.USER_LOGIN_ID_EXIST; -@Ignore @SpringBootTest @RunWith(SpringRunner.class) @ActiveProfiles("AuthenticationControllerTest") @@ -84,7 +82,7 @@ public void testFormRegisterSuccess() { assertEquals(email, connection.getRawId()); assertEquals(email, connection.getName()); assertNull(connection.getAvatar()); - assertEquals(1, connection.getOrgIds().size()); + assertEquals(0, connection.getOrgIds().size()); assertNull(connection.getAuthConnectionAuthToken()); assertEquals(Map.of("email", email), connection.getRawUserInfo()); //exchange @@ -95,7 +93,6 @@ public void testFormRegisterSuccess() { }) .verifyComplete(); } - @Test public void testFormLoginSuccess() { String email = "test_login@ob.dev"; @@ -137,7 +134,7 @@ public void testFormLoginSuccess() { assertEquals(email, connection.getRawId()); assertEquals(email, connection.getName()); assertNull(connection.getAvatar()); - assertEquals(1, connection.getOrgIds().size()); + assertEquals(0, connection.getOrgIds().size()); assertNull(connection.getAuthConnectionAuthToken()); assertEquals(Map.of("email", email), connection.getRawUserInfo()); //exchange diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java index 7d93e6d83..7148ef8a1 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.*; -@Ignore @SpringBootTest @RunWith(SpringRunner.class) public class GoogleAuthenticateTest { @@ -43,6 +42,7 @@ public class GoogleAuthenticateTest { @Autowired private AuthenticationService authenticationService; + @Ignore @Test public void testGoogleRegisterSuccess() { String email = "test_register@ob.dev"; diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java deleted file mode 100644 index 51cadb3a4..000000000 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.lowcoder.api.authentication.service; -//package org.lowcoder.api.authentication.service; -// -//import static org.lowcoder.sdk.constants.AuthSourceConstants.EMAIL; -// -//import org.junit.Assert; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import org.lowcoder.domain.user.model.AuthorizedUser; -// -//import reactor.core.publisher.Mono; -//import reactor.test.StepVerifier; -// -//@SpringBootTest -//@RunWith(SpringRunner.class) -//public class AuthenticationApiServiceTest { -// -// @Autowired -// private AuthenticationApiService authenticationApiService; -// -// @Test -// public void testFormUserLogin() { -// Mono formAuthUser = -// authenticationApiService.getFormAuthUser("captain@avengers.com", "hail hydra", "avengers.com", EMAIL); -// -// StepVerifier.create(formAuthUser) -// .assertNext(authorizedUser -> { -// Assert.assertEquals(EMAIL, authorizedUser.getSource()); -// Assert.assertEquals("captain@avengers.com", authorizedUser.getUid()); -// Assert.assertEquals("org01", authorizedUser.getOrgId()); -// Assert.assertNotNull(authorizedUser.getUser()); -// }) -// .verifyComplete(); -// } -//} \ No newline at end of file diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java index 79651700b..d50770ac4 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java @@ -57,7 +57,7 @@ public void init() { @SuppressWarnings({"ConstantConditions"}) private void execute() { - String currentDirPath = JsonFileReader.buildPath("com/lowcoder/api/common/json"); + String currentDirPath = JsonFileReader.buildPath("org/lowcoder/api/common/json"); File dir = new File(currentDirPath); Stream.of(dir.listFiles()) .filter(file -> file.isFile() && file.getName().endsWith(".json")) diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java index 91947bcba..c5841ab3c 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java @@ -26,7 +26,6 @@ import static org.lowcoder.domain.permission.model.ResourceRole.OWNER; import static org.lowcoder.domain.permission.model.ResourceRole.VIEWER; -@Ignore @SpringBootTest @RunWith(SpringRunner.class) public class DatasourceApiServiceTest { @@ -34,6 +33,7 @@ public class DatasourceApiServiceTest { @Autowired private DatasourceApiService datasourceApiService; + @Ignore @Test @WithMockUser(id = "user02") public void testListOrgDatasource() { @@ -62,6 +62,7 @@ private DatasourceView findDatasourceView(Collection datasourceV .orElse(null); } + @Ignore @Test @WithMockUser public void testGrantPermissionAndGetPermissionSuccess() { @@ -89,6 +90,7 @@ public void testGrantPermissionAndGetPermissionSuccess() { .verifyComplete(); } + @Ignore @Test @WithMockUser public void testUpdatePermissionAndDeletePermissionSuccess() { @@ -126,6 +128,7 @@ public void testUpdatePermissionAndDeletePermissionSuccess() { .verifyComplete(); } + @Ignore @Test @WithMockUser(id = "user02") public void testUpdatePermissionErrorWithNoPermission() { diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java index 1e52f8327..426ddf6ef 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java @@ -18,7 +18,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -@Ignore @RunWith(SpringRunner.class) @SpringBootTest @Slf4j diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java index 16bbe1902..2ded3db79 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java @@ -21,7 +21,6 @@ import static org.lowcoder.api.common.mockuser.WithMockUser.DEFAULT_CURRENT_ORG_ID; -@Ignore @SuppressWarnings("SameParameterValue") @SpringBootTest @RunWith(SpringRunner.class) @@ -32,6 +31,7 @@ public class LibraryQueryApiServiceTest { @Autowired private LibraryQueryApiService libraryQueryApiService; + @Ignore @Test @WithMockUser public void testListLibraryQueries() { diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java index a7fdb11f4..e3b10f403 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals; -@Ignore @SpringBootTest @RunWith(SpringRunner.class) public class FolderApiServiceTest { diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java index 041cc7135..2fc586de7 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java @@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import reactor.test.StepVerifier; -@Ignore @SuppressWarnings({"ReactiveStreamsNullableInLambdaInTransform"}) @RunWith(SpringRunner.class) @SpringBootTest diff --git a/server/api-service/lowcoder-server/src/test/resources/application.yml b/server/api-service/lowcoder-server/src/test/resources/application.yml index b6fe7cebe..46726fe39 100644 --- a/server/api-service/lowcoder-server/src/test/resources/application.yml +++ b/server/api-service/lowcoder-server/src/test/resources/application.yml @@ -1,11 +1,15 @@ spring: - mongodb: - embedded: - version: 4.0.2 main: allow-circular-references: true - redis: - url: redis://localhost:6370 + data: + redis: + url: redis://localhost:6370 + +de: + flapdoodle: + mongodb: + embedded: + version: 4.0.2 server: port: 8080 @@ -17,4 +21,13 @@ demo: port: 3306 timeout: 100 username: 123 - host: localhost \ No newline at end of file + host: localhost + +common: + cookie-name: UT-TACO-TOKEN + +auth: + email: + enable: true + google: + enable: true \ No newline at end of file diff --git a/server/api-service/pom.xml b/server/api-service/pom.xml index fcc8045ab..4ef0c930c 100644 --- a/server/api-service/pom.xml +++ b/server/api-service/pom.xml @@ -278,7 +278,7 @@ de.flapdoodle.embed - de.flapdoodle.embed.mongo + de.flapdoodle.embed.mongo.spring30x 4.7.0